oro-sdk 3.1.2-dev2.1 → 3.3.0

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.1.2-dev2.1",
+  "version": "3.3.0",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [
@@ -54,7 +54,7 @@
     "form-data": "^4.0.0",
     "formdata-node": "^4.3.1",
     "idb-keyval": "^5.0.6",
-    "oro-sdk-apis": "1.38.2",
+    "oro-sdk-apis": "1.39.1",
     "oro-toolbox": "0.0.6",
     "uuid": "^8.3.2"
   }

package/src/helpers/patient-registration.ts

@@ -5,14 +5,17 @@ import {
     ConsultRequest,
     DocumentType,
     IdentityResponse,
-    IndexKey, LocalizedData,
+    IndexKey,
     MedicalMeta,
     MedicalStatus,
     MetadataCategory,
-    PersonalMeta, PopulatedWorkflowData,
+    PersonalMeta,
+    PopulatedWorkflowData,
     Practitioner,
     PreferenceMeta,
-    RawConsultationMeta, Term, Terms,
+    RawConsultationMeta,
+    Term,
+    Terms,
     Uuid,
     VaultIndex,
     WorkflowData,
@@ -20,9 +23,11 @@ import {
 import {
     filterTriggeredAnsweredWithKind,
     getImagesFromIndexDb,
-    getWorkflowDataByCategory, identificationToPersonalInformations,
+    getWorkflowDataByCategory,
+    identificationToPersonalInformations,
     OroClient,
-    RegisterPatientOutput, toActualObject,
+    RegisterPatientOutput,
+    toActualObject
 } from '..'
 
 const MAX_RETRIES = 15
@@ -179,6 +184,12 @@ export async function registerPatient(
 
             await Promise.all([...grantPromises, ...consultIndexPromises])
 
+            await buildConsultSearchIndex(consult, workflow, oroClient).catch((err) => {
+                console.error('[SDK: registration] personal information not found or another error occured during search indexing', err)
+                if(retry <= 1) return       // this statement is to avoid failing the registration due to the failure in search indexing the consult, this practically implements a soft retry
+                errorsThrown.push(err)
+            })
+
             if (errorsThrown.length > 0)
                 throw errorsThrown
 
@@ -187,11 +198,6 @@ export async function registerPatient(
                 statusMedical: MedicalStatus.New,
             })
 
-            await searchIndexConsultation(consult.uuid, oroClient).catch((err) => {
-                console.error('[SDK: registration] personal information not found or another error occured during search indexing', err)
-                errorsThrown.push(err)
-            })
-
             // if we got through the complete flow, the registration succeeded
             break
         } catch (err) {
@@ -405,88 +411,61 @@ export async function extractAndStorePersonalWorkflowData(
     })
 }
 
