Merge pull request #3010 from openmsupply/release/v5.1.1

Release/v5.1.1

package.json

@@ -5,7 +5,7 @@
   },
   "name": "mSupplyMobile",
   "//": "version must be in the format ${majorNumber}.${minorNumber}.${patchNumber}-rc${releaseCandidateNumber}",
-  "version": "5.1.0",
+  "version": "5.1.1",
   "private": false,
   "license": "MIT",
   "description": "Mobile app for use with the mSupply medical inventory control software",

src/database/DataTypes/Transaction.js

@@ -539,7 +539,13 @@ export class Transaction extends Realm.Object {
     }
 
     this.status = 'finalised';
+
     database.save('Transaction', this);
+
+    // Trigger update on linked transaction batches to ensure they are pushed to sync out queue.
+    this.items.forEach(item =>
+      item.batches.forEach(batch => database.save('TransactionBatch', batch))
+    );
   }
 }
 

src/database/utilities/parsers.js

@@ -5,13 +5,11 @@
 
 /**
  * Returns the boolean string as a boolean (false if none passed)
- * @param  {string} numberString The string to convert to a boolean
+ *
+ * @param  {string}  numberString  The string to convert to a boolean
  * @return {boolean}               The boolean representation of the string
  */
-export const parseBoolean = booleanString => {
-  const trueStrings = ['true', 'True', 'TRUE'];
-  return trueStrings.includes(booleanString);
-};
+export const parseBoolean = booleanString => booleanString?.toString()?.toLowerCase() === 'true';
 
 /**
  * Return a Date object representing the given date, time.

src/sync/SyncDatabase.js

@@ -25,6 +25,10 @@ export class SyncDatabase {
     return this.database.create(...args, 'sync');
   }
 
+  get(type, primaryKey, primaryKeyField = 'id') {
+    return this.database.get(type, primaryKey, primaryKeyField);
+  }
+
   getOrCreate(type, primaryKey, primaryKeyField = 'id') {
     return this.database.getOrCreate(type, primaryKey, primaryKeyField, 'sync');
   }

src/sync/SyncQueue.js

@@ -55,6 +55,27 @@ export class SyncQueue {
     this.database.removeListener(this.databaseListenerId);
   }
 
+  isValidSyncOutRecord(syncOutRecord) {
+    const { recordType, recordId } = syncOutRecord;
+
+    if (!recordId) return false;
+    const record = this.database.get(recordType, recordId);
+    if (!record) return false;
+
+    switch (recordType) {
+      // Only sync prescriptions which are finalised.
+      case 'Transaction':
+        return !(record.isPrescription && !record.isFinalised);
+      case 'TransactionBatch':
+        return !(record.transaction.isPrescription && !record.transaction.isFinalised);
+      // Only sync out prescribers from this store.
+      case 'Prescriber':
+        return record.fromThisStore;
+      default:
+        return true;
+    }
+  }
+
   /**
    * Respond to a database change event. Must be called from within a database
    * write transaction.
@@ -72,24 +93,24 @@ export class SyncQueue {
         case CREATE:
         case UPDATE:
         case DELETE: {
-          if (!record.id) return;
-          const existingSyncOutRecord = this.database
-            .objects('SyncOut')
-            .filtered('recordId == $0', record.id)[0];
-          if (!existingSyncOutRecord) {
-            this.database.create('SyncOut', {
-              id: generateUUID(),
-              changeTime: new Date().getTime(),
-              changeType,
-              recordType,
-              recordId: record.id,
-            });
-          } else {
-            existingSyncOutRecord.changeTime = new Date().getTime();
-            existingSyncOutRecord.changeType = changeType;
-            existingSyncOutRecord.recordType = recordType;
-            this.database.save('SyncOut', existingSyncOutRecord);
+          const { id: recordId } = record;
+
+          const syncOutRecord = {
+            changeTime: new Date().getTime(),
+            changeType,
+            recordType,
+            recordId,
+          };
+
+          if (this.isValidSyncOutRecord(syncOutRecord)) {
+            const existingSyncOutRecord = this.database.get('SyncOut', recordId);
+            if (existingSyncOutRecord) {
+              this.database.save('SyncOut', { ...existingSyncOutRecord, ...syncOutRecord });
+            } else {
+              this.database.create('SyncOut', { id: generateUUID(), ...syncOutRecord });
+            }
           }
+
           break;
         }
         default:

src/sync/lookupApiUtils.js

@@ -120,8 +120,8 @@ const processInsuranceResponse = response =>
     })
   );
 
-export const processPatientResponse = response => {
-  const patientData = response.map(
+export const processPatientResponse = response =>
+  response.map(
     ({
       ID: id,
       name,
@@ -156,11 +156,9 @@ export const processPatientResponse = response => {
       policies: processInsuranceResponse(nameInsuranceJoin),
     })
   );
-  return patientData;
-};
 
-export const processPrescriberResponse = response => {
-  const prescriberData = response.map(
+export const processPrescriberResponse = response =>
+  response.map(
     ({
       ID,
       first_name,
@@ -185,5 +183,3 @@ export const processPrescriberResponse = response => {
       storeId: store_ID,
     })
   );
-  return prescriberData;
-};

src/sync/outgoingSyncUtils.js

@@ -189,9 +189,6 @@ const generateSyncData = (settings, recordType, record) => {
       };
     }
     case 'Transaction': {
-      // Only sync prescriptions which are finalised.
-      if (record.isPrescription && !record.isFinalised) return null;
-
       const defaultCurrency = UIDatabase.objects('Currency').filtered(
         'isDefaultCurrency == $0',
         true
@@ -236,9 +233,6 @@ const generateSyncData = (settings, recordType, record) => {
     case 'TransactionBatch': {
       const { transaction } = record;
 
-      // Only sync prescription lines if prescription is finalised.
-      if (transaction.isPrescription && !transaction.isFinalised) return null;
-
       return {
         ID: record.id,
         transaction_ID: record.transaction.id,
@@ -289,9 +283,6 @@ const generateSyncData = (settings, recordType, record) => {
       };
     }
     case 'Prescriber': {
-      // Only sync out prescribers from this store.
-      if (!record.fromThisStore) return null;
-
       const initials = `${record.firstName?.[0] ?? ''}${record.lastName?.[0] ?? ''}`;
 
       return {