Merge pull request #363 from ansforge/fix/converter/rs-eda-v1-to-v3-default-vehicletype

Fix/converter/rs-ri v1 to v3 default vehicletype

Author: issam71100

converter/converter/versions/resources_info/resources_info_constants.py

@@ -86,6 +86,7 @@ class ResourcesInfoConstants:
     }
 
     MOBILIZED_RESOURCE_DEFAULT_VALUE = "AUTRE"
+    DEFAULT_VEHICLE_TYPE = "AUTREVEC.AUTRE"
 
     MOBILIZED_RESOURCE_PATH = "$.mobilizedResource"
     MOBILIZED_RESOURCE_PLATE_PATH = "$.plate"

converter/converter/versions/resources_info/resources_info_converter.py

@@ -66,11 +66,23 @@ def convert_v1_to_v2(cls, input_json) -> Dict[str, Any]:
                         freetext,
                     )
 
-                map_to_new_value(
+                # Set default vehicle type if missing (required in v2/v3, optional in v1)
+                vehicle_type = get_field_value(
                     mobilizedResource,
                     ResourcesInfoConstants.MOBILIZED_RESOURCE_VEHICULE_TYPE_PATH,
-                    ResourcesInfoConstants.V1_TO_V2_VEHICULE_TYPE_MAPPING,
                 )
+                if vehicle_type is None:
+                    set_value(
+                        mobilizedResource,
+                        ResourcesInfoConstants.MOBILIZED_RESOURCE_VEHICULE_TYPE_PATH,
+                        ResourcesInfoConstants.DEFAULT_VEHICLE_TYPE,
+                    )
+                else:
+                    map_to_new_value(
+                        mobilizedResource,
+                        ResourcesInfoConstants.MOBILIZED_RESOURCE_VEHICULE_TYPE_PATH,
+                        ResourcesInfoConstants.V1_TO_V2_VEHICULE_TYPE_MAPPING,
+                    )
 
                 switch_field_name(
                     mobilizedResource,

converter/tests/fixtures/RS-RI/RS-RI_V1.0_missing_vehicleType.json

@@ -0,0 +1,21 @@
+{
+  "resourcesInfo": {
+    "mobilizedResource": [
+      {
+        "datetime": "2024-08-01T16:55:00+02:00",
+        "resourceId": "fr.health.samu770.resource.VLM250",
+        "resourceType": "SMUR",
+        "team": {
+          "teamCare": "MED"
+        },
+        "state": [
+          {
+            "datetime": "2024-08-06T16:45:00+02:00",
+            "status": "ENGAGE"
+          }
+        ]
+      }
+    ],
+    "caseId": "fr.health.samu770.DRFR157702421400215"
+  }
+}

converter/tests/versions/snapshots/snap_test_resources_info_converter.py

@@ -82,7 +82,69 @@
                 },
                 {
                   "datetime": "2024-08-01T16:55:00+02:00",
-                  "resourceId": "fr.health.samu800.resource.Heli80bec6"
+                  "resourceId": "fr.health.samu800.resource.Heli80bec6",
+                  "vehicleType": "AUTREVEC.AUTRE"
+                }
+              ]
+            }
+          }
+        }
+      }
+    }
+  ]
+}"""
+
+snapshots[
+    "TestSnapshotV1V2Converter::test_missing_vehicle_type_snapshot_V1_to_V2_upgrade 1"
+] = """{
+  "distributionID": "fr.health.samuA_2608323d-507d-4cbf-bf74-52007f8124ea",
+  "senderID": "fr.health.samuA",
+  "dateTimeSent": "2022-09-27T08:23:34+02:00",
+  "dateTimeExpires": "2072-09-27T08:23:34+02:00",
+  "distributionStatus": "Actual",
+  "distributionKind": "Report",
+  "descriptor": {
+    "language": "fr-FR",
+    "explicitAddress": {
+      "explicitAddressScheme": "hubex",
+      "explicitAddressValue": "fr.health.samuB"
+    }
+  },
+  "content": [
+    {
+      "jsonContent": {
+        "embeddedJsonContent": {
+          "message": {
+            "messageId": "2608323d-507d-4cbf-bf74-52007f8124ea",
+            "sender": {
+              "name": "samuA",
+              "URI": "hubsante:fr.health.samuA"
+            },
+            "sentAt": "2022-09-27T08:23:34+02:00",
+            "status": "Actual",
+            "kind": "Report",
+            "recipient": [
+              {
+                "name": "samuB",
+                "URI": "hubsante:fr.health.samuB"
+              }
+            ],
+            "resourcesInfo": {
+              "caseId": "fr.health.samu770.DRFR157702421400215",
+              "resource": [
+                {
+                  "datetime": "2024-08-01T16:55:00+02:00",
+                  "resourceId": "fr.health.samu770.resource.VLM250",
+                  "team": {
+                    "medicalLevel": "MED"
+                  },
+                  "state": [
+                    {
+                      "datetime": "2024-08-06T16:45:00+02:00",
+                      "status": "ENGAGE"
+                    }
+                  ],
+                  "vehicleType": "AUTREVEC.AUTRE"
                 }
               ]
             }
@@ -133,7 +195,8 @@
               "resource": [
                 {
                   "datetime": "2024-08-01T16:55:00+02:00",
-                  "resourceId": "fr.health.samu800.resource.Heli80bec6"
+                  "resourceId": "fr.health.samu800.resource.Heli80bec6",
+                  "vehicleType": "AUTREVEC.AUTRE"
                 }
               ]
             }

converter/tests/versions/test_resources_info_converter.py

@@ -39,6 +39,14 @@ def test_required_fields_snapshot_V1_to_V2_upgrade(self):
         output_data = ResourcesInfoConverter.convert_v1_to_v2(message)
         self.assertMatchSnapshot(json.dumps(output_data, indent=2))
 
+    def test_missing_vehicle_type_snapshot_V1_to_V2_upgrade(self):
+        message = TestHelper.create_edxl_json_from_sample(
+            TestConstants.EDXL_HEALTH_TO_HEALTH_ENVELOPE_PATH,
+            "tests/fixtures/RS-RI/RS-RI_V1.0_missing_vehicleType.json",
+        )
+        output_data = ResourcesInfoConverter.convert_v1_to_v2(message)
+        self.assertMatchSnapshot(json.dumps(output_data, indent=2))
+
 
 def test_V2_to_V1_downgrade():
     v1_schema_endpoint = get_file_endpoint(