@os1-platform/dispatch-mobile 2.1.11 → 2.1.13

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

@@ -127,8 +127,7 @@ export default class DocumentSyncManager {
         let syncPending = await this.isSyncPending();
         if (syncPending && hasNetwork) {
           await this.startDocumentSync();
-        }else{
-          let cta = 'startDocumentSync-error'
+          let cta = 'startDocumentSync-finally-sync-pending'
           let extraParameters = {
             hasNetwork: hasNetwork,
             pending: syncPending,
@@ -150,7 +149,7 @@ export default class DocumentSyncManager {
         }
       }
     } else {
-      let cta = 'startDocumentSync'
+      let cta = 'startDocumentSync-max-count-reach-in-progress'
       fireEventWithScreenName({
         severityLevel: SeverityLevelValue.LOG,
         eventName: SentryEventNameSdkConstants.APP_LOG,
@@ -205,21 +204,6 @@ export default class DocumentSyncManager {
       );
     else {
       if (!this.docManager) {
-        let cta = 'insertDocument'
-        fireEventWithScreenName({
-          severityLevel: SeverityLevelValue.LOG,
-          eventName: SentryEventNameSdkConstants.APP_LOG,
-          screenName: cta,
-          cta: cta,
-          extraParams: {
-            msg:'INIT DOC SYNC AGAIN'
-          },
-        });
-        Logger.getInstance().logEvent(
-          cta,
-          'INIT DOC SYNC AGAIN',
-          LOG_TYPE.SDK_ERROR
-        );
         this.docManager = await DocumentManager.getInstance();
       }
       console.log('insertDocument1:',fmsFolderID);
@@ -238,6 +222,21 @@ export default class DocumentSyncManager {
         processedFilePath,
         priority
       );
+      let cta = 'insertDocument'
+      fireEventWithScreenName({
+        severityLevel: SeverityLevelValue.LOG,
+        eventName: SentryEventNameSdkConstants.APP_LOG,
+        screenName: cta,
+        cta: cta,
+        extraParams: {
+          msg:'INIT DOC SYNC AGAIN'
+        },
+      });
+      Logger.getInstance().logEvent(
+        cta,
+        'INIT DOC SYNC AGAIN',
+        LOG_TYPE.SDK_ERROR
+      );
       return insertResponse;
     }
   }
@@ -284,11 +283,22 @@ export default class DocumentSyncManager {
       let eventsManager = await ETEventsManager.getInstance();
       let podId = POD_DOC + '_' + documentRow.id;
 
+
       let extraParameters = {
         podId: podId,
       };
+      let cta = 'updateDocumentWithAttempt-success'
+      fireEventWithScreenName({
+        severityLevel: SeverityLevelValue.LOG,
+        eventName: SentryEventNameSdkConstants.APP_LOG,
+        screenName: cta,
+        cta: cta,
+        extraParams: {
+          msg:flattenObject(extraParameters)
+        },
+      });
       Logger.getInstance().logEvent(
-        'updateDocumentWithAttempt-success',
+        cta,
         flattenObject(extraParameters),
         LOG_TYPE.SDK_ERROR
       );
@@ -648,7 +658,6 @@ export default class DocumentSyncManager {
         flattenObject(extra),
         LOG_TYPE.SDK_ERROR
       );
-      console.log('uploadDocToServer999:', docRow);
       let fmsID = await this.documentHttpClient?.uploadDocument(docRow);
 
       let extraParameters = {
@@ -741,7 +750,7 @@ export default class DocumentSyncManager {
       });
       Logger.getInstance().logEvent(
         cta,
-        extraParameters ? flattenObject(extraParameters) : error,
+        extraParameters ? flattenObject(extraParameters) : flattenObject((error)),
         LOG_TYPE.SDK_ERROR
       );
       if (!this.docManager) {

package/src/manager/syncmanager/events/ETEventsManager.ts

@@ -639,7 +639,8 @@ export default class ETEventsManager {
     const sqlResult = await Database.executeQuery(
       `SELECT * from ${EVENTS_TABLE}\
             WHERE ${EVENTS_COLUMNS.ID} = ? and \
-            ${EVENTS_COLUMNS.DISPATCH_ID} = ? \
+            ${EVENTS_COLUMNS.DISPATCH_ID} = ? and \
+            ${EVENTS_COLUMNS.SYNCED} = 0 \
             ORDER BY ${EVENTS_COLUMNS.ID} ASC;`,
       [id, dispatchId]
     );

package/src/manager/syncmanager/events/EventsSyncManager.ts

@@ -61,11 +61,12 @@ export default class EventsSyncManager {
     if (!this.inProgress && this._retries < this.maxRetryCount) {
       this.inProgress = true;
       const hasNetwork = await NetworkUtil.isAvailableAsync();
+      if (!this.eventsManager) {
+        this.eventsManager = await ETEventsManager.getInstance();
+      }
       try {
         this.checkForInitialization();
-        if (!this.eventsManager) {
-          this.eventsManager = await ETEventsManager.getInstance();
-        }
+      
         if (hasNetwork) {
           // NEW CODE
           const lastSyncedEventId = await Storage.getInstance().getSharedItem(
@@ -90,7 +91,8 @@ export default class EventsSyncManager {
             }
             arrEventsToSync.push(bulkEventRows[index]);
           }
-          if (arrEventsToSync.length) {
+
+          if (arrEventsToSync.length != 0) {
             await this.syncBulkEventToServer(
               arrEventsToSync,
               lastSyncedEventId
@@ -109,7 +111,7 @@ export default class EventsSyncManager {
               arrEventsToSync: arrEventsToSync.length
             };
             Logger.getInstance().logEvent(
-              'startSync-no-event-to-sync',
+              'startSync-no-event-to-sync-else',
               flattenObject(extraParameters),
               LOG_TYPE.SDK_ERROR
             );
@@ -140,18 +142,36 @@ export default class EventsSyncManager {
         );
       } finally {
         this.inProgress = false;
-        if ((await this.isSyncPending()) && hasNetwork) {
+        const lastSyncedEventId = await Storage.getInstance().getSharedItem(
+          LAST_SYNCED_EVENT_ID
+        );
+        const dspID = await DispatchSdkCache.getInstance().getKeyFromCache(
+          DispatchSdkCache.KEYS.DISPATCH_ID
+        );
+
+        const bulkEventRows = await this.eventsManager.getBulkRowsToSync(
+          lastSyncedEventId,
+          dspID ?? ''
+        );
+
+        var arrEventsToSync: EventRow[] = [];
+
+        // Filtering and removing those events which are type of POD_DOC
+        for (var index in bulkEventRows) {
+          let syncType = bulkEventRows[index].sync_type;
+          if (syncType.includes(POD_DOC)) {
+            break;
+          }
+          arrEventsToSync.push(bulkEventRows[index]);
+        }
+        let extraParameters = {
+          hasNetwork: hasNetwork,
+          pending: arrEventsToSync.length != 0,
+        };
+        console.log("finally:",arrEventsToSync.length);
+        if (arrEventsToSync.length != 0 && hasNetwork) {
           await this.startSync();
-        }else{
-          let extraParameters = {
-            hasNetwork: hasNetwork,
-            pending: this.isSyncPending(),
-          };
-          Logger.getInstance().logEvent(
-            'startSync-inprogress-syncpending-hasnetwork',
-            flattenObject(extraParameters),
-            LOG_TYPE.SDK_ERROR
-          );
+          Logger.getInstance().logEvent('startSync-finally-data-sync-available', flattenObject(extraParameters), LOG_TYPE.SDK_ERROR);
         }
       }
     } else {
@@ -277,6 +297,7 @@ export default class EventsSyncManager {
       this.eventsManager = await ETEventsManager.getInstance();
     }
 
+  
     // NEW CODE
     const lastSyncedEventId = await Storage.getInstance().getSharedItem(
       LAST_SYNCED_EVENT_ID

package/src/utils/Logger.ts

@@ -43,9 +43,10 @@ class Logger {
     ) {
       crashlytics().recordError(new Error(message), TAG);
       //this.sendSentryException(new Error(message), TAG, logType);
-    }
+     }
   }
 
+
   public static getInstance(): Logger {
     if (!Logger.instance) {
       Logger.instance = new Logger();