@os1-platform/dispatch-mobile 3.1.8 → 3.2.0

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

@@ -1,7 +1,6 @@
 import { DOCUMENT_COLUMNS, DOCUMENT_TABLE, DocumentRow } from '../DBConfig';
 import { MAX_RETRY_COUNT, PROCESS_MAX_RETRIED_ROWS } from '../constants';
-import * as Database from '../database';
-import type { SQLResultSet } from 'expo-sqlite';
+import Database from '../database';
 
 export default class DocumentManager {
   private static instance: DocumentManager;
@@ -18,7 +17,7 @@ export default class DocumentManager {
   }
 
   public async init(): Promise<void> {
-    await Database.executeQuery(
+    await Database.executeSetDataQuery(
       `CREATE TABLE IF NOT EXISTS ${DOCUMENT_TABLE} (\
                     ${DOCUMENT_COLUMNS.ID} INTEGER PRIMARY KEY AUTOINCREMENT,\
                     ${DOCUMENT_COLUMNS.DATA} TEXT,\
@@ -41,7 +40,7 @@ export default class DocumentManager {
   }
 
   public async truncateDocumentTable(): Promise<void> {
-    await Database.executeQuery(`DELETE FROM ${DOCUMENT_TABLE};`, []);
+    await Database.executeSetDataQuery(`DELETE FROM ${DOCUMENT_TABLE};`, []);
   }
 
   public async insertDocument(
@@ -56,8 +55,8 @@ export default class DocumentManager {
     geoTimeStamp?: string | null,
     processedFilePath?: string | null,
     priority?: number
-  ): Promise<SQLResultSet> {
-    return await Database.executeQuery(
+  ): Promise<any> {
+    return await Database.executeSetDataQuery(
       `INSERT INTO ${DOCUMENT_TABLE}(\
                                     ${DOCUMENT_COLUMNS.DATA},\
                                     ${DOCUMENT_COLUMNS.DISPATCH_ID},\
@@ -89,13 +88,13 @@ export default class DocumentManager {
 
   public async getAllDocuments(dispatchID?: string): Promise<DocumentRow[]> {
     if (!dispatchID) {
-      const resultSet = await Database.executeQuery(
+      const resultSet = await Database.executeGetDataQuery(
         `SELECT * FROM ${DOCUMENT_TABLE};`,
         []
       );
       return resultSet.rows._array;
     } else {
-      const resultSet = await Database.executeQuery(
+      const resultSet = await Database.executeGetDataQuery(
         `SELECT * FROM ${DOCUMENT_TABLE}\
               WHERE ${DOCUMENT_COLUMNS.DISPATCH_ID} =?;`,
         [dispatchID]
@@ -106,14 +105,13 @@ export default class DocumentManager {
 
   public async getAllUnsyncedDocs(): Promise<DocumentRow[]> {
     if (PROCESS_MAX_RETRIED_ROWS) {
-      let resultSet = await Database.executeQuery(
-        `SELECT * from ${DOCUMENT_TABLE}\
-              WHERE ${DOCUMENT_COLUMNS.SYNCED} = 0;`,
+      let resultSet = await Database.executeGetDataQuery(
+        `SELECT * from ${DOCUMENT_TABLE} WHERE ${DOCUMENT_COLUMNS.SYNCED} = 0;`,
         []
       );
       return resultSet.rows._array;
     } else {
-      let resultSet = await Database.executeQuery(
+      let resultSet = await Database.executeGetDataQuery(
         `SELECT * from ${DOCUMENT_TABLE}\
               WHERE ${DOCUMENT_COLUMNS.SYNCED} = 0 AND ${DOCUMENT_COLUMNS.ATTEMPT_COUNT} < ${MAX_RETRY_COUNT};`,
         []
@@ -123,7 +121,7 @@ export default class DocumentManager {
   }
 
   public deleteAllSyncedDocuments(dispatchID: string) {
-    return Database.executeQuery(
+    return Database.executeSetDataQuery(
       `DELETE FROM ${DOCUMENT_TABLE}\
             WHERE ${DOCUMENT_COLUMNS.SYNCED} = 1 and ${DOCUMENT_COLUMNS.DISPATCH_ID} = ?;`,
       [dispatchID]
@@ -132,7 +130,7 @@ export default class DocumentManager {
 
   public async markDocumentSynced(id: number, fmsID: string): Promise<void> {
     if (!id || !fmsID) return;
-    await Database.executeQuery(
+    await Database.executeSetDataQuery(
       `UPDATE ${DOCUMENT_TABLE} SET ${DOCUMENT_COLUMNS.SYNCED} = 1,${DOCUMENT_COLUMNS.FMS_ID} = ?  WHERE ${DOCUMENT_COLUMNS.ID} = ?;`,
       [fmsID, id]
     );
@@ -146,7 +144,7 @@ export default class DocumentManager {
     sync: number
   ): Promise<void> {
     if (!id) return;
-    await Database.executeQuery(
+    await Database.executeSetDataQuery(
       `UPDATE ${DOCUMENT_TABLE} SET ${DOCUMENT_COLUMNS.SYNCED} = ?,${DOCUMENT_COLUMNS.FMS_ID} = ?,${DOCUMENT_COLUMNS.ATTEMPT_COUNT} = ?  WHERE ${DOCUMENT_COLUMNS.ID} = ?;`,
       [sync, fmsID, attempt, id]
     );
@@ -158,7 +156,7 @@ export default class DocumentManager {
     processedFilePath: String
   ): Promise<void> {
     if (!id || !processedFilePath) return;
-    await Database.executeQuery(
+    await Database.executeSetDataQuery(
       `UPDATE ${DOCUMENT_TABLE} SET ${DOCUMENT_COLUMNS.FILE_PATH} = ?, ${DOCUMENT_COLUMNS.PROCESSED_FILE_PATH} = ? WHERE ${DOCUMENT_COLUMNS.ID} = ?;`,
       [origialFilePath, processedFilePath, id]
     );
@@ -169,11 +167,8 @@ export default class DocumentManager {
     uploadError: string
   ): Promise<void> {
     if (!id) throw new TypeError('Document ID cannot be null');
-    await Database.executeQuery(
-      `UPDATE ${DOCUMENT_TABLE}\
-            SET \
-            ${DOCUMENT_COLUMNS.SYNC_ERROR} = ?\
-            WHERE ${DOCUMENT_COLUMNS.ID} = ?;`,
+    await Database.executeSetDataQuery(
+      `UPDATE ${DOCUMENT_TABLE} SET ${DOCUMENT_COLUMNS.SYNC_ERROR} = ? WHERE ${DOCUMENT_COLUMNS.ID} = ?;`,
       [uploadError, id]
     );
   }
@@ -183,7 +178,7 @@ export default class DocumentManager {
     priority: number
   ): Promise<void> {
     if (!id) throw new TypeError('Document ID cannot be null');
-    await Database.executeQuery(
+    await Database.executeSetDataQuery(
       `UPDATE ${DOCUMENT_TABLE}\
             SET \
             ${DOCUMENT_COLUMNS.PRIORITY} = ?\
@@ -196,7 +191,7 @@ export default class DocumentManager {
   public async getUnsyncedDocument(): Promise<DocumentRow[]> {
     // If it is allowed max_retried_rows are allowed to process then it will refetch those data which are even have tried max attempt otherwise it will skip those events.
     if (PROCESS_MAX_RETRIED_ROWS) {
-      let rs = await Database.executeQuery(
+      let rs = await Database.executeGetDataQuery(
         `SELECT * from ${DOCUMENT_TABLE}\
               WHERE ${DOCUMENT_COLUMNS.SYNCED} = 0 \
               ORDER BY ${DOCUMENT_COLUMNS.PRIORITY} ASC LIMIT 1;`,
@@ -204,7 +199,7 @@ export default class DocumentManager {
       );
       return rs.rows._array;
     } else {
-      let rs = await Database.executeQuery(
+      let rs = await Database.executeGetDataQuery(
         `SELECT * from ${DOCUMENT_TABLE}\
               WHERE ${DOCUMENT_COLUMNS.SYNCED} = 0 AND ${DOCUMENT_COLUMNS.ATTEMPT_COUNT} < ${MAX_RETRY_COUNT} \
               ORDER BY ${DOCUMENT_COLUMNS.PRIORITY} ASC LIMIT 1;`,

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

@@ -9,7 +9,6 @@ import BaseErrorCodes, {
   SyncManagerNotInitialized,
 } from '../../../errors/ErrorCodes';
 import Logger, { LOG_TYPE } from '../../../utils/Logger';
-import type { SQLResultSet } from 'expo-sqlite';
 import NetworkUtil from '../../../utils/NetworkUtil';
 import ETEventsManager from '../events/ETEventsManager';
 import { LAST_SYNCED_EVENT_ID, MAX_RETRY_COUNT, POD_DOC } from '../../syncmanager/constants';
@@ -162,7 +161,7 @@ export default class DocumentSyncManager {
     geoTimeStamp: string,
     processedFilePath: string,
     priority: number = 1
-  ): Promise<SQLResultSet> {
+  ): Promise<any> {
     if (
       isEmptyOrBlank(desc) ||
       isEmptyOrBlank(dspID) ||
@@ -407,100 +406,114 @@ export default class DocumentSyncManager {
 
   // This function will generate overlay base64 data and update documents table for processed_file_path columns with overlayed base64 data.
   private async processBase64Data(documentRow: DocumentRow) {
+    let cta = 'processBase64Data-started';
+    let extra = {
+      msg: 'processBase64Data-started',
+      fName: documentRow.file_name && documentRow.file_name.length != 0 ? documentRow.file_name.substring(4) : '',
+      dName: documentRow.fms_folder_id && documentRow.fms_folder_id.length != 0 ? documentRow.fms_folder_id.substring(4) : '',
+      dispId: documentRow.dispatch_id && documentRow.dispatch_id.length != 0 ? documentRow.dispatch_id.substring(9) : ''
+    };
     if (
       documentRow.processed_file_path === null ||
       documentRow.processed_file_path === ''
     ) {
-      let cta = 'processBase64Data-started';
-      let extra = {
-        msg: 'processBase64Data-started',
-        fName: documentRow.file_name && documentRow.file_name.length != 0 ? documentRow.file_name.substring(4) : '',
-        dName: documentRow.fms_folder_id && documentRow.fms_folder_id.length != 0 ? documentRow.fms_folder_id.substring(4) : '',
-        dispId: documentRow.dispatch_id && documentRow.dispatch_id.length != 0 ? documentRow.dispatch_id.substring(9) : ''
-      };
-      fireEventWithScreenName({
-        severityLevel: SeverityLevelValue.LOG,
-        eventName: SentryEventNameSdkConstants.APP_LOG,
-        screenName: cta,
-        cta: cta,
-        extraParams: extra,
-      });
-      Logger.getInstance().logEvent(
-        cta,
-        flattenObject(extra),
-        LOG_TYPE.SDK_ERROR
-      );
       let filePath = '';
-      // If templrary base 64 file already exist then do not create again
-      if (documentRow.file_path === null || documentRow.file_path === '') {
-        const imagePath = `${RNFS.TemporaryDirectoryPath}/${documentRow.file_name}`;
-        await RNFS.writeFile(imagePath, documentRow.data, 'base64'); // Write file to temprary location
-        filePath = imagePath;
-        // If file generated frommbase64 data does not have file:// then we are adding manually.
-        if (!imagePath.includes('file')) {
-          filePath = `file://${imagePath}`;
+      try {
+        fireEventWithScreenName({
+          severityLevel: SeverityLevelValue.LOG,
+          eventName: SentryEventNameSdkConstants.APP_LOG,
+          screenName: cta,
+          cta: cta,
+          extraParams: extra,
+        });
+        Logger.getInstance().logEvent(
+          cta,
+          flattenObject(extra),
+          LOG_TYPE.SDK_ERROR
+        );
+
+        // If templrary base 64 file already exist then do not create again
+        if (documentRow.file_path === null || documentRow.file_path === '') {
+          const imagePath = `${RNFS.TemporaryDirectoryPath}/${documentRow.file_name}`;
+          await RNFS.writeFile(imagePath, documentRow.data, 'base64'); // Write file to temprary location
+          filePath = imagePath;
+          // If file generated frommbase64 data does not have file:// then we are adding manually.
+          if (!imagePath.includes('file')) {
+            filePath = `file://${imagePath}`;
+          }
+          documentRow.file_path = filePath;
+        } else {
+          filePath = documentRow.file_path;
         }
-        documentRow.file_path = filePath;
-      } else {
-        filePath = documentRow.file_path;
-      }
-      let pFilePath = 'processed_' + documentRow.file_name; // File name for processed file.
-      let strGeoStamp = documentRow.geo_timestamp; // Saved geostamp string
-      let objGeoStamp = JSON.parse(strGeoStamp); // Conversion to geostamp object
-      let dateTime = objGeoStamp.dateTime; // Date time stamp in UTC format
-      let lat = objGeoStamp.lat; // Latitide
-      let lng = objGeoStamp.lng; // Longitude
-      let accuracy = objGeoStamp.accuracy; // Location accuracy
-      let strDMS = latlngToDms(`${lat}, ${lng}`); // Location in degree format
-      let strDMSWithAccuracy = strDMS;
-      if (accuracy !== '') {
-        strDMSWithAccuracy = strDMS + ' (Accuracy: ' + accuracy + 'm)'; // Appedning accuracy in location 
-      }
-      const options = {
-        backgroundImage: {
-          src: filePath, // Image for overlay
-          scale: 1,
-        },
-        watermarkTexts: [
-          {
-            text: `${dateTime}\n${strDMSWithAccuracy}`, // Ooverlay text
-            position: {
-              position: Position.topLeft, // Overlay text position
-            },
-            style: { // Style for overlay
-              color: '#ffffff',
-              fontSize: 14,
-              fontName: 'Arial',
-              textBackgroundStyle: {
-                padding: '1% 1%',
-                type: TextBackgroundType.none,
-                color: '#444444CC',
+        let pFilePath = 'processed_' + documentRow.file_name; // File name for processed file.
+        let strGeoStamp = documentRow.geo_timestamp; // Saved geostamp string
+        let objGeoStamp = JSON.parse(strGeoStamp); // Conversion to geostamp object
+        let dateTime = objGeoStamp.dateTime; // Date time stamp in UTC format
+        let lat = objGeoStamp.lat; // Latitide
+        let lng = objGeoStamp.lng; // Longitude
+        let accuracy = objGeoStamp.accuracy; // Location accuracy
+        let strDMS = latlngToDms(`${lat}, ${lng}`); // Location in degree format
+        let strDMSWithAccuracy = strDMS;
+        if (accuracy !== '') {
+          strDMSWithAccuracy = strDMS + ' (Accuracy: ' + accuracy + 'm)'; // Appedning accuracy in location 
+        }
+        const options = {
+          backgroundImage: {
+            src: filePath, // Image for overlay
+            scale: 1,
+          },
+          watermarkTexts: [
+            {
+              text: `${dateTime}\n${strDMSWithAccuracy}`, // Ooverlay text
+              position: {
+                position: Position.topLeft, // Overlay text position
+              },
+              style: { // Style for overlay
+                color: '#ffffff',
+                fontSize: 14,
+                fontName: 'Arial',
+                textBackgroundStyle: {
+                  padding: '1% 1%',
+                  type: TextBackgroundType.none,
+                  color: '#444444CC',
+                },
               },
             },
-          },
-        ],
-        scale: 1,
-        quality: 100,
-        filename: pFilePath,
-        saveFormat: ImageFormat.base64, // Saving in base6 format
-      };
-      let processedBase64 = await Marker.markText(options); // Generating overlay image
-      if (processedBase64 !== null && processedBase64 !== '') {
-        // Fetching base64 data from processed data.
-        var splittedDase64Data = processedBase64.split(
-          'data:image/png;base64,'
-        );
-        // Updating document document table with overlayed base64 data
+          ],
+          scale: 1,
+          quality: 100,
+          filename: pFilePath,
+          saveFormat: ImageFormat.base64, // Saving in base6 format
+        };
+        let processedBase64 = await Marker.markText(options); // Generating overlay image
+        if (processedBase64 !== null && processedBase64 !== '') {
+          // Fetching base64 data from processed data.
+          var splittedDase64Data = processedBase64.split(
+            'data:image/png;base64,'
+          );
+          // Updating document document table with overlayed base64 data
+          await this.updateDocumentProcessedPath(
+            documentRow,
+            filePath,
+            splittedDase64Data[1]
+          );
+          documentRow.processed_file_path = splittedDase64Data[1];
+        }
+      } catch (error: any) {
+        console.log('====================================');
+        console.log('processBase64Data-error:', error);
+        console.log('====================================');
+        // Updating document document table with original base64 data
         await this.updateDocumentProcessedPath(
           documentRow,
           filePath,
-          splittedDase64Data[1]
+          filePath
         );
-        documentRow.processed_file_path = splittedDase64Data[1];
+        documentRow.processed_file_path = "";
       }
     }
-    let cta = 'processBase64Data-completed';
-    let extra = {
+    cta = 'processBase64Data-completed';
+    extra = {
       msg: 'processBase64Data-completed',
       fName: documentRow.file_name && documentRow.file_name.length != 0 ? documentRow.file_name.substring(4) : '',
       dName: documentRow.fms_folder_id && documentRow.fms_folder_id.length != 0 ? documentRow.fms_folder_id.substring(4) : '',

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

@@ -3,7 +3,6 @@ import {
   BulkEvent,
   CustodyData,
   DispatchSyncType,
-  EventETData,
   EventRow,
   EVENTS_COLUMNS,
   EVENTS_TABLE,
@@ -11,18 +10,15 @@ import {
   ExecEngineSyncType,
   WFUpdateBulkEventData,
   WIUpdateOutputPayload,
-  WORKFLOW_INSTANCE_COLUMNS,
-  WORKFLOW_INSTANCE_TABLE,
 } from '../DBConfig';
-import type { ExecQuery } from '../database';
-import * as Database from '../database';
+import type { ExecQuery } from "../../../utils/Constants";
+import Database from '../database';
 import { BaseError } from '../../../errors/BaseError';
 import BaseErrorCodes, {
   InvalidArgumentsError,
 } from '../../../errors/ErrorCodes';
 import Logger, { LOG_TYPE } from '../../../utils/Logger';
 import { BULK_DATA_LIMIT, MAX_RETRY_COUNT, PROCESS_MAX_RETRIED_ROWS } from '../constants';
-import Storage from '../../../utils/storage';
 
 // NEW CODE
 import {
@@ -36,7 +32,7 @@ export default class ETEventsManager {
   private maxRetryCount: number = MAX_RETRY_COUNT;
   private _retries = 0;
 
-  private constructor() {}
+  private constructor() { }
 
   public static async getInstance(): Promise<ETEventsManager> {
     if (!ETEventsManager.instance) {
@@ -49,7 +45,7 @@ export default class ETEventsManager {
 
   // NEED TO REMOVE SYNCED, CONFIG, OBJECTIVE_REF
   private static async init(): Promise<void> {
-    await Database.executeQuery(
+    await Database.executeSetDataQuery(
       `CREATE TABLE IF NOT EXISTS ${EVENTS_TABLE} (\
                 ${EVENTS_COLUMNS.ID} INTEGER PRIMARY KEY AUTOINCREMENT,\
                 ${EVENTS_COLUMNS.DISPATCH_ID} TEXT NOT NULL,\
@@ -67,7 +63,7 @@ export default class ETEventsManager {
 
   // This is the function to insert POD_DOC type event in event table.
   async insertPODDocEvent(dspID: string, syncType: string): Promise<void> {
-    await Database.executeQuery(
+    await Database.executeSetDataQuery(
       `INSERT INTO ${EVENTS_TABLE}(${EVENTS_COLUMNS.DISPATCH_ID},${EVENTS_COLUMNS.SYNC_TYPE},${EVENTS_COLUMNS.PAYLOAD},${EVENTS_COLUMNS.DATA_LENGTH},${EVENTS_COLUMNS.META},${EVENTS_COLUMNS.SYNCED},${EVENTS_COLUMNS.CONFIG},${EVENTS_COLUMNS.SYNC_ERROR}) values (?,?,?,?,?,?,?,?)`,
       [dspID, syncType, '', 1, '', 0, '', '']
     );
@@ -81,7 +77,7 @@ export default class ETEventsManager {
     objectiveRef: string,
     config?: string
   ): Promise<void> {
-    await Database.executeQuery(
+    await Database.executeSetDataQuery(
       `INSERT INTO ${EVENTS_TABLE}(\
                 ${EVENTS_COLUMNS.PAYLOAD},\
                 ${EVENTS_COLUMNS.DISPATCH_ID},\
@@ -287,8 +283,6 @@ export default class ETEventsManager {
         _eventData.dispatchId,
         _eventData.syncType,
         _meta
-        // ? _evData.meta.jobId + _evData.meta.objectiveReference
-        // : 'NO_REF_FOUND'
       );
       queryData.push({
         query: `INSERT INTO ${EVENTS_TABLE}(\
@@ -444,13 +438,14 @@ export default class ETEventsManager {
         await Database.executeBulkQuery(queryData);
         this._retries = 0;
       }
-    } catch (err) {
+    } catch (err: any) {
+      Logger.getInstance().logEvent(
+        'insertBulkEvent-error',
+        err.message,
+        LOG_TYPE.SDK_DEBUG
+      );
+
       if (this._retries < this.maxRetryCount) {
-        Logger.getInstance().logEvent(
-          'insertBulkEvent ',
-          this._retries.toString(),
-          LOG_TYPE.SDK_DEBUG
-        );
         this._retries++;
         await this.insertBulkEvent(_eventData);
       } else {
@@ -528,14 +523,14 @@ export default class ETEventsManager {
 
   async getAllEvents(dispatchID?: string): Promise<EventRow[]> {
     if (dispatchID) {
-      const resultSet = await Database.executeQuery(
+      const resultSet = await Database.executeGetDataQuery(
         `SELECT * FROM ${EVENTS_TABLE}\
             WHERE ${EVENTS_COLUMNS.DISPATCH_ID} = ?;`,
         [dispatchID]
       );
       return resultSet.rows._array;
     } else {
-      const resultSet = await Database.executeQuery(
+      const resultSet = await Database.executeGetDataQuery(
         `SELECT * FROM ${EVENTS_TABLE};`,
         []
       );
@@ -544,7 +539,7 @@ export default class ETEventsManager {
   }
 
   async getAllUnsyncedEvents(): Promise<EventRow[]> {
-    let resultSet = await Database.executeQuery(
+    let resultSet = await Database.executeGetDataQuery(
       `SELECT * FROM ${EVENTS_TABLE} \
             where ${EVENTS_COLUMNS.SYNCED} = 0;`,
       []
@@ -571,7 +566,7 @@ export default class ETEventsManager {
 
   async updateError(id: number, syncError: string): Promise<void> {
     if (!id) throw new TypeError('Event ID cannot be null');
-    await Database.executeQuery(
+    await Database.executeSetDataQuery(
       `UPDATE ${EVENTS_TABLE} \
             SET \
             ${EVENTS_COLUMNS.SYNC_ERROR} = ?  WHERE ${EVENTS_COLUMNS.ID} = ?;`,
@@ -580,24 +575,24 @@ export default class ETEventsManager {
   }
 
   // This function will actualy update the POD_DOC type of event as sync along with attempt count.
-  async markPODDocEventSynced(sync: number, attempt:number, podDocId: String): Promise<void> {
+  async markPODDocEventSynced(sync: number, attempt: number, podDocId: String): Promise<void> {
     if (!podDocId) throw new TypeError('podDocId cannot be null');
-    await Database.executeQuery(
+    await Database.executeSetDataQuery(
       `UPDATE ${EVENTS_TABLE} SET ${EVENTS_COLUMNS.SYNCED} = ?, ${EVENTS_COLUMNS.ATTEMPT_COUNT} = ? WHERE ${EVENTS_COLUMNS.SYNC_TYPE} = ?;`,
-      [sync,attempt,podDocId]
+      [sync, attempt, podDocId]
     );
   }
 
   async markEventSynced(id: number): Promise<void> {
     if (!id) throw new TypeError('Event ID cannot be null');
-    await Database.executeQuery(
+    await Database.executeSetDataQuery(
       `UPDATE ${EVENTS_TABLE} SET ${EVENTS_COLUMNS.SYNCED} = 1 WHERE ${EVENTS_COLUMNS.ID} = ?;`,
       [id]
     );
   }
 
   async getWorkflowUpdateEvents(syncType: string): Promise<EventRow[]> {
-    let sqlResultSet = await Database.executeQuery(
+    let sqlResultSet = await Database.executeGetDataQuery(
       `SELECT * from ${EVENTS_TABLE}\
             WHERE ${EVENTS_COLUMNS.SYNCED} = 0\
             and ${EVENTS_COLUMNS.SYNC_TYPE} = ?\
@@ -607,7 +602,7 @@ export default class ETEventsManager {
     return sqlResultSet.rows._array;
   }
   async getJobRemovalEvents(syncType: string): Promise<EventRow[]> {
-    let sqlResultSet = await Database.executeQuery(
+    let sqlResultSet = await Database.executeGetDataQuery(
       `SELECT * from ${EVENTS_TABLE}\
             WHERE ${EVENTS_COLUMNS.SYNCED} = 0\
             and ${EVENTS_COLUMNS.SYNC_TYPE} = ?\
@@ -617,7 +612,7 @@ export default class ETEventsManager {
     return sqlResultSet.rows._array;
   }
   async getCustodyBatch(dispatchID: string): Promise<EventRow[]> {
-    const sqlResult = await Database.executeQuery(
+    const sqlResult = await Database.executeGetDataQuery(
       `SELECT * from ${EVENTS_TABLE}\
             WHERE ${EVENTS_COLUMNS.SYNCED} = 0 and \
             (${EVENTS_COLUMNS.SYNC_TYPE} = ? or ${EVENTS_COLUMNS.SYNC_TYPE} = ?) \
@@ -628,7 +623,7 @@ export default class ETEventsManager {
     return sqlResult.rows._array;
   }
   async getObjectiveDetails(objectiveRef: string): Promise<EventRow[]> {
-    let rs = await Database.executeQuery(
+    let rs = await Database.executeGetDataQuery(
       `SELECT * from ${EVENTS_TABLE} WHERE ${EVENTS_COLUMNS.META} = ?;`,
       [objectiveRef]
     );
@@ -636,7 +631,7 @@ export default class ETEventsManager {
   }
 
   async getRowToSync(id: string, dispatchId: string): Promise<EventRow[]> {
-    const sqlResult = await Database.executeQuery(
+    const sqlResult = await Database.executeGetDataQuery(
       `SELECT * from ${EVENTS_TABLE}\
             WHERE ${EVENTS_COLUMNS.DISPATCH_ID} = ? and \
             ${EVENTS_COLUMNS.SYNCED} = 0 \
@@ -648,7 +643,7 @@ export default class ETEventsManager {
 
   async getBulkRowsToSync(id: string, dispatchId: string): Promise<EventRow[]> {
     // If it is allowed max_retried_rows are allowed to process then it will refetch those data which are even have tried max attempt otherwise it will skip those events.
-    if(PROCESS_MAX_RETRIED_ROWS){
+    if (PROCESS_MAX_RETRIED_ROWS) {
       const query = `SELECT * FROM \
       (SELECT *, \ 
         (SELECT SUM(${EVENTS_COLUMNS.DATA_LENGTH}) \
@@ -660,9 +655,9 @@ export default class ETEventsManager {
               WHERE ${EVENTS_COLUMNS.DISPATCH_ID} \ = '${dispatchId}' and ${EVENTS_COLUMNS.DATA_LENGTH} > 0 and ${EVENTS_COLUMNS.SYNCED} = 0 and total <= ${BULK_DATA_LIMIT} \
               ORDER BY ${EVENTS_COLUMNS.ID};`;
 
-      const sqlResult = await Database.executeQuery(query, []);
+      const sqlResult = await Database.executeGetDataQuery(query, []);
       return sqlResult.rows._array;
-    }else{
+    } else {
       const query = `SELECT * FROM \
       (SELECT *, \ 
         (SELECT SUM(${EVENTS_COLUMNS.DATA_LENGTH}) \
@@ -674,7 +669,7 @@ export default class ETEventsManager {
               WHERE ${EVENTS_COLUMNS.DISPATCH_ID} \ = '${dispatchId}' and ${EVENTS_COLUMNS.DATA_LENGTH} > 0 and ${EVENTS_COLUMNS.SYNCED} = 0 and ${EVENTS_COLUMNS.ATTEMPT_COUNT} < ${MAX_RETRY_COUNT} and total <= ${BULK_DATA_LIMIT} \
               ORDER BY ${EVENTS_COLUMNS.ID};`;
 
-      const sqlResult = await Database.executeQuery(query, []);
+      const sqlResult = await Database.executeGetDataQuery(query, []);
       return sqlResult.rows._array;
     }
   }

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

@@ -276,7 +276,7 @@ export default class EventsSyncManager {
   /**
    * force sync events who retry count >3 This function can be called from app UI to sync the events forcefully
    */
-  public async forceSync() {
+public async forceSync() {
     if (!this.eventsManager)
       this.eventsManager = await ETEventsManager.getInstance();
     this._retries = 0;

package/src/models/sdk.ts

@@ -28,14 +28,10 @@ export interface DispatchSDKConfig {
   eventMapping?: EventCodes[];
   debugLevelLog?: Boolean;
   callbacks?: {
-    fetchPhoneNumbersCallback?: (
-      sdsIds: string[]
-    ) => Promise<{ key: string; value: string[] }>;
+    fetchPhoneNumbersCallback?: (sdsIds: string[]) => Promise<{ key: string; value: string[] }>;
     fetchDateTimeCallback?: () => Promise<string>;
     tokenRefreshCallback?: () => Promise<string>;
-    fetchSDSEmailAndPhoneNumbersCallback: (
-      sdsIds: string[]
-    ) => Promise<Record<string, EmailAndPhoneResponse>>;
+    fetchSDSEmailAndPhoneNumbersCallback: (sdsIds: string[]) => Promise<Record<string, EmailAndPhoneResponse>>;
   };
   etConfig: {
     phoneCode: string;

package/src/native/signature/SignatureCapture.tsx

@@ -7,7 +7,7 @@ import {
   ViewProps,
 } from 'react-native';
 
-const RSSignatureView = requireNativeComponent('RSSignatureView');
+const RSSignatureViewComp = requireNativeComponent('RSSignatureView');
 
 class SignatureCapture extends React.Component<SignatureProps, any> {
   subscriptions: any[];
@@ -62,9 +62,10 @@ class SignatureCapture extends React.Component<SignatureProps, any> {
 
   render() {
     return (
-      <RSSignatureView
+      <RSSignatureViewComp
         style={{ flex: 1 }}
-        {...this.props} // @ts-ignore
+        {...this.props} 
+        // @ts-ignore
         onChange={this.onChange}
       />
     );

package/src/network/client.ts

@@ -1,4 +1,4 @@
-import axios, { AxiosInstance, AxiosRequestConfig, AxiosResponse } from 'axios';
+import axios, { AxiosInstance, AxiosResponse, InternalAxiosRequestConfig } from 'axios';
 import StatusCode from '../constants/statuscode';
 import Logger from '../utils/Logger';
 // import { handleAccessTokenExpiry } from './utils/helper';
@@ -25,7 +25,7 @@ export default abstract class HttpClient {
     );
   };
 
-  protected _handleRequest = (request: AxiosRequestConfig) => {
+  protected _handleRequest = (request: InternalAxiosRequestConfig) => {
     Logger.getInstance().logCora("Info", `API:Request: ${JSON.stringify(request)}`);
     return request;
   };

package/src/ui/screens/ValidateOTPScreen.tsx

@@ -136,9 +136,7 @@ const ValidateOTPScreen = ({
         );
 
         // Fetch contact details and generate contact list
-        const contactDetails = await callbackHandler.getEmailAndPhoneNumbers(
-          contact
-        );
+        const contactDetails = await callbackHandler.getEmailAndPhoneNumbers(contact);
 
         // Fetch and set order data
         const data = await DispatchExecutor.filterWFIData(
@@ -159,7 +157,7 @@ const ValidateOTPScreen = ({
           );
           setContactList(mappedContacts);
         }
-      } catch (error) {
+      } catch (error: any) {
         // Handle any unexpected errors in the process
         console.error('Error fetching contact details:', error);
       }