handle incorect mqtt message

.github/workflows/release.yml

@@ -5,6 +5,14 @@ on:
      - 'v*.*.*'
   workflow_dispatch:
 jobs:
+  create_release:
+    name: Push to pypi
+    runs-on: ubuntu-latest
+    steps:
+     - name: Build and publish to pypi
+       uses: JRubics/poetry-publish@v1.10
+       with:
+         pypi_token: ${{ secrets.PYPI_TOKEN }}
   push_to_registry:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest

psa_car_controller/psa/RemoteClient.py

@@ -60,7 +60,7 @@ class RemoteClient:
         else:
             logger.warning(mqtt.error_string(result_code))
 
-    def __on_mqtt_message(self, client, userdata, msg):  # pylint: disable=unused-argument
+    def _on_mqtt_message(self, client, userdata, msg):  # pylint: disable=unused-argument
         try:
             logger.info("mqtt msg received: %s %s", msg.topic, msg.payload)
             data = json.loads(msg.payload)
@@ -81,13 +81,15 @@ class RemoteClient:
                     logger.error('%s : %s', data["return_code"], data.get("reason", "?"))
             elif msg.topic.startswith(MQTT_EVENT_TOPIC):
                 charge_info = data["charging_state"]
-                self.precond_programs[data["vin"]] = data["precond_state"]["programs"]
+                programs = data["precond_state"].get("programs", None)
+                if programs:
+                    self.precond_programs[data["vin"]] = data["precond_state"]["programs"]
             self._fix_not_updated_api(charge_info, data["vin"])
         except KeyError:
             logger.exception("on_mqtt_message:")
 
     def _fix_not_updated_api(self, charge_info, vin):
-        if charge_info is not None and charge_info['remaining_time'] != 0:
+        if charge_info is not None and charge_info.get('remaining_time', 0) != 0:
             try:
                 car = self.vehicles_list.get_car_by_vin(vin=vin)
                 if car and car.status.get_energy('Electric').charging.status != INPROGRESS:
@@ -106,7 +108,7 @@ class RemoteClient:
             if self._refresh_remote_token():
                 self.mqtt_client.tls_set_context()
                 self.mqtt_client.on_connect = self.__on_mqtt_connect
-                self.mqtt_client.on_message = self.__on_mqtt_message
+                self.mqtt_client.on_message = self._on_mqtt_message
                 self.mqtt_client.on_disconnect = self._on_mqtt_disconnect
                 self.mqtt_client.connect(MQTT_SERVER, 8885, 60)
                 self.mqtt_client.loop_start()

tests/test_psa.py

@@ -1,24 +1,42 @@
-import unittest
 from unittest.mock import MagicMock, patch
 
-from psa_car_controller.psa.RemoteClient import RemoteClient
 from psa_car_controller.psa.connected_car_api import Vehicles, ApiClient
 from psa_car_controller.psa.constants import DISCONNECTED
 from psa_car_controller.psacc.model.car import Car
 from tests.data.car_status import ELECTRIC_CAR_STATUS
 
+import unittest
+
+from paho.mqtt.client import MQTTMessage
+
+from psa_car_controller.psa.RemoteClient import MQTT_EVENT_TOPIC
+from tests.utils import get_rc
+
+message_without_precond = b'{"date":"2022-03-30T12:00:52Z","etat_res_elec":0,"precond_state":{},"charging_state":{"program":{' \
+                          b'"hour":22,"minute":30},"available":1,"remaining_time":0,"rate":0,"cable_detected":1,"soc_batt":76,' \
+                          b'"autonomy_zev":178,"type":0,"hmi_state":0,"mode":2},"stolen_state":0,"vin":"vin",' \
+                          b'"reason":0,"signal_quality":3,"sev_stop_date":"2022-03-30T11:10:25Z","fds":[],"sev_state":0,' \
+                          b'"obj_counter":1,"privacy_customer":0,"privacy_applicable":0,"privacy_applicable_max":2,' \
+                          b'"superlock_state":0} '
+message_without_charge_info = b'{"date":"2022-03-30T13:18:56Z","etat_res_elec":5,"precond_state":{"available":1,' \
+    b'"programs":{"program1":{"hour":34,"minute":7,"on":0,"day":[0,0,0,0,0,0,0]},' \
+    b'"program2":{"hour":34,"minute":7,"on":0,"day":[0,0,0,0,0,0,0]},"program3":{' \
+    b'"hour":34,"minute":7,"on":0,"day":[0,0,0,0,0,0,0]},"program4":{"hour":34,"minute":7,' \
+    b'"on":0,"day":[0,0,0,0,0,0,0]}},"asap":0,"status":0,"aff":1},"charging_state":{' \
+    b'"program":{"hour":22,"minute":30},"available":1,"rate":0,"cable_detected":1,' \
+    b'"soc_batt":61,"type":0,"aff":1,"hmi_state":0,"mode":2},"stolen_state":0,' \
+    b'"vin":"VIN","reason":4,"signal_quality":5,' \
+    b'"sev_stop_date":"2022-03-30T12:41:10Z","fds":["NDR01","NBM01","NCG01","NAO01",' \
+    b'"NAS01"],"sev_state":1,"obj_counter":2,"privacy_customer":0,"privacy_applicable":0,' \
+    b'"privacy_applicable_max":2,"superlock_state":0} '
+
 
 class TestUnit(unittest.TestCase):
 
-    def get_rc(self) -> RemoteClient:
-        account_info = MagicMock()
-        account_info.realm = ""
-        return RemoteClient(account_info, Vehicles, None, None)
-
     @patch('time.sleep', return_value=None)
     def test_fix_not_updated_api(self, patched_time_sleep):
         # GIVEN
-        remote_client = self.get_rc()
+        remote_client = get_rc()
         vin = "myvin"
         car = Car("a", "b", "c")
         car.status = ApiClient()._ApiClient__deserialize(ELECTRIC_CAR_STATUS, "Status")
@@ -29,3 +47,16 @@ class TestUnit(unittest.TestCase):
         remote_client._fix_not_updated_api({'remaining_time': 1}, vin)
         # THEN
         remote_client.wakeup.assert_called_once_with(vin)
+
+    def test_message_without_precond(self):
+        remote_client = get_rc()
+        msg = MQTTMessage(topic=MQTT_EVENT_TOPIC.encode("utf-8"))
+        msg.payload = message_without_precond
+        remote_client._on_mqtt_message(None, None, msg)
+        self.assertEqual(remote_client.precond_programs, {})
+
+    def test_message_without_charge_info(self):
+        remote_client = get_rc()
+        msg = MQTTMessage(topic=MQTT_EVENT_TOPIC.encode("utf-8"))
+        msg.payload = message_without_charge_info
+        remote_client._on_mqtt_message(None, None, msg)

tests/utils.py

@@ -2,10 +2,12 @@
 
 import os
 from datetime import timedelta, datetime
+from unittest.mock import MagicMock
 
 import pytz
 
-
+from psa_car_controller.psa.RemoteClient import RemoteClient
+from psa_car_controller.psa.connected_car_api import Vehicles
 from psa_car_controller.psacc.application.charging import Charging
 from psa_car_controller.psacc.model.car import Cars, Car
 from psa_car_controller.psacc.repository.db import Database
@@ -54,3 +56,9 @@ def record_charging():
 
 def get_date(offset):
     return date3 + timedelta(minutes=60 * offset)
+
+
+def get_rc() -> RemoteClient:
+    account_info = MagicMock()
+    account_info.realm = ""
+    return RemoteClient(account_info, Vehicles, None, None)