feat: Include HPI CPN ID and Registration Number in the result

openhealthnz-credentials · Jan 12, 2022 · 9042936 · 9042936
1 parent 25a184e
commit 9042936
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/demo-site/src/lib/ResultModal.svelte b/demo-site/src/lib/ResultModal.svelte
@@ -11,6 +11,8 @@
       }
 
   interface ParsedApcCert {
+    registrationNumber: string
+    hpiCpnID: string
     fullName: string
     issueDate: Date
     expiryDate: Date
@@ -21,9 +23,9 @@
 
 <div class="container">
   {#if 'error' in message}
-  <div class="error-message">
-    {message.error}
-  </div>
+    <div class="error-message">
+      {message.error}
+    </div>
   {:else if message.details !== null}
     <table>
       <tr>
@@ -38,9 +40,10 @@
       {/each}
     </table>
   {:else}
-  <div class="error-message">
-    Certificate did not match any known Physioboard APC certificates. Make sure you upload the original APC certificate that was sent to you electronically.
-  </div>
+    <div class="error-message">
+      Certificate did not match any known Physioboard APC certificates. Make sure you
+      upload the original APC certificate that was sent to you electronically.
+    </div>
   {/if}
 </div>
 
@@ -78,7 +81,7 @@
       border-right: 1px solid $table-border-color;
     }
     .error-message {
-        padding: 1rem;
+      padding: 1rem;
     }
   }
 </style>
diff --git a/src/certProfiles/physioboardAPC.ts b/src/certProfiles/physioboardAPC.ts
@@ -36,13 +36,15 @@ export function parseCert(inputText: string[]): ParsedApcCert | null {
   if (!/^70-\d{5}$/g.test(inputText[3])) {
     return null
   }
+  const registrationNumber = inputText[3]
 
   // CPN Number, would be possible to validate check digit, but not needed
   // See here for more info:
   // https://www.health.govt.nz/system/files/documents/publications/10005-hpi-data-set-v1-2.pdf
   if (!/^\d{2}[A-Z ]{4}$/g.test(inputText[4])) {
     return null
   }
+  const hpiCpnID = inputText[4]
 
   // At this point we are pretty sure it's the correct certificate
   // So we can start parsing the data
@@ -58,6 +60,8 @@ export function parseCert(inputText: string[]): ParsedApcCert | null {
   const conditions: string | null = inputText.length == 10 ? inputText[9] : null
 
   return {
+    registrationNumber,
+    hpiCpnID,
     fullName,
     issueDate,
     expiryDate,
@@ -72,6 +76,8 @@ export function parseCert(inputText: string[]): ParsedApcCert | null {
  * @since 0.0.0
  */
 export interface ParsedApcCert {
+  registrationNumber: string
+  hpiCpnID: string
   fullName: string
   issueDate: Date
   expiryDate: Date