Merge pull request #6259 from msupply-foundation/6015-sync-pull-and-push-tests-failing

6015 sync pull and push tests failing

Author: aimee-mcneil-melville

server/service/src/sync/test/test_data/invoice_line.rs

@@ -486,7 +486,7 @@ fn trans_line_om_fields_unset_tax_push_record() -> TestSyncOutgoingRecord {
     }
 }
 
-/// When invoice line was cancelled
+// When invoice line was cancelled
 const TRANS_LINE_NEGATIVE: (&str, &str) = (
     "1CC10911C7F64369B965181D78696837",
     r#"{        
@@ -535,20 +535,19 @@ const TRANS_LINE_NEGATIVE: (&str, &str) = (
         "sentQuantity": 0,
         "optionID": "",
         "isVVMPassed": "",
-        "program_ID": "",
         "prescribedQuantity": 0,
         "vaccine_vial_monitor_status_ID": "",
         "sent_pack_size": 0,
         "custom_data": null,
         "medicine_administrator_ID": "",
-        "om_item_code": null,
+        "om_item_code": "item_a_code",
         "om_tax": null,
-        "om_total_before_tax": null,
-        "om_total_after_tax": null,
+        "om_total_before_tax": 4000.0,
+        "om_total_after_tax": 4000.0,
         "om_item_variant_id": null
     }"#,
 );
-fn trans_line_negative() -> TestSyncIncomingRecord {
+fn trans_line_negative_pull_record() -> TestSyncIncomingRecord {
     TestSyncIncomingRecord::new_pull_upsert(
         TABLE_NAME,
         TRANS_LINE_NEGATIVE,
@@ -578,14 +577,43 @@ fn trans_line_negative() -> TestSyncIncomingRecord {
         },
     )
 }
+fn trans_line_negative_push_record() -> TestSyncOutgoingRecord {
+    TestSyncOutgoingRecord {
+        table_name: TABLE_NAME.to_string(),
+        record_id: TRANS_LINE_NEGATIVE.0.to_string(),
+        push_data: json!(LegacyTransLineRow {
+            id: TRANS_LINE_NEGATIVE.0.to_string(),
+            invoice_id: "outbound_shipment_a".to_string(),
+            item_id: mock_item_a().id,
+            item_name: mock_item_a().name,
+            item_code: Some(mock_item_a().code),
+            stock_line_id: Some(mock_stock_line_a().id),
+            location_id: None,
+            batch: None,
+            expiry_date: None,
+            pack_size: 1.0,
+            cost_price_per_pack: 200.0,
+            sell_price_per_pack: 200.0,
+            total_before_tax: Some(4000.0),
+            total_after_tax: Some(4000.0),
+            tax_percentage: None,
+            r#type: LegacyTransLineType::StockIn,
+            number_of_packs: 20.0,
+            note: None,
+            option_id: None,
+            foreign_currency_price_before_tax: Some(200.0),
+            item_variant_id: None,
+        }),
+    }
+}
 
 pub(crate) fn test_pull_upsert_records() -> Vec<TestSyncIncomingRecord> {
     vec![
         trans_line_1_pull_record(),
         trans_line_2_pull_record(),
         trans_line_om_fields_pull_record(),
         trans_line_om_fields_unset_tax_pull_record(),
-        trans_line_negative(),
+        trans_line_negative_pull_record(),
     ]
 }
 
@@ -603,5 +631,6 @@ pub(crate) fn test_push_records() -> Vec<TestSyncOutgoingRecord> {
         trans_line_2_push_record(),
         trans_line_om_fields_push_record(),
         trans_line_om_fields_unset_tax_push_record(),
+        trans_line_negative_push_record(),
     ]
 }

server/service/src/sync/test/test_data/requisition.rs

@@ -120,7 +120,7 @@ fn requisition_request_push_record() -> TestSyncOutgoingRecord {
                     .unwrap()
             ),
             finalised_datetime: None,
