diff --git a/converter/converter/cisu/create_case/create_case_cisu_converter.py b/converter/converter/cisu/create_case/create_case_cisu_converter.py index 6b6415ad4..f7d7cefc3 100644 --- a/converter/converter/cisu/create_case/create_case_cisu_converter.py +++ b/converter/converter/cisu/create_case/create_case_cisu_converter.py @@ -175,7 +175,6 @@ def add_victim_count_to_custom_map(json_data: Dict[str, Any]): key="qualification.victims.count", label="Nombre de patients-victimes", value=count, - freetext="Indique le nombre de victimes selon la nomenclature du référentiel CISU", ) add_to_custom_map(json_data, victim_count) @@ -194,7 +193,6 @@ def add_main_victim_to_custom_map(json_data: Dict[str, Any]): key="qualification.victims.mainVictim", label="Type du patient-victime principal", value=main_victim, - freetext="Identifie le type de la principale victime (celle dont l'état de santé provoque le déclenchement de l'envoi des secours) selon la nomenclature du référentiel CISU", ) add_to_custom_map(json_data, main_victim) @@ -251,7 +249,9 @@ def add_to_custom_map(json_data: Dict[str, Any], custom_map_entry: CustomMap): if len(initial_custom_map_array) >= 3: raise ValueError("The customMap already contains 3 items.") - initial_custom_map_array.append(custom_map_entry.model_dump()) + initial_custom_map_array.append( + custom_map_entry.model_dump(exclude_none=True) + ) set_value( json_data, @@ -277,7 +277,6 @@ def add_call_taker_org_to_custom_map(json_data: Dict[str, Any]): key="initialalert.calltaker.organization", label="Identifiant SDIS", value=calltaker_org, - freetext="", ) add_to_custom_map(json_data, initialalert_calltaker) diff --git a/converter/pyproject.toml b/converter/pyproject.toml index 06e6afdc0..b4667116b 100644 --- a/converter/pyproject.toml +++ b/converter/pyproject.toml @@ -60,6 +60,11 @@ dev = [ "mongomock>=4.1.2", ] +[tool.mypy] +plugins = [ + "pydantic.mypy" +] + [[tool.mypy.overrides]] module = ["jsonpath_ng.*", "prometheus_flask_exporter.*"] ignore_missing_imports = true diff --git a/converter/tests/cisu/__snapshots__/test_create_case_converter.ambr b/converter/tests/cisu/__snapshots__/test_create_case_converter.ambr index 53c05703b..f3fd3ffd6 100644 --- a/converter/tests/cisu/__snapshots__/test_create_case_converter.ambr +++ b/converter/tests/cisu/__snapshots__/test_create_case_converter.ambr @@ -146,20 +146,17 @@ { "key": "qualification.victims.count", "value": "1", - "label": "Nombre de patients-victimes", - "freetext": "Indique le nombre de victimes selon la nomenclature du r\u00e9f\u00e9rentiel CISU" + "label": "Nombre de patients-victimes" }, { "key": "qualification.victims.mainVictim", "value": "ADULTE", - "label": "Type du patient-victime principal", - "freetext": "Identifie le type de la principale victime (celle dont l'\u00e9tat de sant\u00e9 provoque le d\u00e9clenchement de l'envoi des secours) selon la nomenclature du r\u00e9f\u00e9rentiel CISU" + "label": "Type du patient-victime principal" }, { "key": "initialalert.calltaker.organization", "value": "fr.health.samu440", - "label": "Identifiant SDIS", - "freetext": "" + "label": "Identifiant SDIS" } ] }, @@ -329,20 +326,17 @@ { "key": "qualification.victims.count", "value": "1", - "label": "Nombre de patients-victimes", - "freetext": "Indique le nombre de victimes selon la nomenclature du r\u00e9f\u00e9rentiel CISU" + "label": "Nombre de patients-victimes" }, { "key": "qualification.victims.mainVictim", "value": "ADULTE", - "label": "Type du patient-victime principal", - "freetext": "Identifie le type de la principale victime (celle dont l'\u00e9tat de sant\u00e9 provoque le d\u00e9clenchement de l'envoi des secours) selon la nomenclature du r\u00e9f\u00e9rentiel CISU" + "label": "Type du patient-victime principal" }, { "key": "initialalert.calltaker.organization", "value": "fr.health.samu440", - "label": "Identifiant SDIS", - "freetext": "" + "label": "Identifiant SDIS" } ] },