Fix driving range model for Octavia NX (#163)

* Fix driving range model for Octavia NX * Fix tests
skodaconnect · Nov 8, 2024 · 71c05e5 · 71c05e5
1 parent 114fbd8
commit 71c05e5
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 1 deletion.
diff --git a/fixtures/nx53l5_octavia_2024_combi_deepsleep_0.8.3.yaml b/fixtures/nx53l5_octavia_2024_combi_deepsleep_0.8.3.yaml
@@ -480,6 +480,7 @@ reports:
     "gasoline", "currentSoCInPercent": 100, "currentFuelLevelInPercent": 100, "remainingRangeInKm":
     820}, "carCapturedTimestamp": "2024-10-21T06:57:30Z"}'
   result:
+    ad_blue_range: null
     car_captured_timestamp: '2024-10-21T06:57:30+00:00'
     car_type: gasoline
     primary_engine_range:

diff --git a/fixtures/prior99_enyaq_iv60_idle_full_battery.yaml b/fixtures/prior99_enyaq_iv60_idle_full_battery.yaml
@@ -502,6 +502,7 @@ reports:
     "electric", "currentSoCInPercent": 47, "remainingRangeInKm": 153}, "carCapturedTimestamp":
     "2024-10-14T16:15:14Z"}'
   result:
+    ad_blue_range: null
     car_captured_timestamp: '2024-10-14T16:15:14+00:00'
     car_type: electric
     primary_engine_range:

diff --git a/fixtures/prior99_octavia_2018.yaml b/fixtures/prior99_octavia_2018.yaml
@@ -363,6 +363,7 @@ reports:
     "diesel", "currentSoCInPercent": 81, "currentFuelLevelInPercent": 81, "remainingRangeInKm":
     530}, "carCapturedTimestamp": "2024-10-16T17:46:58Z"}'
   result:
+    ad_blue_range: null
     car_captured_timestamp: '2024-10-16T17:46:58+00:00'
     car_type: diesel
     primary_engine_range:

diff --git a/fixtures/skoda_octavia_combi_2023.yaml b/fixtures/skoda_octavia_combi_2023.yaml
@@ -438,6 +438,7 @@ reports:
     "gasoline", "currentSoCInPercent": 100, "currentFuelLevelInPercent": 100, "remainingRangeInKm":
     830}, "carCapturedTimestamp": "2024-11-06T11:38:26Z"}'
   result:
+    ad_blue_range: null
     car_captured_timestamp: '2024-11-06T11:38:26+00:00'
     car_type: gasoline
     primary_engine_range:

diff --git a/fixtures/superb_iv_2020_3v35xc_liftback_l_and_k.yaml b/fixtures/superb_iv_2020_3v35xc_liftback_l_and_k.yaml
@@ -499,6 +499,7 @@ reports:
     850}, "secondaryEngineRange": {"engineType": "electric", "currentSoCInPercent":
     63, "remainingRangeInKm": 23}, "carCapturedTimestamp": "2024-10-16T17:40:53Z"}'
   result:
+    ad_blue_range: null
     car_captured_timestamp: '2024-10-16T17:40:53+00:00'
     car_type: hybrid
     primary_engine_range:

diff --git a/fixtures/webspider_enyaq_iv80_parked_deep_sleep_positioning_off.yaml b/fixtures/webspider_enyaq_iv80_parked_deep_sleep_positioning_off.yaml
@@ -496,6 +496,7 @@ reports:
     "electric", "currentSoCInPercent": 34, "remainingRangeInKm": 138}, "carCapturedTimestamp":
     "2024-10-21T14:50:39Z"}'
   result:
+    ad_blue_range: null
     car_captured_timestamp: '2024-10-21T14:50:39+00:00'
     car_type: electric
     primary_engine_range:

diff --git a/myskoda/models/driving_range.py b/myskoda/models/driving_range.py
@@ -29,8 +29,11 @@ class EngineRange(DataClassORJSONMixin):
 class DrivingRange(DataClassORJSONMixin):
     car_captured_timestamp: datetime = field(metadata=field_options(alias="carCapturedTimestamp"))
     car_type: EngineType = field(metadata=field_options(alias="carType"))
-    total_range_in_km: int = field(metadata=field_options(alias="totalRangeInKm"))
     primary_engine_range: EngineRange = field(metadata=field_options(alias="primaryEngineRange"))
     secondary_engine_range: EngineRange | None = field(
         default=None, metadata=field_options(alias="secondaryEngineRange")
     )
+    total_range_in_km: int | None = field(
+        default=None, metadata=field_options(alias="totalRangeInKm")
+    )
+    ad_blue_range: int | None = field(default=None, metadata=field_options(alias="adBlueRange"))