@os1-platform/dispatch-mobile 3.1.6 → 3.1.8

package/src/manager/dispatch/DispatchStateContainer.tsx

@@ -147,6 +147,7 @@ export default class DispatchStateContainer {
       maxTaskReattempt,
       eventSyncBatchSize: BULK_DATA_LIMIT,
     });
+    Logger.getInstance().logCora("Info", `DispatchExecutor started with ID: ${dispatchID}`);
   }
 
   // NEW CODE
@@ -166,14 +167,9 @@ export default class DispatchStateContainer {
     statusFilter: IDispatchExecutor.ExecutionStatus[]
   ): Promise<IDispatch.IExecutionTaskQueryResponse[]> {
     if (!mergedObjectiveId) {
-      Logger.getInstance().logEvent(
-        'queryNextET',
-        'CONSTRAINTS FAILED',
-        LOG_TYPE.SDK_ERROR
-      );
+      Logger.getInstance().logCora("Error", `Merged Objective ID is null`);
       throw new BaseError(ErrorCodes.MERGING_ERROR, 'CONSTRAINTS FAILED');
     }
-
     return await dispatchExecutor.getNextTask(
       mergedObjectiveId[0],
       statusFilter
@@ -185,36 +181,40 @@ export default class DispatchStateContainer {
     prefixedMergedObjectiveId: Array<string>,
     prefixKey: string
   ) {
-    etOutput.mergedObjectiveIds = prefixedMergedObjectiveId;
-    let storage = Storage.getInstance();
-    const output = await storage.getSharedItem(SHARED_PREFERENCE_SCAN_OUTPUT);
-
-    if (output) {
-      const scanETOutput: SHARED_PREF_SCAN_OUTPUT_INTERFACE =
-        JSON.parse(output);
-      let _scanETOutput: ScannerOutput = {};
-      if (scanETOutput[prefixKey]) {
-        _scanETOutput = scanETOutput[prefixKey];
+    try {
+      etOutput.mergedObjectiveIds = prefixedMergedObjectiveId;
+      let storage = Storage.getInstance();
+      const output = await storage.getSharedItem(SHARED_PREFERENCE_SCAN_OUTPUT);
+
+      if (output) {
+        const scanETOutput: SHARED_PREF_SCAN_OUTPUT_INTERFACE =
+          JSON.parse(output);
+        let _scanETOutput: ScannerOutput = {};
+        if (scanETOutput[prefixKey]) {
+          _scanETOutput = scanETOutput[prefixKey];
+        }
+        prefixedMergedObjectiveId.forEach((mergedId: string) => {
+          _scanETOutput[mergedId] = etOutput;
+        });
+
+        // SAVE IN SHARED PREFERENCE
+        await storage.setSharedItem(
+          SHARED_PREFERENCE_SCAN_OUTPUT,
+          JSON.stringify({ ...scanETOutput, [prefixKey]: _scanETOutput })
+        );
+      } else {
+        const scanETOutput: SHARED_PREF_SCAN_OUTPUT_INTERFACE = {};
+        prefixedMergedObjectiveId.forEach((mergedId: string) => {
+          scanETOutput[mergedId] = etOutput;
+        });
+        // SAVE IN SHARED PREFERENCE
+        await storage.setSharedItem(
+          SHARED_PREFERENCE_SCAN_OUTPUT,
+          JSON.stringify({ [prefixKey]: scanETOutput })
+        );
       }
-      prefixedMergedObjectiveId.forEach((mergedId: string) => {
-        _scanETOutput[mergedId] = etOutput;
-      });
-
-      // SAVE IN SHARED PREFERENCE
-      await storage.setSharedItem(
-        SHARED_PREFERENCE_SCAN_OUTPUT,
-        JSON.stringify({ ...scanETOutput, [prefixKey]: _scanETOutput })
-      );
-    } else {
-      const scanETOutput: SHARED_PREF_SCAN_OUTPUT_INTERFACE = {};
-      prefixedMergedObjectiveId.forEach((mergedId: string) => {
-        scanETOutput[mergedId] = etOutput;
-      });
-      // SAVE IN SHARED PREFERENCE
-      await storage.setSharedItem(
-        SHARED_PREFERENCE_SCAN_OUTPUT,
-        JSON.stringify({ [prefixKey]: scanETOutput })
-      );
+    } catch (error: any) {
+      Logger.getInstance().logCora("Error", `updateScanETOutputSharedPreference: ${error}`);
     }
   }
 
@@ -223,28 +223,34 @@ export default class DispatchStateContainer {
     prefixedMergedObjectiveId: Array<string>,
     prefixKey: string
   ) {
-    let storage = Storage.getInstance();
-    const mergedIdOutput = await storage.getSharedItem(
-      SCAN_MERGED_OBJ_ID_OUTPUT
-    );
+    try {
 
-    if (mergedIdOutput) {
-      const mergedIds = JSON.parse(mergedIdOutput);
-      const _mergedIds = mergedIds[prefixKey];
-      if (_mergedIds) {
-        if (eventType) {
-          _mergedIds.success.push(...prefixedMergedObjectiveId);
-          _mergedIds.pending = [];
-        } else {
-          _mergedIds.failure.push(...prefixedMergedObjectiveId);
-          _mergedIds.pending = [];
-        }
 
-        await storage.setSharedItem(
-          SCAN_MERGED_OBJ_ID_OUTPUT,
-          JSON.stringify({ ...mergedIds, [prefixKey]: _mergedIds })
-        );
+      let storage = Storage.getInstance();
+      const mergedIdOutput = await storage.getSharedItem(
+        SCAN_MERGED_OBJ_ID_OUTPUT
+      );
+
+      if (mergedIdOutput) {
+        const mergedIds = JSON.parse(mergedIdOutput);
+        const _mergedIds = mergedIds[prefixKey];
+        if (_mergedIds) {
+          if (eventType) {
+            _mergedIds.success.push(...prefixedMergedObjectiveId);
+            _mergedIds.pending = [];
+          } else {
+            _mergedIds.failure.push(...prefixedMergedObjectiveId);
+            _mergedIds.pending = [];
+          }
+
+          await storage.setSharedItem(
+            SCAN_MERGED_OBJ_ID_OUTPUT,
+            JSON.stringify({ ...mergedIds, [prefixKey]: _mergedIds })
+          );
+        }
       }
+    } catch (error: any) {
+      Logger.getInstance().logCora("Error", `updatePendingSharedPreference: ${error}`);
     }
   }
 
@@ -254,113 +260,117 @@ export default class DispatchStateContainer {
     states: any,
     isMergedObjectiveBasedOutput?: boolean
   ) {
-    const mergedObjectiveIds =
-      states[RouteParams.NEXT_STATES].mergedObjectiveIds;
-    const taskName = states[RouteParams.NEXT_STATES].taskName;
-    const taskID = states[RouteParams.NEXT_STATES].taskId;
-    const input = states[RouteParams.NEXT_STATES].input;
-    let lockTaskResponse: boolean = true;
-
-    if (isMergedObjectiveBasedOutput) {
-      // NEW CODE
-      const output = etOutput;
-      let promises: any = [];
-
-      const prefixKey = this.findPrefixKey(
-        mergedObjectiveIds,
-        etOutput,
-        states
-      );
+    try {
+      const mergedObjectiveIds =
+        states[RouteParams.NEXT_STATES].mergedObjectiveIds;
+      const taskName = states[RouteParams.NEXT_STATES].taskName;
+      const taskID = states[RouteParams.NEXT_STATES].taskId;
+      const input = states[RouteParams.NEXT_STATES].input;
+      let lockTaskResponse: boolean = true;
+
+      if (isMergedObjectiveBasedOutput) {
+        // NEW CODE
+        const output = etOutput;
+        let promises: any = [];
+
+        const prefixKey = this.findPrefixKey(
+          mergedObjectiveIds,
+          etOutput,
+          states
+        );
 
-      let defaultConfig: { index: number; success: boolean; output: any } = {
-        index: -1,
-        success: false,
-        output: {},
-      };
-      let mergedIds: SCANNED_RECORD = {
-        success: [],
-        failure: [],
-        pending: [prefixKey],
-      };
-      const filterIds = await getScanMergedObjectID();
-      if (filterIds) {
-        mergedIds = filterIds[prefixKey];
-      }
+        let defaultConfig: { index: number; success: boolean; output: any } = {
+          index: -1,
+          success: false,
+          output: {},
+        };
+        let mergedIds: SCANNED_RECORD = {
+          success: [],
+          failure: [],
+          pending: [prefixKey],
+        };
+        const filterIds = await getScanMergedObjectID();
+        if (filterIds) {
+          mergedIds = filterIds[prefixKey];
+        }
 
-      Object.keys(etOutput).forEach((mergedObjectiveId) => {
-        const _output = output[mergedObjectiveId].output;
-        // PREFIX_KEY
-        if (mergedObjectiveId === 'default') {
-          const defaultOutput = output.default.output;
-          // DELIVER AT DIFF LOCATION
-          if (defaultOutput.eventCode === REASON_NOT_USED) {
-            // DO NOT SEND OUTPUT WHEN DELIVER AT DIFF LOCATION
-            defaultOutput.eventCode = '';
-            defaultOutput.reasonCode = '';
-            lockTaskResponse = false;
+        Object.keys(etOutput).forEach((mergedObjectiveId) => {
+          const _output = output[mergedObjectiveId].output;
+          // PREFIX_KEY
+          if (mergedObjectiveId === 'default') {
+            const defaultOutput = output.default.output;
+            // DELIVER AT DIFF LOCATION
+            if (defaultOutput.eventCode === REASON_NOT_USED) {
+              // DO NOT SEND OUTPUT WHEN DELIVER AT DIFF LOCATION
+              defaultOutput.eventCode = '';
+              defaultOutput.reasonCode = '';
+              lockTaskResponse = false;
+            } else {
+              defaultConfig = {
+                index: promises.length,
+                success: defaultOutput.success,
+                output: output.default,
+              };
+
+              promises.push(
+                dispatchExecutor.saveTaskOutput(
+                  mergedIds.pending,
+                  taskName,
+                  taskID,
+                  {
+                    input,
+                    output: defaultOutput,
+                  },
+                  {
+                    ec: defaultOutput.eventCode,
+                    rc: defaultOutput.reasonCode || '',
+                  }
+                )
+              );
+            }
           } else {
-            defaultConfig = {
-              index: promises.length,
-              success: defaultOutput.success,
-              output: output.default,
-            };
-
             promises.push(
               dispatchExecutor.saveTaskOutput(
-                mergedIds.pending,
+                [mergedObjectiveId],
                 taskName,
                 taskID,
                 {
                   input,
-                  output: defaultOutput,
-                },
-                {
-                  ec: defaultOutput.eventCode,
-                  rc: defaultOutput.reasonCode || '',
+                  output: _output,
                 }
               )
             );
           }
-        } else {
-          promises.push(
-            dispatchExecutor.saveTaskOutput(
-              [mergedObjectiveId],
-              taskName,
-              taskID,
-              {
-                input,
-                output: _output,
-              }
-            )
-          );
-        }
-      });
+        });
 
-      const response = await Promise.all(promises);
+        const response = await Promise.all(promises);
 
-      if (defaultConfig.index !== -1) {
-        // UPDATE PENDING IN SHARED PREFERENCE MERGED_SCAN_OUTPUT
-        this.updatePendingSharedPreference(
-          defaultConfig.success,
-          response[defaultConfig.index],
-          prefixKey
-        );
-        this.updateScanETOutputSharedPreference(
-          defaultConfig.output,
-          response[defaultConfig.index],
-          prefixKey
+        if (defaultConfig.index !== -1) {
+          // UPDATE PENDING IN SHARED PREFERENCE MERGED_SCAN_OUTPUT
+          this.updatePendingSharedPreference(
+            defaultConfig.success,
+            response[defaultConfig.index],
+            prefixKey
+          );
+          this.updateScanETOutputSharedPreference(
+            defaultConfig.output,
+            response[defaultConfig.index],
+            prefixKey
+          );
+        }
+      } else {
+        await dispatchExecutor.saveTaskOutput(
+          mergedObjectiveIds,
+          taskName,
+          taskID,
+          {
+            input,
+            output: etOutput,
+          }
         );
       }
-    } else {
-      await dispatchExecutor.saveTaskOutput(
-        mergedObjectiveIds,
-        taskName,
-        taskID,
-        {
-          input,
-          output: etOutput,
-        }
-      );
+    } catch (error: any) {
+      Logger.getInstance().logCora("Error", `sendETOutput: ${error}`);
     }
   }
 
@@ -422,11 +432,7 @@ export default class DispatchStateContainer {
         return response;
       } else return response;
     } catch (error: any) {
-      Logger.getInstance().logEvent(
-        'getObjectiveSummary',
-        error.message,
-        LOG_TYPE.SDK_ERROR
-      );
+      Logger.getInstance().logCora("Error", `getObjectiveSummary: ${error}`);
       return [];
     }
   }
@@ -626,11 +632,7 @@ export default class DispatchStateContainer {
       }
     } catch (error: any) {
       baseETProps.showProgress(false);
-      Logger.getInstance().logEvent(
-        'navigateToNextTask',
-        error.message,
-        LOG_TYPE.SDK_ERROR
-      );
+      Logger.getInstance().logCora("Error", `navigateToNextTask: ${error}`);
     }
   }
 
@@ -807,11 +809,7 @@ export default class DispatchStateContainer {
       }
     } catch (error: any) {
       baseETProps.showProgress(false);
-      Logger.getInstance().logEvent(
-        'moveToNextET',
-        error.message,
-        LOG_TYPE.SDK_ERROR
-      );
+      Logger.getInstance().logCora("Error", `moveToNextET: ${error}`);
     }
   }
 
@@ -834,11 +832,7 @@ export default class DispatchStateContainer {
           isLastTask
         );
       } catch (error: any) {
-        Logger.getInstance().logEvent(
-          'saveAndProceed',
-          error.message,
-          LOG_TYPE.SDK_ERROR
-        );
+        Logger.getInstance().logCora("Error", `saveAndProceedToNextET: ${error}`);
         baseETProps.showProgress(false);
         showToast(error.message);
       }

package/src/manager/sdk/DispatchSDKManager.ts

@@ -23,7 +23,7 @@ export class DispatchSDKManager {
   private cache: DispatchSdkCache = DispatchSdkCache.getInstance();
   private keys = DispatchSdkCache.KEYS;
 
-  private constructor() {}
+  private constructor() { }
 
   public static getInstance(): DispatchSDKManager {
     if (!DispatchSDKManager.instance) {
@@ -104,6 +104,7 @@ export class DispatchSDKManager {
       sdkConfig.debugLevelLog ? 'debug' : 'emerg'
     );
     AppSyncManager.getInstance().startSDKSyncManager();
+    Logger.getInstance().logCora("Info", "Dispatch SDK Initialized");
   }
 
   public removeLocationUpdates() {

package/src/manager/syncmanager/AppSyncManager.ts

@@ -61,11 +61,7 @@ export default class AppSyncManager {
   ): AppSyncManager {
     // removing this check to allow tenant change in app due to this manager instance did't re-init and event and docs didn't sync
     // if (!AppSyncManager.instance) {
-    Logger.getInstance().logEvent(
-      'initAppSync',
-      'CREATING NEW INSTANCE',
-      LOG_TYPE.SDK_INFO
-    );
+    Logger.getInstance().logCora("Info", `AppSyncManager initialized with ${tenantBaseURL}`);
     AppSyncManager.instance = new AppSyncManager(
       tenantBaseURL,
       syncRetryCount
@@ -108,11 +104,7 @@ export default class AppSyncManager {
         AppSyncManager.getInstance().isSyncActive = false;
       }
     } catch (error: any) {
-      Logger.getInstance().logEvent(
-        'startAppSyncManager',
-        `Unable to start App Sync Manager ${error.message}`,
-        LOG_TYPE.SDK_WARNING
-      );
+      Logger.getInstance().logCora("Error", `AppSyncManager startAppSyncManager: ${error}`);
     }
   }
 
@@ -176,13 +168,7 @@ export default class AppSyncManager {
       AppSyncManager.getInstance().startSDKSyncManager();
       return true;
     } catch (error: any) {
-      Logger.getInstance().logEvent(
-        'pushToQueue ',
-        JSON.stringify({
-          errorMessage: error.message,
-        }),
-        LOG_TYPE.SDK_ERROR
-      );
+      Logger.getInstance().logCora("Error", `AppSyncManager pushToQueue: ${error}`);
       return false;
     }
   }

package/src/manager/syncmanager/document/DocumentHttpClient.ts

@@ -18,100 +18,106 @@ export default class DocumentHttpClient extends HttpClient {
   constructor(baseURL: string) {
     super(baseURL);
   }
+
   public async uploadDocument(document: DocumentRow): Promise<string | null> {
-    if (document.base64 && document.data != null) {
-      const response = await this.uploadBase64File(document);
-      let info = '';
-      if (
-        response &&
-        response.data !== null &&
-        response.data.body !== null &&
-        response.status !== 202
-      ) {
-        let body = response.data.body;
-        info = body.substring(40);
-      } else {
-        info = String(response.status);
-      }
-      let extraParameters = {
-        response: info,
-        fName: document.file_name && document.file_name.length != 0 ? document.file_name.substring(4) : '',
-        dName: document.fms_folder_id && document.fms_folder_id.length != 0 ? document.fms_folder_id.substring(4) : '',
-        dispId: document.dispatch_id && document.dispatch_id.length != 0 ? document.dispatch_id.substring(9) : ''
-      };
+    try {
+      if (document.base64 && document.data != null) {
+        const response = await this.uploadBase64File(document);
+        let info = '';
+        if (
+          response &&
+          response.data !== null &&
+          response.data.body !== null &&
+          response.status !== 202
+        ) {
+          let body = response.data.body;
+          info = body.substring(40);
+        } else {
+          info = String(response.status);
+        }
+        let extraParameters = {
+          response: info,
+          fName: document.file_name && document.file_name.length != 0 ? document.file_name.substring(4) : '',
+          dName: document.fms_folder_id && document.fms_folder_id.length != 0 ? document.fms_folder_id.substring(4) : '',
+          dispId: document.dispatch_id && document.dispatch_id.length != 0 ? document.dispatch_id.substring(9) : ''
+        };
 
-      fireEventWithScreenName({
-        severityLevel: SeverityLevelValue.LOG,
-        eventName: SentryEventNameSdkConstants.API_RESPONSE,
-        screenName: 'uploadDocument:Upload_Base64_File_Response',
-        extraParams: extraParameters,
-      });
+        fireEventWithScreenName({
+          severityLevel: SeverityLevelValue.LOG,
+          eventName: SentryEventNameSdkConstants.API_RESPONSE,
+          screenName: 'uploadDocument:Upload_Base64_File_Response',
+          extraParams: extraParameters,
+        });
 
-      Logger.getInstance().logEvent(
-        'uploadDocument:uploadBase64FileResponse',
-        flattenObject(extraParameters),
-        LOG_TYPE.SDK_ERROR
-      );
-      if (
-        response &&
-        response.data != null &&
-        response.data.data != null &&
-        response.data.data.id &&
-        response.status === 202
-      ) {
-        return response.data.data.id;
-      } else {
-        return null;
-      }
-    } else {
-      const uploadResponse = await this.uploadBinaryFile(document);
-      let info = '';
-      if (
-        uploadResponse &&
-        uploadResponse.body !== null &&
-        uploadResponse.status !== 202
-      ) {
-        let body = uploadResponse.body;
-        info = body.substring(40);
+        Logger.getInstance().logEvent(
+          'uploadDocument:uploadBase64FileResponse',
+          flattenObject(extraParameters),
+          LOG_TYPE.SDK_ERROR
+        );
+        if (
+          response &&
+          response.data != null &&
+          response.data.data != null &&
+          response.data.data.id &&
+          response.status === 202
+        ) {
+          return response.data.data.id;
+        } else {
+          return null;
+        }
       } else {
-        info = String(uploadResponse.status);
-      }
-      let extraParameters = {
-        response: info,
-        fName: document.file_name && document.file_name.length != 0 ? document.file_name.substring(4) : '',
-        dName: document.fms_folder_id && document.fms_folder_id.length != 0 ? document.fms_folder_id.substring(4) : '',
-        dispId: document.dispatch_id && document.dispatch_id.length != 0 ? document.dispatch_id.substring(9) : ''
-      };
+        const uploadResponse = await this.uploadBinaryFile(document);
+        let info = '';
+        if (
+          uploadResponse &&
+          uploadResponse.body !== null &&
+          uploadResponse.status !== 202
+        ) {
+          let body = uploadResponse.body;
+          info = body.substring(40);
+        } else {
+          info = String(uploadResponse.status);
+        }
+        let extraParameters = {
+          response: info,
+          fName: document.file_name && document.file_name.length != 0 ? document.file_name.substring(4) : '',
+          dName: document.fms_folder_id && document.fms_folder_id.length != 0 ? document.fms_folder_id.substring(4) : '',
+          dispId: document.dispatch_id && document.dispatch_id.length != 0 ? document.dispatch_id.substring(9) : ''
+        };
 
-      fireEventWithScreenName({
-        severityLevel: SeverityLevelValue.LOG,
-        eventName: SentryEventNameSdkConstants.API_RESPONSE,
-        screenName: 'uploadDocument:Upload_Binary_File_Response',
-        extraParams: extraParameters,
-      });
-      Logger.getInstance().logEvent(
-        'uploadDocument:uploadBinaryFileResponse',
-        flattenObject(extraParameters),
-        LOG_TYPE.SDK_ERROR
-      );
-      if (
-        uploadResponse != null &&
-        uploadResponse.status === 202 &&
-        uploadResponse.body != null
-      ) {
+        fireEventWithScreenName({
+          severityLevel: SeverityLevelValue.LOG,
+          eventName: SentryEventNameSdkConstants.API_RESPONSE,
+          screenName: 'uploadDocument:Upload_Binary_File_Response',
+          extraParams: extraParameters,
+        });
         Logger.getInstance().logEvent(
-          'uploadDocument:DeletingFiles',
+          'uploadDocument:uploadBinaryFileResponse',
           flattenObject(extraParameters),
           LOG_TYPE.SDK_ERROR
         );
-        FileSystem.deleteAsync(document.file_path).then().catch(); // WE DELETE FILE HERE
-        if (document?.processed_file_path != null && document?.processed_file_path != '') {
-          FileSystem.deleteAsync(document.processed_file_path).then().catch(); // WE DELETE FILE HERE
+        if (
+          uploadResponse != null &&
+          uploadResponse.status === 202 &&
+          uploadResponse.body != null
+        ) {
+          Logger.getInstance().logEvent(
+            'uploadDocument:DeletingFiles',
+            flattenObject(extraParameters),
+            LOG_TYPE.SDK_ERROR
+          );
+          FileSystem.deleteAsync(document.file_path).then().catch(); // WE DELETE FILE HERE
+          if (document?.processed_file_path != null && document?.processed_file_path != '') {
+            FileSystem.deleteAsync(document.processed_file_path).then().catch(); // WE DELETE FILE HERE
+          }
+          return JSON.parse(uploadResponse.body)?.data?.id;
+        } else {
+          return null;
         }
-        return JSON.parse(uploadResponse.body)?.data?.id;
-      } else {
-        return null;
       }
+    } catch (error: any) {
+      Logger.getInstance().logCora("Error", `DocumentHttpClient uploadDocument: ${error}`);
+      return null;
     }
   }
 
@@ -185,7 +191,6 @@ export default class DocumentHttpClient extends HttpClient {
   private async uploadBinaryFile(
     document: DocumentRow
   ): Promise<FileSystemUploadResult> {
-
     let sdkConfig = (await cache.getObjectFromCache(
       cacheKeys.SDK_CONFIG
     )) as DispatchSDKConfig;
@@ -203,8 +208,7 @@ export default class DocumentHttpClient extends HttpClient {
     }
     const fileStat = await RNFS.stat(filePathToUpload);
 
-    const url =
-      sdkConfig.tenantBaseURL + `/api/folders/${document.fms_folder_id}/files`;
+    const url = sdkConfig.tenantBaseURL + `/api/folders/${document.fms_folder_id}/files`;
 
     let extraParameters = {
       fSize: fileStat.size + " b",

package/src/manager/syncmanager/document/DocumentManager.ts

@@ -57,7 +57,6 @@ export default class DocumentManager {
     processedFilePath?: string | null,
     priority?: number
   ): Promise<SQLResultSet> {
-    console.log('insertDocument2:', fmsFolderID);
     return await Database.executeQuery(
       `INSERT INTO ${DOCUMENT_TABLE}(\
                                     ${DOCUMENT_COLUMNS.DATA},\