Consolidation d'un RC-RI à réception d'un RS-SR by bou3108 · Pull Request #386 · ansforge/SAMU-Hub-Modeles

bou3108 · 2026-03-24T08:21:29Z

🔎 Détails

Dans le converter, à la réception d’un RS-SR, si toutes les ressources ont un statut, créer le message RC-RI et le retourner pour transmission aux pompiers.

Ajout d'un helper mergeInfoAndResources, qui génère un RC-RI à partir d'un RS-RI et d'une liste de RS-SR
Règle de gestion : RC-RI si et seulement si toutes les ressources référencées dans le RS-RI ont un RS-SR associé dans la liste, None sinon
Ajout de tests sur cett méthode

📄 Documentation

📸 Captures d'écran

Avant	Après

🔗 Ticket associé

Asana

github-actions · 2026-03-24T08:22:37Z

Total Project Coverage	52.5%	🍏

github-actions · 2026-03-24T08:23:21Z

Converter - python code coverage

File	Stmts	Miss	Cover	Missing
constants.py	4	0	100%
conversion_mixin.py	23	1	95%	24
converter.py	67	3	95%	26, 94–95
database.py	32	22	31%	12, 16, 18–21, 23, 25, 27, 29–38, 40–41, 49
logging_config.py	35	2	94%	29, 36
utils.py	164	3	98%	57, 108, 120
cisu
base_cisu_converter.py	33	3	90%	7, 25, 31
constants.py	4	0	100%
identical_cisu_converter.py	9	0	100%
utils.py	15	0	100%
cisu/create_case
create_case_cisu_constants.py	31	0	100%
create_case_cisu_converter.py	145	1	99%	112
cisu/reference
reference_converter.py	9	2	77%	9, 13
cisu/resources_info
resources_info_cisu_constants.py	11	0	100%
resources_info_cisu_converter.py	146	1	99%	154
resources_info_cisu_helper.py	15	0	100%
cisu/resources_status
resources_status_constants.py	3	0	100%
resources_status_converter.py	30	1	96%	31
conversion_strategy
cisu_conversion_strategy.py	49	2	95%	68, 93
conversion_strategy.py	7	0	100%
health_conversion_strategy.py	46	0	100%
models
persisted_message.py	13	0	100%
repositories
message_repository.py	70	12	82%	90–91, 98, 118–120, 122–123, 125, 171–173
versions
base_message_converter.py	83	12	85%	13, 72–74, 86, 98, 102, 106, 110, 114, 118, 124
error_converter.py	5	1	80%	7
identical_message_converter.py	15	0	100%
utils.py	26	5	80%	34–37, 43
versions/create_case_health
constants.py	4	0	100%
create_case_health_converter.py	178	0	100%
create_case_health_update_converter.py	5	0	100%
versions/create_case_health/v1_v2
constants.py	17	0	100%
utils.py	46	0	100%
versions/create_case_health/v2_v3
constants.py	29	0	100%
versions/geo_positions_update
geo_positions_update_constants.py	4	0	100%
geo_positions_update_converter.py	49	3	93%	31, 42, 79
versions/geo_resources_details
geo_resources_details_constants.py	4	0	100%
geo_resources_details_converter.py	27	0	100%
versions/reference
reference_constants.py	2	0	100%
reference_converter.py	13	0	100%
versions/resources_engagement
resources_engagement_constants.py	3	0	100%
resources_engagement_converter.py	22	0	100%
versions/resources_info
resources_info_constants.py	20	0	100%
resources_info_converter.py	87	0	100%
versions/resources_request
resources_request_constants.py	2	0	100%
resources_request_converter.py	21	0	100%
versions/resources_response
resources_response_constants.py	4	0	100%
resources_response_converter.py	16	0	100%
versions/resources_status
resources_status_constants.py	10	0	100%
resources_status_converter.py	39	0	100%
TOTAL	1692	74	95%

github-actions · 2026-03-24T13:53:00Z

Total Project Coverage	52.4%	🍏

github-actions · 2026-03-24T13:56:39Z

Total Project Coverage	52.4%	🍏

github-actions · 2026-03-24T13:58:23Z

Total Project Coverage	52.4%	🍏

Clemsazert · 2026-03-24T15:30:16Z

