feat/converter : validate RS-SR resource exists in RS-RI before conversion

Author: Issam Kadar

converter/converter/cisu/resources_info/resources_info_cisu_constants.py

@@ -4,6 +4,7 @@ class ResourcesInfoCISUConstants:
     VEHICLE_TYPE_PATH = "$.vehicleType"
 
     CASE_ID_FIELD = "caseId"
+    RESOURCE_ID_KEY = "resourceId"
     PATIENT_ID_KEY = "patientId"
     POSITION_KEY = "position"
 

converter/converter/cisu/resources_status/resources_status_constants.py

@@ -1,3 +1,4 @@
 class ResourcesStatusConstants:
     RESOURCE_STATUS_PATH = "$.resourceStatus"
     CASE_ID = "$.caseId"
+    RESOURCE_ID = "$.resourceId"

converter/converter/cisu/resources_status/resources_status_converter.py

@@ -41,20 +41,25 @@ def from_rs_to_cisu(
         if persisted_rs_ri is None:  # No RS-RI persisted yet, we return an empty list
             return []
 
-        persisted_rs_sr_list = get_last_rs_sr_per_resource_by_case_id(case_id)
-
+        resource_id = get_field_value(content, ResourcesStatusConstants.RESOURCE_ID)
         rs_ri = persisted_rs_ri.payload
         rs_ri_content = ResourcesInfoCISUConverter.copy_rs_input_use_case_content(rs_ri)
+        resources = get_field_value(rs_ri_content, ResourcesInfoCISUConstants.RESOURCE_PATH) or []
+        resource_ids_in_rs_ri = {r.get(ResourcesInfoCISUConstants.RESOURCE_ID_KEY) for r in resources}
+        
+        if resource_id not in resource_ids_in_rs_ri:
+            raise ValueError(
+                f"Resource '{resource_id}' from RS-SR not found in RS-RI for caseId '{case_id}'"
+            )
+
+        persisted_rs_sr_list = get_last_rs_sr_per_resource_by_case_id(case_id)
+
         rs_sr_content_list = [
             cls.copy_rs_input_use_case_content(msg.payload)
             for msg in persisted_rs_sr_list
         ]
 
         # merge RS-SRs in RS-RI
-        resources = get_field_value(
-            rs_ri_content, ResourcesInfoCISUConstants.RESOURCE_PATH
-        )
-
         merged_resources = merge_info_and_resources(resources, rs_sr_content_list)
 
         set_value(