Merge pull request #85 from DankersW/feature/removing_notify

Feature/removing notify

home_automation_framework/db/db_handler.py

@@ -30,8 +30,7 @@ def run(self) -> None:
             action = self.action_selector(event=item.event)
             action(event=item.event, msg=item)
 
-    def notify(self,  event: str, msg: ObserverMessage) -> None:
-        self.log.debug(f"Received event {event} on notify")
+    def notify(self, msg: ObserverMessage) -> None:
         self.observer_notify_queue.put(msg)
 
     def action_selector(self, event: str) -> Callable:

home_automation_framework/framework/framework.py

@@ -27,9 +27,9 @@ def register(self, events, obs_object, callback=None) -> None:
     def unregister(self, event, obs_object) -> None:
         del self.get_subscribers(event)[obs_object]
 
-    def dispatch(self, event, message) -> None:
-        for _, callback in self.get_subscribers(event).items():
-            callback(event, message)
+    def dispatch(self, message) -> None:
+        for _, callback in self.get_subscribers(message.event).items():
+            callback(message)
 
 
 class IotSubject:
@@ -90,7 +90,7 @@ def run(self) -> None:
             self.notify_observers(msg=msg)
 
     def notify_observers(self, msg: ObserverMessage) -> None:
-        self.subject.dispatch(event=msg.event, message=msg)
+        self.subject.dispatch(message=msg)
 
     def get_observer_events(self) -> ObserverMessage:
         return self.observer_queue.get()

home_automation_framework/host_health/health_monitor.py

@@ -37,7 +37,7 @@ def run(self) -> None:
             sleep_time = self.update_time_sec - ((time() - start_time) % self.update_time_sec)
             sleep(sleep_time)
 
-    def notify(self, event: str, msg: ObserverMessage) -> None:
+    def notify(self, msg: ObserverMessage) -> None:
         pass
 
     def _fetch_host_data(self) -> dict:
@@ -79,10 +79,3 @@ def poll_cpu_load(self) -> float:
         except ValueError as error:
             self.log.error(f'Parsing of the data went wrong: {error}')
         return 0
-
-
-if __name__ == '__main__':
-    test_queue = Queue(10)
-    t_event = Event()
-    hm = HealthMonitor(test_queue, thread_event=t_event)
-    hm.start()

home_automation_framework/iot_gateway/device_manager.py

@@ -30,8 +30,7 @@ def __init__(self, queue: Queue, thread_event: Event) -> None:
     def __del__(self) -> None:
         self.running = False
 
-    def notify(self, event: str, msg: ObserverMessage) -> None:
-        self.log.debug(f"Received event {event} on notify")
+    def notify(self, msg: ObserverMessage) -> None:
         self._observer_notify_queue.put(item=msg)
 
     def run(self) -> None:

home_automation_framework/iot_gateway/mqtt_gateway.py

@@ -39,8 +39,7 @@ def run(self):
             if queue_item.event == "digital_twin":
                 self._handle_digital_twin_event(msg=queue_item)
 
-    def notify(self, event: str, msg: ObserverMessage):
-        self.log.debug(f"Received event {event} on notify")
+    def notify(self, msg: ObserverMessage):
         self._observer_notify_queue.put(item=msg)
 
     def get_mqtt_config(self) -> dict:

tests/db/test_db_handler.py

@@ -61,7 +61,7 @@ def test_notify(self, mock_mongo):
         data = {'test': 123}
         event = 'test'
         msg = ObserverMessage(event=event, data=data)
-        db_handler.notify(event=event, msg=msg)
+        db_handler.notify(msg=msg)
         queue_item = db_handler.observer_notify_queue.get()
         self.assertEqual(queue_item.event, event)
         self.assertEqual(queue_item.data, data)

tests/iot_gateway/test_device_manager.py

@@ -27,11 +27,11 @@ def test_store_remote_digital_twin(self):
         device_manager.start()
         moch_dt = ["abc"]
         notify_msg = ObserverMessage(event="digital_twin", subject="retrieved_digital_twin", data=moch_dt)
-        device_manager.notify(msg=notify_msg, event="")
+        device_manager.notify(msg=notify_msg)
         sleep(0.5)
         self.assertEqual(device_manager.remote_digital_twin, moch_dt)
         device_manager.running = False
-        device_manager.notify(msg=ObserverMessage(data="", event=""), event="")
+        device_manager.notify(msg=ObserverMessage(data="", event=""))
 
     def test_wait_for_status_messages_not_running(self):
         wait_period = 0.5

todo.md

@@ -3,7 +3,6 @@
 ## Needed
 - [ ] Re-think the DB, useing device_objectId in other documents instead of a raw name
 - [ ] Bumb test coverage
-- [ ] In the notify, remove the event function parameter
 - [ ] Rewrite mongo and db_handler in a proper way
 
 ## Features