fixed MQTT endpoint for auxiliary-heating

skodaconnect · Nov 9, 2024 · 805128b · 805128b
1 parent 144a50a
commit 805128b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/myskoda/cli/operations.py b/myskoda/cli/operations.py
@@ -34,6 +34,7 @@ async def start_air_conditioning(
 @click.option("timeout", "--timeout", type=float, default=300)
 @click.argument("vin")
 @click.pass_context
+@mqtt_required
 async def stop_air_conditioning(ctx: Context, timeout: float, vin: str) -> None:  # noqa: ASYNC109
     """Stop the air conditioning."""
     myskoda: MySkoda = ctx.obj["myskoda"]
@@ -47,6 +48,7 @@ async def stop_air_conditioning(ctx: Context, timeout: float, vin: str) -> None:
 @click.option("timeout", "--timeout", type=float, default=300)
 @click.argument("vin")
 @click.pass_context
+@mqtt_required
 async def start_auxiliary_heating(
     ctx: Context,
     temperature: float,
@@ -63,6 +65,7 @@ async def start_auxiliary_heating(
 @click.option("timeout", "--timeout", type=float, default=300)
 @click.argument("vin")
 @click.pass_context
+@mqtt_required
 async def stop_auxiliary_heating(ctx: Context, timeout: float, vin: str) -> None:  # noqa: ASYNC109
     """Stop the auxiliary heating."""
     myskoda: MySkoda = ctx.obj["myskoda"]

diff --git a/myskoda/const.py b/myskoda/const.py
@@ -17,7 +17,7 @@
     "air-conditioning/set-air-conditioning-without-external-power",
     "air-conditioning/set-target-temperature",
     "air-conditioning/start-stop-air-conditioning",
-    "air-conditioning/start-stop-auxiliary-heating",
+    "auxiliary-heating/start-stop-auxiliary-heating",
     "air-conditioning/start-stop-window-heating",
     "air-conditioning/windows-heating",
     "charging/start-stop-charging",
@@ -37,6 +37,7 @@
 MQTT_SERVICE_EVENT_TOPICS = [
     "air-conditioning",
     "charging",
+    "departure"
     "vehicle-status/access",
     "vehicle-status/lights",
 ]

diff --git a/myskoda/myskoda.py b/myskoda/myskoda.py
@@ -221,16 +221,16 @@ async def stop_air_conditioning(self, vin: str) -> None:
     async def start_auxiliary_heating(self, vin: str, temperature: float, spin: str) -> None:
         """Start the auxiliary heating with the provided target temperature in °C."""
         # NOTE: 08/11/2024 - no response is published in MQTT (maybe bug in api?) so we don't wait
-        # future = self._wait_for_operation(OperationName.START_AUXILIARY_HEATING)
+        future = self._wait_for_operation(OperationName.START_AUXILIARY_HEATING)
         await self.rest_api.start_auxiliary_heating(vin, temperature, spin)
-        # await future
+        await future
 
     async def stop_auxiliary_heating(self, vin: str) -> None:
         """Stop the auxiliary heating."""
         # NOTE: 08/11/2024 - no response is published in MQTT (maybe bug in api?) so we don't wait
-        # future = self._wait_for_operation(OperationName.STOP_AUXILIARY_HEATING)
+        future = self._wait_for_operation(OperationName.STOP_AUXILIARY_HEATING)
         await self.rest_api.stop_auxiliary_heating(vin)
-        # await future
+        await future
 
     async def lock(self, vin: str, spin: str) -> None:
         """Lock the car."""

diff --git a/tests/test_operations.py b/tests/test_operations.py
@@ -371,7 +371,7 @@ async def test_stop_auxiliary_heater(
 
     future = myskoda.stop_auxiliary_heating(VIN)
 
-    topic = f"{USER_ID}/{VIN}/operation-request/air-conditioning/start-stop-auxiliary-heating"
+    topic = f"{USER_ID}/{VIN}/operation-request/auxiliary-heating/start-stop-auxiliary-heating"
     await mqtt_client.publish(topic, create_completed_json("stop-auxiliary-heating"), QOS_2)
 
     await future
@@ -399,7 +399,7 @@ async def test_start_auxiliary_heater(
 
     future = myskoda.start_auxiliary_heating(VIN, temperature, spin)
 
-    topic = f"{USER_ID}/{VIN}/operation-request/air-conditioning/start-stop-auxiliary-heating"
+    topic = f"{USER_ID}/{VIN}/operation-request/auxiliary-heating/start-stop-auxiliary-heating"
     await mqtt_client.publish(topic, create_completed_json("start-auxiliary-heating"), QOS_2)
 
     await future