oro-sdk 5.4.0 → 5.5.1

package/package.json

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

package/src/client.ts

@@ -328,9 +328,14 @@ export class OroClient {
      * @param populatedRefillWorkflow
      * @returns
      */
-    public async createRefill(consult: ConsultRequest, populatedRefillWorkflow: WorkflowData): Promise<void> {
+    public async createRefill(
+        consult: ConsultRequest,
+        populatedRefillWorkflow: WorkflowData,
+        indexSearch: boolean = true,
+        onProgress?: (progress: number, descriptionKey: string) => void
+    ): Promise<Consult> {
         if (!this.rsa) throw IncompleteAuthentication
-        return createRefill(consult, populatedRefillWorkflow, this)
+        return createRefill(consult, populatedRefillWorkflow, this, indexSearch, onProgress)
     }
 
     /**

package/src/helpers/prescription-refill.ts

@@ -9,7 +9,7 @@ import {
     Uuid,
     WorkflowData,
 } from 'oro-sdk-apis'
-import { OroClient } from '..'
+import { buildConsultSearchIndex, OroClient } from '..'
 import { getOrCreatePatientConsultationUuid } from './consult'
 
 const MAX_RETRIES = 15
@@ -17,7 +17,9 @@ const MAX_RETRIES = 15
  * Placeholder while the workflow interpreter for the refill flows is complete
  *
  * Creates a fake workflow in which the workflow data will reside
- *
+ * 
+ * @todo deprecate this function when using workflows and populating them from the app
+ * 
  * @param isTreatmentWorking the value from the `is treatment working` question
  * @param hasSideEffects the value from the `does the treatment have side effects` question
  * @param deliveryAddress the provided delivery address
@@ -28,19 +30,20 @@ export function getRefillAnswersAsWorkflow(
     isTreatmentWorking: string,
     hasSideEffects: string,
     deliveryAddress?: string,
-    pharmacy?: PlaceData
+    pharmacy?: PlaceData,
 ): WorkflowData {
     let selectedAnswers: SelectedAnswersData = [
         {
             ['isTreatmentWorking']: isTreatmentWorking,
-        },
-        {
             ['hasSideEffects']: hasSideEffects,
         },
     ]
 
-    if (deliveryAddress) selectedAnswers.push({ ['deliveryAddress']: deliveryAddress })
-    if (pharmacy) selectedAnswers.push({ ['pharmacy']: JSON.stringify(pharmacy) })
+    // appends the delivery address to the first page of the answers if provided
+    if (deliveryAddress) selectedAnswers[0] = { ...selectedAnswers[0], ['deliveryAddress']: deliveryAddress }
+
+    // appends the pharmacy to the first page of the answers if provided
+    if (pharmacy) selectedAnswers[0] = { ...selectedAnswers[0], ['pharmacy']: JSON.stringify(pharmacy) }
 
     return {
         id: '32573a20-6f1d-49be-9ad3-b87c58074979',
@@ -108,7 +111,6 @@ export function getRefillAnswersAsWorkflow(
                         kind: 'online-pharmacy-picker',
                         label: 'Which pharmacy do you want the prescription sent to?',
                         metaCategory: MetadataCategory.Refill,
-                        minorLabel: ' (Optional)',
                         summaryLabel: 'Your pharmacy',
                     },
                     youAddress: {
@@ -133,20 +135,33 @@ export function getRefillAnswersAsWorkflow(
 export async function createRefill(
     consultRequest: ConsultRequest,
     populatedRefillWorkflow: WorkflowData,
-    oroClient: OroClient
-) {
+    oroClient: OroClient,
+    indexSearch: boolean = true,
+    onProgress?: (
+        progress: number,
+        descriptionKey: string,
+        extraInfo?: { storedImagesNum?: number; totalImagesNum?: number }
+    ) => void
+): Promise<Consult> {
     let retry = MAX_RETRIES
     let errorsThrown: Error[] = []
-
-    let newConsult: Consult | undefined
+    let newConsult: Consult | undefined = undefined
     let lockboxUuid: Uuid | undefined
+    const stepsTotalNum = 6
+    let currentStep: number
 
     for (; retry > 0; retry--) {
         try {
-            if (!newConsult) newConsult = await getOrCreatePatientConsultationUuid(consultRequest, oroClient)
+            currentStep = 0
+
+            if (onProgress) onProgress(currentStep++ / stepsTotalNum, 'create_consult')
+            // Creating refill consult
+            newConsult = await getOrCreatePatientConsultationUuid(consultRequest, oroClient)
 
+            if (onProgress) onProgress(currentStep++ / stepsTotalNum, 'get_patient_grant')
             if (!lockboxUuid) lockboxUuid = (await oroClient.getGrants())[0].lockboxUuid
 
+            if (onProgress) onProgress(currentStep++ / stepsTotalNum, 'store_patient_data')
             await oroClient
                 .getOrInsertJsonData(
                     lockboxUuid!,
@@ -160,18 +175,62 @@ export async function createRefill(
                     { withNotification: true }
                 )
                 .catch((err) => {
-                    console.error('[SDK: prescription refill] Some errors happened during refill data upload', err)
+                    console.error('[SDK: prescription refill request] Some errors happened during refill data upload', err)
                     errorsThrown.push(err)
                 })
 
+            if (indexSearch) {
+                if (onProgress) onProgress(currentStep++ / stepsTotalNum, 'fetching_parent_workflow_data')
+                // raw workflow from parent consultation (contains first and last name of patient)
+                let rawConsultationManifest = await oroClient.getLockboxManifest(lockboxUuid!, { category: MetadataCategory.Raw, consultationId: consultRequest.uuidParent }, false)
+                if (rawConsultationManifest && rawConsultationManifest.length > 0) {
+                    let rawConsultation = await oroClient.getJsonData<WorkflowData>(lockboxUuid!, rawConsultationManifest[0].dataUuid)
+                    if (onProgress) onProgress(currentStep++ / stepsTotalNum, 'search_indexing')
+                    await buildConsultSearchIndex(newConsult, rawConsultation, oroClient).catch((err) => {
+                        console.error(
+                            '[SDK: prescription refill request] 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)
+                    })
+                } else {
+                    console.error(
+                        '[SDK: prescription refill request] parent consultation\'s raw data not found',
+                    )
+                    errorsThrown.push(Error('RawData Not Found'))
+                }
+            }
+
             if (errorsThrown.length > 0) throw errorsThrown
+
+            // Deem the consultation as ready
             await oroClient.consultClient.updateConsultByUUID(newConsult.uuid, {
                 statusMedical: MedicalStatus.New,
             })
+
+            // if we got through the complete flow, the registration succeeded
+            if (onProgress) onProgress(currentStep++ / stepsTotalNum, 'success')
+
+            await oroClient.cleanIndex()
+            break
+
         } catch (err) {
-            console.error(`[SDK] Error occured during refill: ${err}, retrying... Retries remaining: ${retry}`)
+            console.error(`[SDK] Error occured during prescription refill request: ${err}, retrying... Retries remaining: ${retry}`)
             errorsThrown = []
             continue
         }
     }
+    if (retry <= 0) {
+        console.error('[SDK] prescription refill request failed: MAX_RETRIES reached')
+        throw 'RegistrationFailed'
+    }
+
+    if (!newConsult) {
+        console.error('[SDK] prescription refill request failed: MAX_RETRIES reached')
+        throw 'RegistrationFailed'
+    }
+
+    console.log('Successfully Created refill')
+    return newConsult
 }

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2021 ORO Health Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.