Skip to content

Commit 7c9ca3b

Browse files
author
Issam Kadar
committed
feat/tnr : format code
1 parent 253be2c commit 7c9ca3b

2 files changed

Lines changed: 14 additions & 8 deletions

File tree

converter/converter/cisu/resources_status/resources_status_converter.py

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,18 @@ 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-
resource_id = get_field_value(current_use_case, ResourcesStatusConstants.RESOURCE_ID)
42+
resource_id = get_field_value(
43+
current_use_case, ResourcesStatusConstants.RESOURCE_ID
44+
)
4345
rs_ri = rs_ri_msg.payload
4446
rs_ri_content = ResourcesInfoCISUConverter.copy_rs_input_use_case_content(rs_ri)
45-
resources = get_field_value(rs_ri_content, ResourcesInfoCISUConstants.RESOURCE_PATH) or []
46-
resource_ids_in_rs_ri = {r.get(ResourcesInfoCISUConstants.RESOURCE_ID_KEY) for r in resources}
47+
resources = (
48+
get_field_value(rs_ri_content, ResourcesInfoCISUConstants.RESOURCE_PATH)
49+
or []
50+
)
51+
resource_ids_in_rs_ri = {
52+
r.get(ResourcesInfoCISUConstants.RESOURCE_ID_KEY) for r in resources
53+
}
4754

4855
if resource_id not in resource_ids_in_rs_ri:
4956
raise ValueError(

converter/tests/cisu/test_resources_status_converter.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import pytest
22
from unittest.mock import patch
3-
import pytest
43

54
from converter.cisu.resources_status.resources_status_converter import (
65
ResourcesStatusConverter,
@@ -80,13 +79,13 @@ def test_from_rs_to_cisu_no_rs_ri():
8079

8180
def test_from_rs_to_cisu_resource_not_in_rs_ri():
8281
unknown_resource_id = "fr.fire.sis076.cgo-076.resource.UNKNOWN_VLM"
83-
rs_sr = make_rs_sr(_CASE_ID, unknown_resource_id, "ARRIVEE")
84-
rs_ri = make_rs_ri(_CASE_ID) # RS-RI only has VLM1 and VLM2
82+
rs_sr = make_rs_sr_from_sample(_CASE_ID, unknown_resource_id, "ARRIVEE")
83+
rs_ri = make_rs_ri_from_sample(_CASE_ID)
8584

8685
with (
8786
patch(
88-
"converter.cisu.resources_status.resources_status_converter.get_last_rs_ri_by_case_id",
89-
return_value=persisted(rs_ri),
87+
_PATCH_GET_RS_MESSAGES,
88+
return_value=persisted_rs_ri_and_rs_sr(rs_ri, []),
9089
),
9190
pytest.raises(
9291
ValueError,

0 commit comments

Comments
 (0)