-            max_months_of_stock: Some(5.0),
+            max_months_of_stock: Some(4.9281314168377826),
             om_status: Some(RequisitionStatus::Sent),
             om_colour: None,
             expected_delivery_date: None,
@@ -282,7 +282,7 @@ const REQUISITION_OM_FIELDS: (&str, &str) = (
       "om_sent_datetime": "2022-03-24T14:48:00",
       "om_finalised_datetime": "2022-03-25T14:48:00",
       "om_expected_delivery_date": "2022-03-26",
-      "om_max_months_of_stock": 10.0,
+      "om_max_months_of_stock": 9.85626283367557,
       "om_status": "NEW",
       "om_colour": "Colour" 
     }"#,
@@ -319,7 +319,7 @@ fn requisition_om_fields_pull_record() -> TestSyncIncomingRecord {
             colour: Some("Colour".to_string()),
             comment: Some("From request requisition 3".to_string()),
             their_reference: Some("From request requisition 3".to_string()),
-            max_months_of_stock: 10.0,
+            max_months_of_stock: 9.85626283367557,
             min_months_of_stock: 3.0,
             linked_requisition_id: Some("mock_request_draft_requisition2".to_string()),
             approval_status: Some(ApprovalStatusType::Approved),
@@ -368,7 +368,7 @@ fn requisition_om_fields_push_record() -> TestSyncOutgoingRecord {
                     .unwrap()
             ),
             expected_delivery_date: Some(NaiveDate::from_ymd_opt(2022, 3, 26).unwrap()),
-            max_months_of_stock: Some(10.0),
+            max_months_of_stock: Some(9.85626283367557),
             om_status: Some(RequisitionStatus::New),
             om_colour: Some("Colour".to_string()),
             approval_status: Some(LegacyAuthorisationStatus::Authorised),

server/service/src/sync/translations/program_requisition_settings.rs

@@ -2,7 +2,8 @@ use repository::{
     ContextRow, NameTagRowRepository, PeriodScheduleRowRepository, ProgramRequisitionOrderTypeRow,
     ProgramRequisitionOrderTypeRowDelete, ProgramRequisitionOrderTypeRowRepository,
     ProgramRequisitionSettingsRow, ProgramRequisitionSettingsRowDelete,
-    ProgramRequisitionSettingsRowRepository, ProgramRow, StorageConnection, SyncBufferRow,
+    ProgramRequisitionSettingsRowRepository, ProgramRow, ProgramRowRepository, StorageConnection,
+    SyncBufferRow,
 };
 
 use serde::Deserialize;
@@ -89,7 +90,22 @@ impl SyncTranslation for ProgramRequisitionSettingsTranslation {
     ) -> Result<PullTranslateResult, anyhow::Error> {
         let data = serde_json::from_str::<LegacyListMasterRow>(&sync_record.data)?;
 
+        let program_repo = ProgramRowRepository::new(connection);
+
+        // If the master list we are translating is not a program
+        if !data.is_program {
+            // Check if we already have a program with the same id (is_program could have just been unchecked)
+            match program_repo.find_one_by_id(&data.id)? {
+                // Should translate to soft delete
+                Some(_) => {}
+                // This is a non-program master list, don't translate
+                None => {
+                    return Ok(PullTranslateResult::NotMatched);
+                }
+            }
+        }
         let upserts = generate_requisition_program(connection, data.clone())?;
+
         let deletes = delete_requisition_program(connection, data)?;
 
         let mut integration_operations = Vec::new();
@@ -124,7 +140,6 @@ impl SyncTranslation for ProgramRequisitionSettingsTranslation {
             .program_requisition_order_type_rows
             .into_iter()
             .for_each(|u| integration_operations.push(IntegrationOperation::upsert(u)));
-
         Ok(PullTranslateResult::IntegrationOperations(
             integration_operations,
         ))