Merge branch 'main' into fix/converter/rs-eda-v1-to-v3-default-vehicletype

Author: Issam Kadar

converter/converter/versions/create_case_health/v1_v2/utils.py

@@ -73,9 +73,11 @@ def update_language(message: Dict[str, Any], language_map: Dict[str, str]) -> No
             Constants.INITIAL_ALERT_CALLER_LANGUAGE_PATH,
             language_map,
         )
-    else:
+    elif language is not None:
         add_to_initial_alert_notes(message, f"Langue du requérant: {language}")
         delete_paths(message, [Constants.INITIAL_ALERT_CALLER_LANGUAGE_KEY])
+    else:
+        delete_paths(message, [Constants.INITIAL_ALERT_CALLER_LANGUAGE_KEY])
 
 
 def add_to_initial_alert_notes(

converter/tests/fixtures/RS-EDA/RS-EDA_V1.0_no_language.json

@@ -0,0 +1,98 @@
+{
+  "createCaseHealth": {
+    "qualification": {
+      "origin": "112",
+      "riskThreat": [
+        {
+          "code": "R01",
+          "label": "libellé R01"
+        }
+      ],
+      "whatsHappen": {
+        "code": "C02.15.01",
+        "label": "libellé de C021501"
+      },
+      "locationKind": {
+        "code": "L01.00.00",
+        "label": "libellé type de lieu"
+      },
+      "healthMotive": {
+        "code": "M03.11",
+        "label": "libellé motif de recours"
+      },
+      "details": {
+        "status": " ACTIF",
+        "attribution": "PEDIA",
+        "priority": "P1",
+        "careLevel": "R3"
+      }
+    },
+    "location": {
+      "geometry": {
+        "point": {
+          "coord": {
+            "lat": 37.7749,
+            "lon": 122.4194,
+            "height": 16,
+            "precision": "INCONNUE"
+          },
+          "isAml": true
+        },
+        "obsDatime": "2025-02-27T06:30:00+01:00"
+      },
+      "name": "nom du lieu",
+      "detailedAddress": {
+        "complete": "12 rue de nulle part",
+        "number": "12",
+        "wayName": {
+          "complete": "rue de nulle part",
+          "type": "rue",
+          "name": "de nulle part"
+        }
+      },
+      "city": {
+        "name": "nowhere",
+        "inseeCode": "99999"
+      }
+    },
+    "initialAlert": {
+      "caller": {
+        "callerContact": {
+          "channel": "PERSONNE",
+          "type": "TEL",
+          "detail": "+33645897846457895"
+        },
+        "type": "MEDSOS"
+      },
+      "reception": "2025-02-13T15:00:00+01:00",
+      "notes": [
+        {
+          "creation": "2025-02-27T00:00:00+01:00",
+          "freetext": "commentaire alerte initiale"
+        }
+      ]
+    },
+    "caseId": "fr.health.samu770.DRFR157702400400055",
+    "senderCaseId": "DRFR157702400400055",
+    "creation": "2025-02-27T01:15:00+01:00",
+    "perimeter": "AMU",
+    "interventionType": "PRIMAIRE",
+    "owner": "fr.health.samu770",
+    "patient": [
+      {
+        "idPat": "fr.health.samu770.patient.DRFR157702400400055.1",
+        "identity": {
+          "strictFeatures": {
+            "birthName": "Nom de naissance",
+            "birthDate": "1954-08-12",
+            "sex": "MASC"
+          }
+        },
+        "healthMotive": {
+          "code": "M01.00",
+          "label": "Détresse vitale"
+        }
+      }
+    ]
+  }
+}

converter/tests/versions/create_health_case/test_v1_v2_converter.py

@@ -1,6 +1,7 @@
 import datetime
 import json
 from unittest.mock import patch
+import pytest
 
 from converter.utils import get_field_value, extract_message_content
 from converter.versions.create_case_health.create_case_health_converter import (
@@ -124,3 +125,35 @@ def test_upgrade_with_unknown_v2_language_code():
     notes = get_field_value(converted_message_content, "$.initialAlert.notes")
     assert len(notes) > 1
     assert "Langue du requérant: AX" in notes[-1]["freetext"]
+
+
+@pytest.mark.parametrize(
+    "target_version",
+    [
+        ("v2"),
+        ("v3"),
+    ],
+)
+def test_upgrade_with_no_language_field(target_version):
+    """Test that when language field is not provided, no note is created"""
+    message = TestHelper.create_edxl_json_from_sample(
+        TestConstants.EDXL_HEALTH_TO_HEALTH_ENVELOPE_PATH,
+        "tests/fixtures/RS-EDA/RS-EDA_V1.0_no_language.json",
+    )
+    converted_message = CreateHealthCaseConverter.convert("v1", target_version, message)
+    converted_message_content = extract_message_content(converted_message)[
+        "createCaseHealth"
+    ]
+
+    # Language field should not be present
+    language = get_field_value(
+        converted_message_content, "$.initialAlert.caller.language"
+    )
+    assert language is None
+
+    # No note should be added about language
+    notes = get_field_value(converted_message_content, "$.initialAlert.notes")
+    assert len(notes) == 1
+    # Verify no note contains any language mention
+    for note in notes:
+        assert "Langue du requérant" not in note["freetext"]