Skip to content

Commit 478a2f2

Browse files
author
Issam Kadar
committed
feat/converter : refacto
1 parent 7c9ca3b commit 478a2f2

1 file changed

Lines changed: 23 additions & 15 deletions

File tree

converter/converter/cisu/resources_status/resources_status_converter.py

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,31 @@ def from_rs_to_cisu(
3939
if rs_ri_msg is None:
4040
raise ValueError(f"No RS-RI found for caseId: {case_id!r}")
4141

42+
rs_ri = rs_ri_msg.payload
43+
cls.check_resource_belongs_to_case(rs_ri, current_use_case)
44+
45+
rs_sr_use_cases = [
46+
cls.copy_rs_input_use_case_content(pm.payload) for pm in persisted_rs_sr
47+
]
48+
rs_sr_use_cases.append(current_use_case)
49+
50+
output_json = ResourcesInfoCISUConverter.copy_rs_input_content(rs_ri)
51+
rs_ri_use_case = ResourcesInfoCISUConverter.copy_rs_input_use_case_content(
52+
rs_ri
53+
)
54+
enriched = enrich_rs_ri_with_rs_srs(rs_ri_use_case, rs_sr_use_cases)
55+
56+
return ResourcesInfoCISUConverter.convert_single_rs_ri(output_json, enriched)
57+
58+
@classmethod
59+
def check_resource_belongs_to_case(
60+
cls, rs_ri: Dict[str, Any], rs_sr_use_case: Dict[str, Any]
61+
) -> None:
62+
case_id = get_field_value(rs_sr_use_case, ResourcesStatusConstants.CASE_ID)
4263
resource_id = get_field_value(
43-
current_use_case, ResourcesStatusConstants.RESOURCE_ID
64+
rs_sr_use_case, ResourcesStatusConstants.RESOURCE_ID
4465
)
45-
rs_ri = rs_ri_msg.payload
66+
4667
rs_ri_content = ResourcesInfoCISUConverter.copy_rs_input_use_case_content(rs_ri)
4768
resources = (
4869
get_field_value(rs_ri_content, ResourcesInfoCISUConstants.RESOURCE_PATH)
@@ -56,16 +77,3 @@ def from_rs_to_cisu(
5677
raise ValueError(
5778
f"Resource '{resource_id}' from RS-SR not found in RS-RI for caseId '{case_id}'"
5879
)
59-
60-
rs_sr_use_cases = [
61-
cls.copy_rs_input_use_case_content(pm.payload) for pm in persisted_rs_sr
62-
]
63-
rs_sr_use_cases.append(current_use_case)
64-
65-
output_json = ResourcesInfoCISUConverter.copy_rs_input_content(rs_ri)
66-
rs_ri_use_case = ResourcesInfoCISUConverter.copy_rs_input_use_case_content(
67-
rs_ri
68-
)
69-
enriched = enrich_rs_ri_with_rs_srs(rs_ri_use_case, rs_sr_use_cases)
70-
71-
return ResourcesInfoCISUConverter.convert_single_rs_ri(output_json, enriched)

0 commit comments

Comments
 (0)