-export async function extractPersonalInfoFromConsultId(consultUuid: string, oroClient: OroClient): Promise<{
-    consultUuid: string,
-    personalInformations: LocalizedData<PopulatedWorkflowData>,
-    childPersonalInformations: LocalizedData<PopulatedWorkflowData>,
-    otherPersonalInformations: LocalizedData<PopulatedWorkflowData>,
+/**
+ * Given workflow data, it populates it with Personal, ChildPersonal, and OtherPersonal workflow data
+ * @param workflow
+ */
+export async function extractPersonalInfoFromWorkflowData(workflow: WorkflowData): Promise<{
+    personalInfoPopulatedWfData: PopulatedWorkflowData,
+    childPersonalInfoPopulatedWfData: PopulatedWorkflowData,
+    otherPersonalInfoPopulatedWfData: PopulatedWorkflowData,
 }> {
     return Promise.all([
-        // Retrieve MetadataCategory.Personal in any case
-        oroClient
-            .getPersonalInformationsFromConsultId(consultUuid, MetadataCategory.Personal, true)
-            .then((personalInformations) => {
-                if (!personalInformations[0]) {
-                    console.error(
-                        `${MetadataCategory.Personal} informations not found for consult:`,
-                        consultUuid
-                    )
-
-                    throw Error('No self personal information found')
-                }
-
-                return personalInformations[0]
-            }),
-        // Retrieve MetadataCategory.ChildPersonal in any case in parallel
-        oroClient
-            .getPersonalInformationsFromConsultId(consultUuid, MetadataCategory.ChildPersonal, true)
-            .then((childInformations): any => {
-                if (!childInformations[0]) {
-                    console.debug(
-                        `${MetadataCategory.ChildPersonal} informations not found for consult:`,
-                        consultUuid
-                    )
-
-                    // Retrieve MetadataCategory.OtherPersonal only if MetadataCategory.ChildPersonal does not exist
-                    return oroClient
-                        .getPersonalInformationsFromConsultId(
-                            consultUuid,
-                            MetadataCategory.OtherPersonal,
-                            true
-                        )
-                        .then((otherInformations) => {
-                            if (!otherInformations[0]) {
-                                console.debug(
-                                    `${MetadataCategory.OtherPersonal} informations not found for consult:`,
-                                    consultUuid
-                                )
-
-                                return {}
-                            }
-
-                            return { otherPersonalInformations: otherInformations[0] }
-                        })
-                }
-
-                return { childPersonalInformations: childInformations[0] }
-            }),
-    ]).then(([personalInformations, { childPersonalInformations, otherPersonalInformations }]) => {
+        getWorkflowDataByCategory(workflow, MetadataCategory.Personal),
+        getWorkflowDataByCategory(workflow, MetadataCategory.ChildPersonal),
+        getWorkflowDataByCategory(workflow, MetadataCategory.OtherPersonal)
+    ]).then(([personalInfoPopulatedWfData, childPersonalInfoPopulatedWfData, otherPersonalInfoPopulatedWfData]) => {
         return {
-            consultUuid,
-            personalInformations,
-            childPersonalInformations,
-            otherPersonalInformations,
+            personalInfoPopulatedWfData,
+            childPersonalInfoPopulatedWfData,
+            otherPersonalInfoPopulatedWfData,
         }
     })
 }
 
-export async function searchIndexConsultation(consultUuid: string, oroClient: OroClient) {
-    let terms: Terms = []
-
-    console.log('here')
+/**
+ * Creates the search index for the first name, last name, and the short id of the given consultation
+ * @param consult the consultation to be search indexed
+ * @param workflow the workflow data
+ * @param oroClient
+ */
+export async function buildConsultSearchIndex(consult: Consult, workflow: WorkflowData, oroClient: OroClient) {
+    let terms: Terms = [
+        <Term> {
+            kind: 'consult-shortid',
+            value: consult.shortId
+        }
+    ]
 
     const {
-        personalInformations,
-        childPersonalInformations,
-        otherPersonalInformations
-    } = await extractPersonalInfoFromConsultId(consultUuid, oroClient)
-
-    console.log('personal=', personalInformations, 'child=', childPersonalInformations, 'other=', otherPersonalInformations)
+        personalInfoPopulatedWfData,
+        childPersonalInfoPopulatedWfData,
+        otherPersonalInfoPopulatedWfData
+    } = await extractPersonalInfoFromWorkflowData(workflow)
 
     const personalInfo = identificationToPersonalInformations(
-        toActualObject(personalInformations.data),
+        toActualObject(personalInfoPopulatedWfData),
         MetadataCategory.Personal
     )
+    const childPersonalInfo = identificationToPersonalInformations(
+        toActualObject(childPersonalInfoPopulatedWfData),
+        MetadataCategory.ChildPersonal
+    )
+    const otherPersonalInfo = identificationToPersonalInformations(
+        toActualObject(otherPersonalInfoPopulatedWfData),
+        MetadataCategory.OtherPersonal
+    )
+
     terms.push(<Term>{
         kind: 'first-name',
         value: personalInfo.firstname,
@@ -495,11 +474,7 @@ export async function searchIndexConsultation(consultUuid: string, oroClient: Or
         value: personalInfo.name
     })
 
-    if(childPersonalInformations) {
-        const childPersonalInfo = identificationToPersonalInformations(
-            toActualObject(childPersonalInformations.data),
-            MetadataCategory.ChildPersonal
-        )
+    if(childPersonalInfo.firstname && childPersonalInfo.name) {
         terms.push(<Term>{
             kind: 'first-name',
             value: childPersonalInfo.firstname,
@@ -509,11 +484,7 @@ export async function searchIndexConsultation(consultUuid: string, oroClient: Or
         })
     }
 
-    if(otherPersonalInformations) {
-        const otherPersonalInfo = identificationToPersonalInformations(
-            toActualObject(otherPersonalInformations.data),
-            MetadataCategory.OtherPersonal
-        )
+    if(otherPersonalInfo.firstname && otherPersonalInfo.name) {
         terms.push(<Term>{
             kind: 'first-name',
             value: otherPersonalInfo.firstname,
@@ -523,5 +494,5 @@ export async function searchIndexConsultation(consultUuid: string, oroClient: Or
         })
     }
 
-    await oroClient.searchClient.index(consultUuid, terms)
+    await oroClient.searchClient.index(consult.uuid, terms)
 }