Skip to content

🚚 rename com.Verbrauch mengeneinheit ➡ einheit #448

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

Merged
hf-kklein merged 4 commits into from
Jan 9, 2023
Merged

🚚 rename com.Verbrauch mengeneinheit ➡ einheit #448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d5b7726
🚚 rename com.Verbrauch `mengeneinheit` ➡ `einheit`
hf-kklein Jan 9, 2023
8b7c4b8
fix two tests
hf-kklein Jan 9, 2023
53b51c9
fix another test
hf-kklein Jan 9, 2023
cd88bbc
three more
hf-kklein Jan 9, 2023
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
10 changes: 5 additions & 5 deletions json_schemas/bo/Energiemenge.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,14 +92,14 @@
"Verbrauch": {
"description": "Abbildung eines zeitlich abgegrenzten Verbrauchs\n\n.. raw:: html\n\n <object data=\"../_static/images/bo4e/com/Verbrauch.svg\" type=\"image/svg+xml\"></object>\n\n.. HINT::\n `Verbrauch JSON Schema <https://json-schema.app/view/%23?url=https://raw.githubusercontent.com/Hochfrequenz/BO4E-python/main/json_schemas/com/Verbrauch.json>`_",
"properties": {
"einheit": {
"$ref": "#/definitions/Mengeneinheit"
},
"enddatum": {
"format": "date-time",
"title": "Enddatum",
"type": "string"
},
"mengeneinheit": {
"$ref": "#/definitions/Mengeneinheit"
},
"obisKennzahl": {
"pattern": "((1)-((?:[0-5]?[0-9])|(?:6[0-5])):((?:[1-8]|99))\\.((?:6|8|9|29))\\.([0-9]{1,2})|(7)-((?:[0-5]?[0-9])|(?:6[0-5])):(.{1,2})\\.(.{1,2})\\.([0-9]{1,2}))",
"title": "Obiskennzahl",
Expand All @@ -122,7 +122,7 @@
"wertermittlungsverfahren",
"obisKennzahl",
"wert",
"mengeneinheit"
"einheit"
],
"title": "Verbrauch",
"type": "object"
Expand Down Expand Up @@ -183,4 +183,4 @@
],
"title": "Energiemenge",
"type": "object"
}
}
8 changes: 4 additions & 4 deletions json_schemas/com/Verbrauch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@
},
"description": "Abbildung eines zeitlich abgegrenzten Verbrauchs\n\n.. raw:: html\n\n <object data=\"../_static/images/bo4e/com/Verbrauch.svg\" type=\"image/svg+xml\"></object>\n\n.. HINT::\n `Verbrauch JSON Schema <https://json-schema.app/view/%23?url=https://raw.githubusercontent.com/Hochfrequenz/BO4E-python/main/json_schemas/com/Verbrauch.json>`_",
"properties": {
"einheit": {
"$ref": "#/definitions/Mengeneinheit"
},
"enddatum": {
"format": "date-time",
"title": "Enddatum",
"type": "string"
},
"mengeneinheit": {
"$ref": "#/definitions/Mengeneinheit"
},
"obisKennzahl": {
"pattern": "((1)-((?:[0-5]?[0-9])|(?:6[0-5])):((?:[1-8]|99))\\.((?:6|8|9|29))\\.([0-9]{1,2})|(7)-((?:[0-5]?[0-9])|(?:6[0-5])):(.{1,2})\\.(.{1,2})\\.([0-9]{1,2}))",
"title": "Obiskennzahl",
Expand All @@ -63,7 +63,7 @@
"wertermittlungsverfahren",
"obisKennzahl",
"wert",
"mengeneinheit"
"einheit"
],
"title": "Verbrauch",
"type": "object"
Expand Down
2 changes: 1 addition & 1 deletion src/bo4e/com/verbrauch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class Verbrauch(COM):
#: Gibt den absoluten Wert der Menge an
wert: Decimal
#: Gibt die Einheit zum jeweiligen Wert an
mengeneinheit: Mengeneinheit
einheit: Mengeneinheit

# optional attributes
#: Inklusiver Beginn des Zeitraumes, für den der Verbrauch angegeben wird
Expand Down
12 changes: 6 additions & 6 deletions tests/test_verbrauch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
example_verbrauch = Verbrauch(
wert=Decimal(40),
obis_kennzahl="1-0:1.8.1",
mengeneinheit=Mengeneinheit.KWH,
einheit=Mengeneinheit.KWH,
wertermittlungsverfahren=Wertermittlungsverfahren.MESSUNG,
)

Expand All @@ -28,13 +28,13 @@ class TestVerbrauch:
startdatum=datetime(2021, 12, 1, 0, 0, 0).replace(tzinfo=timezone.utc),
enddatum=datetime(2021, 12, 2, 0, 0, 0).replace(tzinfo=timezone.utc),
obis_kennzahl="1-0:1.8.1",
mengeneinheit=Mengeneinheit.KWH,
einheit=Mengeneinheit.KWH,
wertermittlungsverfahren=Wertermittlungsverfahren.MESSUNG,
),
{
"startdatum": datetime(2021, 12, 1, 0, 0, tzinfo=timezone.utc),
"wert": Decimal("40"),
"mengeneinheit": Mengeneinheit.KWH,
"einheit": Mengeneinheit.KWH,
"enddatum": datetime(2021, 12, 2, 0, 0, tzinfo=timezone.utc),
"wertermittlungsverfahren": Wertermittlungsverfahren.MESSUNG,
"obisKennzahl": "1-0:1.8.1",
Expand All @@ -44,7 +44,7 @@ class TestVerbrauch:
example_verbrauch,
{
"wert": Decimal("40"),
"mengeneinheit": Mengeneinheit.KWH,
"einheit": Mengeneinheit.KWH,
"wertermittlungsverfahren": Wertermittlungsverfahren.MESSUNG,
"startdatum": None,
"enddatum": None,
Expand Down Expand Up @@ -78,7 +78,7 @@ def test_failing_validation_obis(self, not_a_valid_obis: str) -> None:
wert=Decimal(40),
startdatum=datetime(2021, 12, 1, 0, 0, 0).replace(tzinfo=timezone.utc),
enddatum=datetime(2021, 12, 2, 0, 0, 0).replace(tzinfo=timezone.utc),
mengeneinheit=Mengeneinheit.KWH,
einheit=Mengeneinheit.KWH,
wertermittlungsverfahren=Wertermittlungsverfahren.MESSUNG,
)

Expand All @@ -93,7 +93,7 @@ def test_failing_validation_end_later_than_start(self) -> None:
wert=Decimal(40),
startdatum=datetime(2021, 12, 2, 0, 0, 0).replace(tzinfo=timezone.utc),
enddatum=datetime(2021, 12, 1, 0, 0, 0).replace(tzinfo=timezone.utc),
mengeneinheit=Mengeneinheit.KWH,
einheit=Mengeneinheit.KWH,
wertermittlungsverfahren=Wertermittlungsverfahren.MESSUNG,
)
assert "has to be later than the start" in str(excinfo.value)