From b5bb7acab66f46060bafda2d741e4b40c41bf810 Mon Sep 17 00:00:00 2001 From: DJ2LS Date: Tue, 6 Feb 2024 09:25:03 +0100 Subject: [PATCH] adjusted db model, made databse handlers more modular --- modem/schedule_manager.py | 5 +++-- modem/server.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modem/schedule_manager.py b/modem/schedule_manager.py index 1ad601b6..fa33b948 100644 --- a/modem/schedule_manager.py +++ b/modem/schedule_manager.py @@ -3,6 +3,7 @@ import time import threading import command_message_send from message_system_db_manager import DatabaseManager +from message_system_db_messages import DatabaseManagerMessages from message_system_db_beacon import DatabaseManagerBeacon import explorer import command_beacon @@ -78,8 +79,8 @@ class ScheduleManager: def check_for_queued_messages(self): if not self.state_manager.getARQ(): - if DatabaseManager(self.event_manager).get_first_queued_message(): - params = DatabaseManager(self.event_manager).get_first_queued_message() + if DatabaseManagerMessages(self.event_manager).get_first_queued_message(): + params = DatabaseManagerMessages(self.event_manager).get_first_queued_message() command = command_message_send.SendMessageCommand(self.config_manager.read(), self.state_manager, self.event_manager, params) command.transmit(self.modem) diff --git a/modem/server.py b/modem/server.py index 42266159..adb39239 100644 --- a/modem/server.py +++ b/modem/server.py @@ -243,7 +243,7 @@ def get_post_radio(): @app.route('/freedata/messages', methods=['POST', 'GET']) def get_post_freedata_message(): if request.method in ['GET']: - result = DatabaseManager(app.event_manager).get_all_messages_json() + result = DatabaseManagerMessages(app.event_manager).get_all_messages_json() return api_response(result) if enqueue_tx_command(command_message_send.SendMessageCommand, request.json): return api_response(request.json)