+    """
+
+    try:
+        resources = rs_ri["content"]["jsonContent"]["embeddedJsonContent"]["message"][


Utiliser get_field_value et une constante pour le path

Comme on manipule directement une resource désormais, ça m'a paru moins nécessaire

Clemsazert · 2026-03-24T15:30:37Z

+
+    for rs_sr in rs_sr_list:
+        try:
+            resource_status = rs_sr["content"]["jsonContent"]["embeddedJsonContent"][


Clemsazert · 2026-03-24T15:31:10Z

+            return None
+
+        # state is an array in RS-RI
+        resource["state"] = [resource_state_by_id[resource_id]]


utiliser un set_value ici

Clemsazert · 2026-03-24T15:35:42Z

        return "resourcesInfoCisu"
+
+    @classmethod
+    def from_rs_to_cisu(cls, edxl_json: Dict[str, Any]) -> Dict[str, Any] | None:


Changer le type pour retourner une liste de Dict[str, Any] au lieu de None

J'ai renvoyé {} car dans le cas passant cette méthode renvoie un RC-RI, et c'est à plus haut nivau que c'est empaqueté dans un array

Clemsazert · 2026-03-24T15:35:59Z

+
+        rs_ri = get_last_rs_ri_by_case_id(case_id)
+        if rs_ri is None:  # No RS-RI persisted yet, we do nothing
+            return None


Retourner plutôt une liste vide (None n'est pas gérer par la méthode appelante)

github-actions · 2026-03-26T15:12:39Z

Total Project Coverage	52.4%	🍏

github-actions · 2026-03-26T15:15:20Z

Total Project Coverage	52.4%	🍏

Clemsazert · 2026-03-26T16:00:50Z

+        result = []
+
+        for rs_sr in rs_sr_list:
+            resource_status = get_field_value(rs_sr, "$.resourceStatus")


Ce n'est pas $.state.status d'après le schéma du RS-SR ? Et mettre le chemin d'accès dans une constante.

Clemsazert · 2026-03-26T16:04:49Z

+
+        persisted_rs_ri = get_last_rs_ri_by_case_id(case_id)
+        if persisted_rs_ri is None:  # No RS-RI persisted yet, we return an empty object
+            return {}


Plutôt liste vide du coup ? Sinon on va renvoyer un objet vide au dispatcher. Aussi tu peux ajouter un commentaire TODO pour prévoir de renvoyer une erreur à la place ? C'est dans les tâches suivantes de gestion des cas à la marge.

Clemsazert · 2026-03-26T16:05:13Z

+    @classmethod
+    def from_rs_to_cisu(cls, edxl_json: Dict[str, Any]) -> Dict[str, Any]:
+        content = cls.copy_rs_input_use_case_content(edxl_json)
+        case_id = get_field_value(content, "$.caseId")


Ce serait top de mettre le chemin dans une constante.

Clemsazert · 2026-03-26T16:08:15Z

+        merged_rs_ri = merge_info_and_resources(resources, resources_status_list)
+
+        if merged_rs_ri is None:
+            return {}


Pas besoin de traiter ce cas ici, si il manque une ressource, from_rs_to_cisu va déjà retourner une erreur.

Clemsazert · 2026-03-26T16:20:14Z

+def merge_info_and_resources(
+    resources: list[dict],
+    resources_status_list: list[dict],
+) -> list[dict] | None:


Je pense qu'on devrait forcement au moins retourner le rs-ri de base sans modification. Ce n'est pas responsabilité de cette fonction de gérer le cas d'une ressource sans status. C'est géré ensuite dans la méthode de conversion appelée.

Clemsazert · 2026-03-26T16:20:35Z

+            rs_sr_state = None
+
+        # resource has no state and no RS-SR has been emitted yet
+        if "state" not in resource and rs_sr_state is None:


On peut ainsi enlever ce cas

Clemsazert · 2026-03-27T08:47:17Z

+        if merged_rs_ri is None:
+            return {}
+
+        set_value(rs_ri, "path", merged_rs_ri)


Attention au path qui n'est pas le bon ici

github-actions · 2026-03-27T11:19:18Z

Total Project Coverage	52.4%	🍏

…evel

github-actions · 2026-03-27T12:30:48Z

Total Project Coverage	52.4%	🍏

github-actions · 2026-03-27T14:04:21Z

Total Project Coverage	52.4%	🍏

github-actions · 2026-03-30T07:48:38Z

Total Project Coverage	52.4%	🍏

bou3108 changed the base branch from main to converter/rc-ri-single-message March 24, 2026 08:21

bou3108 force-pushed the feat/converter/generate-rc-ri-from-rs-sr branch from d74e45b to 51a60ca Compare March 24, 2026 13:51

feat (converter): add merge method

127ff73

bou3108 force-pushed the feat/converter/generate-rc-ri-from-rs-sr branch from 51a60ca to 127ff73 Compare March 24, 2026 13:55

feat(converter) : lint

ce97a60

bou3108 marked this pull request as ready for review March 24, 2026 14:15

Clemsazert reviewed Mar 24, 2026

View reviewed changes

bou3108 added 4 commits March 25, 2026 17:10

feat(converter) : fix edxl.content type (array over object)

585e389

feat(converter) : add doc for dev on Linux env

f965a18

feat(converter) : extract rs to rc RI mapping in caller method

863cfe9

feat(converter) : handle content message only in helper method

3a2f070

feat(converter) : rm unused import

1e99704

Clemsazert requested changes Mar 26, 2026

View reviewed changes

Clemsazert requested changes Mar 27, 2026

View reviewed changes

feat(converter) : add constants & do not handle edge cases at lower l…

8bf65e6

…evel

bou3108 force-pushed the feat/converter/generate-rc-ri-from-rs-sr branch from 1d92ac5 to 8bf65e6 Compare March 27, 2026 12:29

feat(converter) : rm unused var

fe4dc8d

feat(converter) : rm unused return type

64c29aa

Clemsazert approved these changes Mar 30, 2026

View reviewed changes

bou3108 merged commit 942288b into converter/rc-ri-single-message Mar 30, 2026
2 checks passed

bou3108 deleted the feat/converter/generate-rc-ri-from-rs-sr branch March 30, 2026 08:32

Conversation

bou3108 commented Mar 24, 2026

🔎 Détails

📄 Documentation

📸 Captures d'écran

🔗 Ticket associé

Uh oh!

github-actions bot commented Mar 24, 2026

Uh oh!

github-actions bot commented Mar 24, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Mar 24, 2026

Uh oh!

github-actions bot commented Mar 24, 2026

Uh oh!

github-actions bot commented Mar 24, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Mar 26, 2026

Uh oh!

github-actions bot commented Mar 26, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Mar 27, 2026

Uh oh!

github-actions bot commented Mar 27, 2026

Uh oh!

github-actions bot commented Mar 27, 2026

Uh oh!

github-actions bot commented Mar 30, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

github-actions bot commented Mar 24, 2026 •

edited

Loading