feat(converter): 15-nexsis conversion strategy

.github/workflows/converter-generate-nomenclatures.yaml

@@ -0,0 +1,57 @@
+name: Converter Generate Nomenclatures
+
+on:
+  pull_request:
+    branches:
+      - '**'
+  workflow_dispatch:
+
+permissions:
+  contents: write
+
+jobs:
+  generate:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: converter
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.head_ref || github.ref_name }}
+
+      - name: Check for changes requiring nomenclatures generation
+        uses: dorny/paths-filter@v3
+        id: filter
+        with:
+          filters: |
+            nomenclatures:
+              - 'converter/resources/export_mapping_nomenclatures.csv'
+              - 'converter/scripts/generate_nomenclatures_maps.py'
+
+      - name: Set up Python
+        if: steps.filter.outputs.nomenclatures == 'true'
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.14'
+
+      - name: Install uv
+        if: steps.filter.outputs.nomenclatures == 'true'
+        uses: astral-sh/setup-uv@v3
+
+      - name: Install dependencies
+        if: steps.filter.outputs.nomenclatures == 'true'
+        run: uv sync
+
+      - name: Generate nomenclatures maps
+        if: steps.filter.outputs.nomenclatures == 'true'
+        run: uv run scripts/generate_nomenclatures_maps.py
+
+      - name: Commit and push changes
+        if: steps.filter.outputs.nomenclatures == 'true'
+        uses: stefanzweifel/git-auto-commit-action@v5
+        with:
+          commit_message: '⚙️ Auto-génération du CSV et des maps de nomenclatures'
+          file_pattern: 'converter/resources/export_mapping_nomenclatures.csv converter/converter/nomenclatures/**/*.py'

converter/README.md

@@ -113,3 +113,43 @@ curl -X POST http://localhost:8080/convert \
   -H "Content-Type: application/json" \
   -d "$(jq --argjson usecase "$(cat ../src/main/resources/sample/examples/RS-EDA/RS-EDA-SMUR_FemmeEnceinte_DelphineVigneau.01.json)" '.sourceVersion = "v3" | .targetVersion = "v3" | .cisuConversion = true | .edxl.content[0].jsonContent.embeddedJsonContent.message |= (. + $usecase)' tests/fixtures/EDXL/edxl_envelope_health_to_fire.json)"
 ```
+
+### Helper script — `scripts/call_convert.sh`
+
+Executable helper to call `/convert` quickly without building the payload by hand.
+
+**Prerequisite**: local-dev setup running (see [launch local dev setup](https://github.com/ansforge/SAMU-Hub-Config/blob/main/tools/local-dev/README.md)).
+
+Usage:
+
+```bash
+scripts/call_convert.sh <sourceVersion> <targetVersion> <type> <useCase> [options]
+```
+
+Positional args:
+- `sourceVersion`, `targetVersion`: `v1` | `v2` | `v3` | `vactive`
+- `type`: `HealthVersionConversion` | `CISUTranscoding` | `CISUVersionConversion` (see `ConversionType` in `converter/constants.py`)
+- `useCase`: local path to a JSON file **or** `http(s)://` URL of the message payload
+
+Options:
+- `--envelope <path|url>`: EDXL envelope file or URL (default: `tests/fixtures/EDXL/edxl_envelope_health_to_health.json`)
+- `--converter_url <url>`: converter base URL, `/convert` is appended (default: `http://localhost:8083`)
+- `-h`, `--help`: show usage
+
+Examples:
+
+```bash
+# Local fixture, default envelope (health-to-health)
+scripts/call_convert.sh v3 v2 HealthVersionConversion tests/fixtures/RS-RI/RS-RI_V3.0_exhaustive_fill.json
+
+# CISU transcoding with a custom envelope
+scripts/call_convert.sh v3 vactive CISUTranscoding ./tests/fixtures/RC-EDA/RC-EDA_required_fields.json \
+  --envelope tests/fixtures/EDXL/edxl_envelope_fire_to_health.json
+
+# Remote payload via URL
+scripts/call_convert.sh v3 vactive CISUTranscoding https://raw.githubusercontent.com/org/repo/main/sample.json
+
+# Override endpoint (e.g. staging)
+scripts/call_convert.sh v3 vactive CISUTranscoding ./sample.json \
+  --converter_url https://staging.example.com
+```

converter/converter/cisu_transcoders/constants.py

@@ -0,0 +1,5 @@
+class CISUConstants:
+    TO_CISU = "to_CISU"
+    FROM_CISU = "from_CISU"
+    CISU_EXPECTED_MODEL_VERSION = "vactive"
+    HEALTH_EXPECTED_VERSION_FOR_CISU_CONVERSION = "v3"

