Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add condition field to AHBLine #410

Merged
merged 6 commits into from
Jul 10, 2024
Merged

Add condition field to AHBLine #410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a62e32f
add conditions field to AHBLine
DeltaDaniel Jun 18, 2024
1034c1e
Updated requirements and added ahbicht
DeltaDaniel Jun 18, 2024
7009baf
update schema too
DeltaDaniel Jun 18, 2024
32119fc
Revert "Updated requirements and added ahbicht"
DeltaDaniel Jun 25, 2024
a528a84
Merge remote-tracking branch 'origin/main' into add_field_to_AHBLine
DeltaDaniel Jul 10, 2024
4f365a8
updated tests
DeltaDaniel Jul 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.11
# This file is autogenerated by pip-compile with Python 3.12
# by the following command:
#
# pip-compile requirements.in
Expand All @@ -8,6 +8,8 @@ attrs==23.2.0
# via -r requirements.in
click==8.1.7
# via -r requirements.in
colorama==0.4.6
# via click
lark==1.1.9
# via -r requirements.in
lxml==5.2.2
Expand Down
9 changes: 8 additions & 1 deletion src/maus/models/anwendungshandbuch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,13 @@ class AhbLine:
)
"""a requirement indicator + an optional condition ("ahb expression"), e.g. 'Muss [123] O [456]' """
# note: to parse expressions from AHBs consider using AHBicht: https://github.com/Hochfrequenz/ahbicht/

conditions: Optional[str] = attrs.field(
validator=attrs.validators.optional(validator=attrs.validators.instance_of(str)), default=None
)
"""
The condition text describes the text to the optional condition of the ahb expression.
E.g. '[492] This is a condition text. [999] And this is another one.'
"""
section_name: Optional[str] = attrs.field(
validator=attrs.validators.optional(validator=attrs.validators.instance_of(str)), default=None
)
Expand Down Expand Up @@ -141,6 +147,7 @@ class AhbLineSchema(Schema):
value_pool_entry = fields.String(required=False, load_default=None)
name = fields.String(required=False, load_default=None)
ahb_expression = fields.String(required=False, load_default=None)
conditions = fields.String(required=False, load_default=None)
section_name = fields.String(required=False, load_default=None)
index = fields.Int(required=False, load_default=None, dump_default=None)

Expand Down
12 changes: 12 additions & 0 deletions tests/unit_tests/test_ahb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@

line_x = AhbLine(
ahb_expression="Muss [1] O [2]",
conditions="[1] Test\n[2] Test",
segment_group_key="SG2",
segment_code="NAD",
data_element="3039",
Expand All @@ -37,6 +38,7 @@
)
line_y = AhbLine(
ahb_expression="Muss [3] O [4]",
conditions="[3] Test\n[4] Test",
segment_group_key="SG2",
segment_code="NAD",
data_element="3039",
Expand Down Expand Up @@ -86,6 +88,7 @@ def test_ahb_meta_information_equality(self, ahb_x: AhbMetaInformation, ahb_y: A
pytest.param(
AhbLine(
ahb_expression="Muss [1] O [2]",
conditions="[1] Test\n[2] Test",
segment_group_key="SG2",
segment_code="NAD",
segment_id="01234",
Expand All @@ -105,12 +108,14 @@ def test_ahb_meta_information_equality(self, ahb_x: AhbMetaInformation, ahb_y: A
"name": "MP-ID",
"guid": "12b1a98a-edf5-4177-89e5-a6d8a92c5fdc",
"section_name": "Foo",
"conditions": "[1] Test\n[2] Test",
"index": None,
},
),
pytest.param(
AhbLine(
ahb_expression="Muss [1] O [2]",
conditions="[1] Test\n[2] Test",
segment_group_key="SG2",
segment_code="NAD",
segment_id=None,
Expand All @@ -131,6 +136,7 @@ def test_ahb_meta_information_equality(self, ahb_x: AhbMetaInformation, ahb_y: A
"name": "MP-ID",
"guid": "12b1a98a-edf5-4177-89e5-a6d8a92c5fdc",
"section_name": "Foo",
"conditions": "[1] Test\n[2] Test",
"index": 42,
},
),
Expand All @@ -156,6 +162,7 @@ def test_ahb_line_equality(self, line_x: AhbLine, line_y: AhbLine, are_equal: bo
pytest.param(
AhbLine(
ahb_expression="Muss [1] O [2]",
conditions="[1] Test\n[2] Test",
segment_group_key="SG2",
segment_code="NAD",
data_element="3039",
Expand Down Expand Up @@ -201,6 +208,7 @@ def test_ahbline_holds_any_information(self, ahb_line: AhbLine, expected_holds_a
pytest.param(
AhbLine(
ahb_expression="Muss [1] O [2]",
conditions="[1] Test\n[2] Test",
segment_group_key="SG2",
segment_code="NAD",
data_element="3039",
Expand All @@ -214,6 +222,7 @@ def test_ahbline_holds_any_information(self, ahb_line: AhbLine, expected_holds_a
pytest.param(
AhbLine(
ahb_expression="Muss [1] O [2]",
conditions="[1] Test\n[2] Test",
segment_group_key="SG2",
segment_code="NAD",
data_element="3039",
Expand All @@ -227,6 +236,7 @@ def test_ahbline_holds_any_information(self, ahb_line: AhbLine, expected_holds_a
pytest.param(
AhbLine(
ahb_expression="Muss [1] O [2]",
conditions="[1] Test\n[2] Test",
segment_group_key=None,
segment_code="UNH",
data_element="0062",
Expand All @@ -252,6 +262,7 @@ def test_ahbline_get_discriminator(self, ahb_line: AhbLine, include_name: bool,
lines=[
AhbLine(
ahb_expression="Muss [1] O [2]",
conditions="[1] Test\n[2] Test",
segment_group_key="SG2",
segment_code="NAD",
data_element="3039",
Expand Down Expand Up @@ -280,6 +291,7 @@ def test_ahbline_get_discriminator(self, ahb_line: AhbLine, include_name: bool,
"name": "MP-ID",
"guid": "12b1a98a-edf5-4177-89e5-a6d8a92c5fdc",
"section_name": "MP-ID Absender",
"conditions": "[1] Test\n[2] Test",
"index": None,
}
],
Expand Down
Loading