Skip to content

Commit 97244b9

Browse files
committed
Convert Water Meter values
1 parent c75d32a commit 97244b9

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

toonapi/models.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
convert_cm3,
1919
convert_datetime,
2020
convert_kwh,
21+
convert_lmin,
22+
convert_m3,
2123
convert_negative_none,
2224
convert_temperature,
23-
convert_m3,
24-
convert_lmin
2525
)
2626

2727

@@ -358,11 +358,11 @@ class WaterUsage:
358358
average: Optional[int] = None
359359
current: Optional[int] = None
360360
day_average: Optional[int] = None
361+
day_cost: Optional[float] = None
361362
day_usage: Optional[int] = None
362363
installed: Optional[bool] = None
363364
is_smart: Optional[bool] = None
364365
meter: Optional[int] = None
365-
day_cost: Optional[float] = None
366366

367367
last_updated_from_display: Optional[datetime] = None
368368
last_updated = datetime.utcnow()
@@ -371,14 +371,16 @@ def update_from_dict(self, data: Dict[str, Any]) -> None:
371371
"""Update this WaterUsage object with data from a dictionary."""
372372
self.average = process_data(data, "avgValue", self.average, convert_lmin)
373373
self.current = process_data(data, "value", self.current, convert_lmin)
374-
self.day_average = process_data(data, "avgDayValue", self.day_average, convert_m3)
374+
self.day_average = process_data(
375+
data, "avgDayValue", self.day_average, convert_m3
376+
)
377+
self.day_cost = process_data(data, "dayCost", self.day_cost)
375378
self.day_usage = process_data(data, "dayUsage", self.day_usage, convert_m3)
376379
self.installed = process_data(
377380
data, "installed", self.installed, convert_boolean
378381
)
379382
self.is_smart = process_data(data, "isSmart", self.is_smart, convert_boolean)
380383
self.meter = process_data(data, "meterReading", self.meter, convert_m3)
381-
self.day_cost = process_data(data, "dayCost", self.day_cost)
382384
self.last_updated_from_display = process_data(
383385
data,
384386
"lastUpdatedFromDisplay",

0 commit comments

Comments
 (0)