converter/converter/cisu/create_case/create_case_cisu_constants.py → converter/converter/cisu_transcoders/create_case/create_case_cisu_constants.py

@@ -74,6 +74,9 @@ class CreateCaseCISUConstants:
     QUALIFICATION_VICTIM_COUNT_PATH = f"{QUALIFICATION_VICTIMS_PATH}.count"
     QUALIFICATION_DETAILS_PRIORITY_PATH = f"{QUALIFICATION_PATH}.details.priority"
     QUALIFICATION_WHATS_HAPPEN_PATH = f"{QUALIFICATION_PATH}.whatsHappen"
+    QUALIFICATION_HEALTH_MOTIVE_PATH = f"{QUALIFICATION_PATH}.healthMotive"
+    QUALIFICATION_RISK_THREAT_PATH = f"{QUALIFICATION_PATH}.riskThreat"
+    QUALIFICATION_LOCATION_KIND_PATH = f"{QUALIFICATION_PATH}.locationKind"
 
     MEDICAL_NOTE_PATH = "$.medicalNote"
 

converter/converter/cisu/create_case/create_case_cisu_converter.py → converter/converter/cisu_transcoders/create_case/create_case_cisu_converter.py

@@ -6,11 +6,10 @@
 
 from yaml import dump
 
-from converter.cisu.create_case.create_case_cisu_constants import (
+from converter.cisu_transcoders.create_case.create_case_cisu_constants import (
     CreateCaseCISUConstants,
 )
-
-from converter.cisu.utils import add_to_initial_alert_notes
+from converter.cisu_transcoders.utils import add_to_initial_alert_notes
 from converter.constants import Constants
 from pydantic import BaseModel, Field
 
@@ -23,7 +22,36 @@
     translate_key_words,
     set_value,
 )
-from converter.cisu.base_cisu_converter import BaseCISUConverter
+from converter.cisu_transcoders.base_cisu_converter import BaseCISUConverter
+from converter.nomenclatures.utils import (
+    apply_nomenclature_mapping,
+    apply_nomenclature_mapping_to_list,
+)
+from converter.nomenclatures.from_v1_9_to_v2_3.whats_happen import (
+    V1_9_TO_V2_3_WHATS_HAPPEN_MAP,
+)
+from converter.nomenclatures.from_v1_9_to_v2_3.health_motive import (
+    V1_9_TO_V2_3_HEALTH_MOTIVE_MAP,
+)
+from converter.nomenclatures.from_v1_9_to_v2_3.risk_threat import (
+    V1_9_TO_V2_3_RISK_THREAT_MAP,
+)
+from converter.nomenclatures.from_v1_9_to_v2_3.location_kind import (
+    V1_9_TO_V2_3_LOCATION_KIND_MAP,
+)
+from converter.nomenclatures.from_v2_3_to_v1_9.whats_happen import (
+    V2_3_TO_V1_9_WHATS_HAPPEN_MAP,
+)
+from converter.nomenclatures.from_v2_3_to_v1_9.health_motive import (
+    V2_3_TO_V1_9_HEALTH_MOTIVE_MAP,
+)
+from converter.nomenclatures.from_v2_3_to_v1_9.risk_threat import (
+    V2_3_TO_V1_9_RISK_THREAT_MAP,
+)
+from converter.nomenclatures.from_v2_3_to_v1_9.location_kind import (
+    V2_3_TO_V1_9_LOCATION_KIND_MAP,
+)
+
 import logging
 
 logger = logging.getLogger(__name__)
@@ -283,6 +311,29 @@ def add_call_taker_org_to_custom_map(json_data: Dict[str, Any]):
 
             return json_data
 
+        def apply_qualification_nomenclature_mappings(json_data: Dict[str, Any]):
+            logger.debug("Applying qualification nomenclature mappings")
+            apply_nomenclature_mapping(
+                json_data,
+                CreateCaseCISUConstants.QUALIFICATION_WHATS_HAPPEN_PATH,
+                V1_9_TO_V2_3_WHATS_HAPPEN_MAP,
+            )
+            apply_nomenclature_mapping(
+                json_data,
+                CreateCaseCISUConstants.QUALIFICATION_HEALTH_MOTIVE_PATH,
+                V1_9_TO_V2_3_HEALTH_MOTIVE_MAP,
+            )
+            apply_nomenclature_mapping_to_list(
+                json_data,
+                CreateCaseCISUConstants.QUALIFICATION_RISK_THREAT_PATH,
+                V1_9_TO_V2_3_RISK_THREAT_MAP,
+            )
+            apply_nomenclature_mapping(
+                json_data,
+                CreateCaseCISUConstants.QUALIFICATION_LOCATION_KIND_PATH,
+                V1_9_TO_V2_3_LOCATION_KIND_MAP,
+            )
+
         # Create independent envelope copy without usecase for output
         output_json = cls.copy_cisu_input_content(input_json)
 
