Feat/support v3 and vactive#429
Merged
EliNoden merged 1 commit intoJul 2, 2026
Merged
Conversation
|
Clemsazert
approved these changes
Jul 2, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
🔎 Détails
Lors de nos travaux sur la branche feat/15-nexsis-conversion-strategy, nous avons mis la version cible du CISU à
vactivece qui implique un changement cassant. Pour garder de la rétrocompatibilité, et puisqu'actuellement, les versions v3 et vactive sont les mêmes, cette PR remet la value deCISU_EXPECTED_MODEL_VERSIONà v3. Le comportement est alors iso avant/après no changements, et les étapes de validations suivantes montrent qu'il n'y a en effet pas de changement cassant + que le terrain est prêt à accueillir une version supérieure (vactiveou autre) dans la conversion Cisu -> Cisu.Validation
1. [v3] on teste le transcodage cisu v3 vers health v3 avec
CISUTranscoding-> doit renvoyer une 200 avec payloadscripts/call_convert.sh v3 v3 CISUTranscoding ./tests/fixtures/RC-EDA/RC-EDA_required_fields.json --envelope tests/fixtures/EDXL/edxl_envelope_fire_to_health.json > cisu_transcoding_v3_v3.jsonRésultat attendu
{ "converted_messages": [ { "content": [ { "jsonContent": { "embeddedJsonContent": { "message": { "createCaseHealth": { "caseId": "fr.health.samu440.DRFR154402413800862", "creation": "2024-05-26T13:15:00+02:00", "location": { "freetext": "" }, "owner": "fr.health.samuA", "qualification": { "whatsHappen": { "code": "C02.05.02", "label": "Obstétrique" } } }, "kind": "Report", "messageId": "fr.fire.sdisZ_2608323d-507d-4cbf-bf74-52007f8124ea", "recipient": [ { "URI": "hubsante:fr.health.samuA", "name": "samuA" } ], "sender": { "URI": "hubsante:fr.fire.sdisZ", "name": "sdisZ" }, "sentAt": "2022-09-27T08:23:34+02:00", "status": "Actual" } } } } ], "dateTimeExpires": "2072-09-27T08:23:34+02:00", "dateTimeSent": "2022-09-27T08:23:34+02:00", "descriptor": { "explicitAddress": { "explicitAddressScheme": "hubex", "explicitAddressValue": "fr.health.samuA" }, "language": "fr-FR" }, "distributionID": "fr.fire.sdisZ_2608323d-507d-4cbf-bf74-52007f8124ea", "distributionKind": "Report", "distributionStatus": "Actual", "senderID": "fr.fire.sdisZ" } ] }2. [v3] on teste la conversion cisu v3 vers v3 avec
CISUConversion-> doit renvoyer une 200 avec payloadscripts/call_convert.sh v3 v3 CISUVersionConversion ./tests/fixtures/RC-EDA/RC-EDA_required_fields.json --envelope tests/fixtures/EDXL/edxl_envelope_fire_to_health.json > cisu_version_conversion_v3_v3.jsonRésultat attendu
{ "converted_messages": [ { "content": [ { "jsonContent": { "embeddedJsonContent": { "message": { "createCase": { "caseId": "fr.health.samu440.DRFR154402413800862", "creation": "2024-05-26T13:15:00+02:00", "location": { "country": "FR", "locID": "111fb03a-6fd9-41e0-8e81-990c45188891" }, "qualification": { "whatsHappen": { "code": "C02.05.02", "label": "Obstétrique" } }, "referenceVersion": "2.0" }, "kind": "Report", "messageId": "fr.fire.sdisZ_2608323d-507d-4cbf-bf74-52007f8124ea", "recipient": [ { "URI": "hubsante:fr.health.samuA", "name": "samuA" } ], "sender": { "URI": "hubsante:fr.fire.sdisZ", "name": "sdisZ" }, "sentAt": "2022-09-27T08:23:34+02:00", "status": "Actual" } } } } ], "dateTimeExpires": "2072-09-27T08:23:34+02:00", "dateTimeSent": "2022-09-27T08:23:34+02:00", "descriptor": { "explicitAddress": { "explicitAddressScheme": "hubex", "explicitAddressValue": "fr.health.samuA" }, "language": "fr-FR" }, "distributionID": "fr.fire.sdisZ_2608323d-507d-4cbf-bf74-52007f8124ea", "distributionKind": "Report", "distributionStatus": "Actual", "senderID": "fr.fire.sdisZ" } ] }3. [v4] on teste le transcodage cisu v3 vers v4 avec
CISUTranscoding-> doit renvoyer une 200 avec payloadTemporairement, on remplace dans
converter/converter/cisu_transcoders/constants.py:Puis on relance les tests :
scripts/call_convert.sh v4 v3 CISUTranscoding ./tests/fixtures/RC-EDA/RC-EDA_required_fields.json --envelope tests/fixtures/EDXL/edxl_envelope_fire_to_health.json > cisu_transcoding_v4_v3.jsonRésultat attendu
{ "converted_messages": [ { "content": [ { "jsonContent": { "embeddedJsonContent": { "message": { "createCaseHealth": { "caseId": "fr.health.samu440.DRFR154402413800862", "creation": "2024-05-26T13:15:00+02:00", "location": { "freetext": "" }, "owner": "fr.health.samuA", "qualification": { "whatsHappen": { "code": "C02.05.02", "label": "Obstétrique" } } }, "kind": "Report", "messageId": "fr.fire.sdisZ_2608323d-507d-4cbf-bf74-52007f8124ea", "recipient": [ { "URI": "hubsante:fr.health.samuA", "name": "samuA" } ], "sender": { "URI": "hubsante:fr.fire.sdisZ", "name": "sdisZ" }, "sentAt": "2022-09-27T08:23:34+02:00", "status": "Actual" } } } } ], "dateTimeExpires": "2072-09-27T08:23:34+02:00", "dateTimeSent": "2022-09-27T08:23:34+02:00", "descriptor": { "explicitAddress": { "explicitAddressScheme": "hubex", "explicitAddressValue": "fr.health.samuA" }, "language": "fr-FR" }, "distributionID": "fr.fire.sdisZ_2608323d-507d-4cbf-bf74-52007f8124ea", "distributionKind": "Report", "distributionStatus": "Actual", "senderID": "fr.fire.sdisZ" } ] }4. [v4] on teste la conversion cisu v3 vers v4 avec
CISUConversion-> doit renvoyer la même chosescripts/call_convert.sh v4 v3 CISUVersionConversion ./tests/fixtures/RC-EDA/RC-EDA_required_fields.json --envelope tests/fixtures/EDXL/edxl_envelope_fire_to_health.json > cisu_version_conversion_v4_v3.jsonRésultat attendu
{ "converted_messages": [ { "content": [ { "jsonContent": { "embeddedJsonContent": { "message": { "createCase": { "caseId": "fr.health.samu440.DRFR154402413800862", "creation": "2024-05-26T13:15:00+02:00", "location": { "country": "FR", "locID": "111fb03a-6fd9-41e0-8e81-990c45188891" }, "qualification": { "whatsHappen": { "code": "C02.05.02", "label": "Obstétrique" } }, "referenceVersion": "2.0" }, "kind": "Report", "messageId": "fr.fire.sdisZ_2608323d-507d-4cbf-bf74-52007f8124ea", "recipient": [ { "URI": "hubsante:fr.health.samuA", "name": "samuA" } ], "sender": { "URI": "hubsante:fr.fire.sdisZ", "name": "sdisZ" }, "sentAt": "2022-09-27T08:23:34+02:00", "status": "Actual" } } } } ], "dateTimeExpires": "2072-09-27T08:23:34+02:00", "dateTimeSent": "2022-09-27T08:23:34+02:00", "descriptor": { "explicitAddress": { "explicitAddressScheme": "hubex", "explicitAddressValue": "fr.health.samuA" }, "language": "fr-FR" }, "distributionID": "fr.fire.sdisZ_2608323d-507d-4cbf-bf74-52007f8124ea", "distributionKind": "Report", "distributionStatus": "Actual", "senderID": "fr.fire.sdisZ" } ] }Verification finale
-> devrait montrer 0 diff
-> devrait montrer 0 diff
Les conversions de version CISU v3 -> v4 et v4 -> v3 fonctionnent, car retournent la même chose (comportement voulu).
On peut donc être serein sur le fait que laisser v3 dans
CISU_EXPECTED_MODEL_VERSIONapplique bien le comportement attendu.🔗 Ticket associé
Asana