feat(converter): update enrich_rs_ri_with_rs_srs usage in from_rs_to_cisu

Author: EliNoden

converter/converter/cisu/resources_info/resources_info_cisu_converter.py

@@ -227,19 +227,24 @@ def from_rs_to_cisu(cls, edxl_json: Dict[str, Any]) -> Dict[str, Any]:
 
         logger.info("Converting from RS to CISU format for Resources Info message.")
         logger.debug(f"Message content: {edxl_json}")
+
+        logger.info(
+            "Received RS-RI message with distributionID: %s for CISU conversion",
+            edxl_json.get("distributionID"),
+        )
+
         output_json = cls.copy_rs_input_content(edxl_json)
         current_use_case = cls.copy_rs_input_use_case_content(edxl_json)
 
         case_id = get_field_value(current_use_case, "caseId")
 
         _, persisted_rs_sr = get_rs_messages_by_case_id(case_id)
-        rs_sr_use_cases = [
-            # Hardcoded RS_SR use case to avoid circular dependency
-            # TODO: Fix
-            cls._copy_input_use_case_content(pm.payload, "resourcesStatus")
-            for pm in persisted_rs_sr
-        ]
-        enriched = enrich_rs_ri_with_rs_srs(current_use_case, rs_sr_use_cases)
+        rs_sr_edxls = [pm.payload for pm in persisted_rs_sr]
+
+        enriched = enrich_rs_ri_with_rs_srs(
+            rs_ri_edxl=edxl_json,
+            rs_sr_edxl_list=rs_sr_edxls,
+        )
 
         return cls.convert_single_rs_ri(output_json, enriched)
 

converter/converter/cisu/resources_status/resources_status_converter.py

@@ -15,6 +15,10 @@
 
 from converter.utils import get_field_value
 
+import logging
+
+logger = logging.getLogger(__name__)
+
 
 class ResourcesStatusConverter(BaseCISUConverter):
     @classmethod
@@ -29,6 +33,11 @@ def get_cisu_message_type(cls) -> str:
     def from_rs_to_cisu(
         cls, edxl_json: Dict[str, Any]
     ) -> Dict[str, Any] | list[Dict[str, Any]]:
+        logger.info(
+            "Received RS-SR message with distributionID: %s for CISU conversion",
+            edxl_json.get("distributionID"),
+        )
+
         current_use_case = cls.copy_rs_input_use_case_content(edxl_json)
         case_id = get_field_value(current_use_case, ResourcesStatusConstants.CASE_ID)
 
@@ -38,15 +47,14 @@ def from_rs_to_cisu(
 
         rs_ri = rs_ri_msg.payload
 
-        rs_sr_use_cases = [
-            cls.copy_rs_input_use_case_content(pm.payload) for pm in persisted_rs_sr
-        ]
-        rs_sr_use_cases.append(current_use_case)
+        rs_sr_edxl_list = [pm.payload for pm in persisted_rs_sr]
+        rs_sr_edxl_list.append(edxl_json)
 
         output_json = ResourcesInfoCISUConverter.copy_rs_input_content(rs_ri)
-        rs_ri_use_case = ResourcesInfoCISUConverter.copy_rs_input_use_case_content(
-            rs_ri
+
+        enriched = enrich_rs_ri_with_rs_srs(
+            rs_ri_edxl=rs_ri,
+            rs_sr_edxl_list=rs_sr_edxl_list,
         )
-        enriched = enrich_rs_ri_with_rs_srs(rs_ri_use_case, rs_sr_use_cases)
 
         return ResourcesInfoCISUConverter.convert_single_rs_ri(output_json, enriched)