@@ -300,6 +351,8 @@ def add_call_taker_org_to_custom_map(json_data: Dict[str, Any]):
         set_default_location_freetext(output_use_case_json)
         add_location_detail(output_use_case_json)
 
+        apply_qualification_nomenclature_mappings(output_use_case_json)
+
         add_case_priority(output_use_case_json)
         add_to_initial_alert_notes(
             output_use_case_json,
@@ -388,6 +441,29 @@ def add_default_external_info_type(json_data: Dict[str, Any]):
                         CreateCaseCISUConstants.DEFAULT_LOCATION_EXTERNAL_INFO_TYPE,
                     )
 
+        def apply_qualification_nomenclature_mappings(json_data: Dict[str, Any]):
+            logger.debug("Applying qualification nomenclature mappings")
+            apply_nomenclature_mapping(
+                json_data,
+                CreateCaseCISUConstants.QUALIFICATION_WHATS_HAPPEN_PATH,
+                V2_3_TO_V1_9_WHATS_HAPPEN_MAP,
+            )
+            apply_nomenclature_mapping(
+                json_data,
+                CreateCaseCISUConstants.QUALIFICATION_HEALTH_MOTIVE_PATH,
+                V2_3_TO_V1_9_HEALTH_MOTIVE_MAP,
+            )
+            apply_nomenclature_mapping_to_list(
+                json_data,
+                CreateCaseCISUConstants.QUALIFICATION_RISK_THREAT_PATH,
+                V2_3_TO_V1_9_RISK_THREAT_MAP,
+            )
+            apply_nomenclature_mapping(
+                json_data,
+                CreateCaseCISUConstants.QUALIFICATION_LOCATION_KIND_PATH,
+                V2_3_TO_V1_9_LOCATION_KIND_MAP,
+            )
+
         # Create independent envelope copy without usecase for output
         output_json = cls.copy_rs_input_content(input_json)
 
@@ -420,6 +496,8 @@ def add_default_external_info_type(json_data: Dict[str, Any]):
             CreateCaseCISUConstants.DEFAULT_LOCATION_COUNTRY,
         )
 
+        apply_qualification_nomenclature_mappings(output_usecase_json)
+
         if not is_field_completed(
             output_usecase_json, CreateCaseCISUConstants.QUALIFICATION_WHATS_HAPPEN_PATH
         ):

converter/converter/cisu/identical_cisu_converter.py → converter/converter/cisu_transcoders/identical_cisu_converter.py

@@ -1,6 +1,6 @@
 from typing import Dict, Any
 
-from converter.cisu.base_cisu_converter import BaseCISUConverter
+from converter.cisu_transcoders.base_cisu_converter import BaseCISUConverter
 
 
 class IdenticalCISUConverter(BaseCISUConverter):

converter/converter/cisu/reference/reference_converter.py → converter/converter/cisu_transcoders/reference/reference_converter.py

@@ -1,4 +1,4 @@
-from converter.cisu.identical_cisu_converter import IdenticalCISUConverter
+from converter.cisu_transcoders.identical_cisu_converter import IdenticalCISUConverter
 
 
 class ReferenceConverter(IdenticalCISUConverter):

converter/converter/cisu/resources_info/resources_info_cisu_constants.py → converter/converter/cisu_transcoders/resources_info/resources_info_cisu_constants.py

@@ -11,4 +11,4 @@ class ResourcesInfoCISUConstants:
     POSITION_KEY = "position"
 
     VEHICLE_TYPE_SIS = "SIS"
-    VEHICLE_TYPE_SMUR = "SMUR"
+    VEHICLE_TYPE_VECTEUR_SANTE = "VECTEUR_SANTE"

converter/converter/cisu/resources_info/resources_info_cisu_converter.py → converter/converter/cisu_transcoders/resources_info/resources_info_cisu_converter.py

@@ -1,12 +1,12 @@
 import uuid
 
-from converter.cisu.base_cisu_converter import BaseCISUConverter
+from converter.cisu_transcoders.base_cisu_converter import BaseCISUConverter
 from typing import Any, Dict, List, TypedDict
 
