Skip to content

Commit 2ae86c3

Browse files
committed
fix
1 parent edce4d0 commit 2ae86c3

2 files changed

Lines changed: 8 additions & 7 deletions

File tree

src/openinflation_dataclass/card.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ class Card(NetworkModel):
8888

8989
@model_validator(mode="after")
9090
def validate_business_rules(self) -> Card:
91-
is_piece_unit = self.unit == "PCE"
91+
is_piece_unit = self.unit_net == "PCE"
9292
has_count = self.available_count is not None
9393
count_is_int = type(self.available_count) is int
9494

@@ -98,8 +98,8 @@ def validate_business_rules(self) -> Card:
9898
raise ValueError(
9999
"package_quantity_net and package_unit must be set together or both set to None."
100100
)
101-
if (self.package_quantity_gross is None) != (self.package_unit is None):
101+
if (self.package_weight_gross is None) != (self.package_unit is None):
102102
raise ValueError(
103-
"package_quantity_gross and package_unit must be set together or both set to None."
103+
"package_weight_gross and package_unit must be set together or both set to None."
104104
)
105105
return self

tests/test_models.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ def _build_card() -> Card:
4040
loyal_price=75.9,
4141
wholesale_price=[],
4242
price_unit="RUB",
43-
unit="PCE",
43+
unit_net="PCE",
4444
available_count=15,
4545
package_quantity_net=1.0,
46-
package_quantity_gross=1.0,
46+
package_weight_gross=1.0,
4747
package_unit="LTR",
4848
categories_uid=["milk"],
4949
main_image="main-image.png",
@@ -132,9 +132,10 @@ def test_card_piece_validation_rejects_float_count() -> None:
132132
loyal_price=75.9,
133133
wholesale_price=[],
134134
price_unit="RUB",
135-
unit="PCE",
135+
unit_net="PCE",
136136
available_count=15.5,
137-
package_quantity=1.0,
137+
package_quantity_net=1.0,
138+
package_weight_gross=1.0,
138139
package_unit="LTR",
139140
categories_uid=["milk"],
140141
main_image="main-image.png",

0 commit comments

Comments
 (0)