fix(converter): use original distributionID for first converter message

Author: Clemsazert

converter/converter/cisu/resources_info/resources_info_cisu_converter.py

@@ -73,7 +73,11 @@ def _build_rs_ri_from_cisu(cls, edxl_json: Dict[str, Any]) -> Dict[str, Any]:
 
     @classmethod
     def _build_rs_sr_from_resource(
-        cls, edxl_json: Dict[str, Any], resource: Dict[str, Any], case_id: str
+        cls,
+        edxl_json: Dict[str, Any],
+        resource: Dict[str, Any],
+        case_id: str,
+        replacement_distribution_id: str | None = None,
     ) -> Dict[str, Any]:
         """Build an RS-SR from a single RC-RI resource, reusing the EDXL envelope."""
         logger.info(
@@ -83,8 +87,9 @@ def _build_rs_sr_from_resource(
         )
         output_json = cls.copy_cisu_input_content(edxl_json)
 
-        # Set a new distributionID for the RS-SR message
-        cls.set_distribution_id(output_json, f"{edxl_json['senderID']}_{uuid.uuid4()}")
+        if replacement_distribution_id is not None:
+            # Set a new distributionID for the RS-SR message
+            cls.set_distribution_id(output_json, replacement_distribution_id)
 
         output_use_case_json = {
             "caseId": case_id,
@@ -173,7 +178,12 @@ def from_cisu_to_rs(cls, edxl_json: Dict[str, Any]) -> List[Dict[str, Any]]:
             converted_messages = [cls._build_rs_ri_from_cisu(edxl_json)]
             for resource in resources:
                 converted_messages.append(
-                    cls._build_rs_sr_from_resource(edxl_json, resource, case_id)
+                    cls._build_rs_sr_from_resource(
+                        edxl_json,
+                        resource,
+                        case_id,
+                        f"{edxl_json['senderID']}_{uuid.uuid4()}",
+                    )
                 )
             return converted_messages
 
@@ -200,12 +210,22 @@ def from_cisu_to_rs(cls, edxl_json: Dict[str, Any]) -> List[Dict[str, Any]]:
             rs_ri = cls._build_rs_ri_from_cisu(edxl_json)
             messages.append(rs_ri)
 
-        for resource in modified_status_resources:
+        for idx, resource in enumerate(modified_status_resources):
             logger.info(
                 "Resource %s has a modified status — adding RS-SR to output.",
                 resource.get("resourceId"),
             )
-            rs_sr = cls._build_rs_sr_from_resource(edxl_json, resource, case_id)
+            should_not_use_original_distribution_id = (
+                engaged_resources_updated is True or idx != 0
+            )
+            replacement_distribution_id = (
+                f"{edxl_json['senderID']}_{uuid.uuid4()}"
+                if should_not_use_original_distribution_id
+                else None
+            )
+            rs_sr = cls._build_rs_sr_from_resource(
+                edxl_json, resource, case_id, replacement_distribution_id
+            )
             messages.append(rs_sr)
 
         if not messages: