mirror of
https://github.com/DJ2LS/FreeDATA
synced 2024-05-14 08:04:33 +00:00
adjusted db model, made databse handlers more modular
This commit is contained in:
parent
e445d23968
commit
b5bb7acab6
2 changed files with 4 additions and 3 deletions
|
@ -3,6 +3,7 @@ import time
|
||||||
import threading
|
import threading
|
||||||
import command_message_send
|
import command_message_send
|
||||||
from message_system_db_manager import DatabaseManager
|
from message_system_db_manager import DatabaseManager
|
||||||
|
from message_system_db_messages import DatabaseManagerMessages
|
||||||
from message_system_db_beacon import DatabaseManagerBeacon
|
from message_system_db_beacon import DatabaseManagerBeacon
|
||||||
import explorer
|
import explorer
|
||||||
import command_beacon
|
import command_beacon
|
||||||
|
@ -78,8 +79,8 @@ class ScheduleManager:
|
||||||
|
|
||||||
def check_for_queued_messages(self):
|
def check_for_queued_messages(self):
|
||||||
if not self.state_manager.getARQ():
|
if not self.state_manager.getARQ():
|
||||||
if DatabaseManager(self.event_manager).get_first_queued_message():
|
if DatabaseManagerMessages(self.event_manager).get_first_queued_message():
|
||||||
params = DatabaseManager(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 = command_message_send.SendMessageCommand(self.config_manager.read(), self.state_manager, self.event_manager, params)
|
||||||
command.transmit(self.modem)
|
command.transmit(self.modem)
|
||||||
|
|
||||||
|
|
|
@ -243,7 +243,7 @@ def get_post_radio():
|
||||||
@app.route('/freedata/messages', methods=['POST', 'GET'])
|
@app.route('/freedata/messages', methods=['POST', 'GET'])
|
||||||
def get_post_freedata_message():
|
def get_post_freedata_message():
|
||||||
if request.method in ['GET']:
|
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)
|
return api_response(result)
|
||||||
if enqueue_tx_command(command_message_send.SendMessageCommand, request.json):
|
if enqueue_tx_command(command_message_send.SendMessageCommand, request.json):
|
||||||
return api_response(request.json)
|
return api_response(request.json)
|
||||||
|
|
Loading…
Reference in a new issue