-from converter.cisu.resources_info.resources_info_cisu_constants import (
+from converter.cisu_transcoders.resources_info.resources_info_cisu_constants import (
     ResourcesInfoCISUConstants,
 )
-from converter.cisu.resources_info.resources_info_cisu_helper import (
+from converter.cisu_transcoders.resources_info.resources_info_cisu_helper import (
     enrich_rs_ri_with_rs_srs,
     get_latest_state,
     log_cisu_to_rs_converted_messages_ids,
@@ -77,6 +77,8 @@ def _build_rs_ri_from_cisu(cls, edxl_json: Dict[str, Any]) -> Dict[str, Any]:
                 ResourcesInfoCISUConstants.MISSION_ID_PATH,
             )
 
+            cls._translate_to_samu_vehicle_type(resource)
+
         return cls.format_rs_output_json(output_json, output_use_case_json)
 
     @classmethod
@@ -158,6 +160,34 @@ def _has_resources_been_updated(
             modified_status_resources=modified_status_resources,
         )
 
+    @classmethod
+    def _translate_to_samu_vehicle_type(cls, resource: Dict[str, Any]) -> None:
+        """Translate a CISU vehicle type to its SAMU equivalent. Throws an error if no vehicleType is provided."""
+
+        vehicle_type = get_field_value(
+            resource, ResourcesInfoCISUConstants.VEHICLE_TYPE_PATH
+        )
+        resourceId = get_field_value(
+            resource, ResourcesInfoCISUConstants.RESOURCE_ID_KEY
+        )
+
+        if vehicle_type is None:
+            raise ConversionError(
+                f"No vehicle found in CISU resource for resource: {resourceId}."
+            )
+
+        logger.info(
+            "Replacing vehicleType %s with %s for ressource with id %s",
+            vehicle_type,
+            ResourcesInfoCISUConstants.VEHICLE_TYPE_SIS,
+            resourceId,
+        )
+        set_value(
+            resource,
+            ResourcesInfoCISUConstants.VEHICLE_TYPE_PATH,
+            ResourcesInfoCISUConstants.VEHICLE_TYPE_SIS,
+        )
+
     @classmethod
     def from_cisu_to_rs(cls, edxl_json: Dict[str, Any]) -> List[Dict[str, Any]]:
         """RC-RI → RS: on first reception RS-RI + one RS-SR per resource;
@@ -346,33 +376,31 @@ def _remove_patient_id(cls, resource):
 
     @classmethod
     def _translate_to_cisu_vehicle_type(cls, resource: Dict[str, Any]) -> None:
-        """Translate a RS vehicle type to its CISU equivalent, or None if not mappable."""
+        """Translate a RS vehicle type to its CISU equivalent. Throws an error if no vehicleType is provided."""
 
         vehicle_type = get_field_value(
             resource, ResourcesInfoCISUConstants.VEHICLE_TYPE_PATH
         )
+        resourceId = get_field_value(
+            resource, ResourcesInfoCISUConstants.RESOURCE_ID_KEY
+        )
 
         if vehicle_type is None:
             raise ConversionError(
-                f"No vehicle found in RS resource for resource: {resource.get('resourceId')}."
+                f"No vehicle found in RS resource for resource: {resourceId}."
             )
 
-        if vehicle_type.startswith(ResourcesInfoCISUConstants.VEHICLE_TYPE_SIS):
-            set_value(
-                resource,
-                ResourcesInfoCISUConstants.VEHICLE_TYPE_PATH,
-                ResourcesInfoCISUConstants.VEHICLE_TYPE_SIS,
-            )
-        elif vehicle_type.startswith(ResourcesInfoCISUConstants.VEHICLE_TYPE_SMUR):
-            set_value(
-                resource,
-                ResourcesInfoCISUConstants.VEHICLE_TYPE_PATH,
-                ResourcesInfoCISUConstants.VEHICLE_TYPE_SMUR,
-            )
-        else:
-            raise ConversionError(
-                f"No valid vehicle found for resource: {resource.get('resourceId')}."
-            )
+        logger.info(
+            "Replacing vehicleType %s with %s for ressource with id %s",
+            vehicle_type,
+            ResourcesInfoCISUConstants.VEHICLE_TYPE_VECTEUR_SANTE,
+            resourceId,
+        )
+        set_value(
+            resource,
+            ResourcesInfoCISUConstants.VEHICLE_TYPE_PATH,
+            ResourcesInfoCISUConstants.VEHICLE_TYPE_VECTEUR_SANTE,
+        )
 
     @classmethod
     def _keep_last_state(cls, resource: Dict[str, Any]) -> None:

converter/converter/cisu/resources_info/resources_info_cisu_helper.py → converter/converter/cisu_transcoders/resources_info/resources_info_cisu_helper.py

@@ -1,6 +1,6 @@
 from converter.conversion_mixin import ConversionMixin
 from converter.utils import get_field_value, set_value
-from converter.cisu.resources_info.resources_info_cisu_constants import (
+from converter.cisu_transcoders.resources_info.resources_info_cisu_constants import (
     ResourcesInfoCISUConstants,
 )
 import logging