From 0c322bacf8791a9d3964f42a169b01bc321c1b6d Mon Sep 17 00:00:00 2001 From: DJ2LS Date: Sat, 24 Feb 2024 22:10:41 +0100 Subject: [PATCH] WIP gui stats --- modem/message_p2p.py | 9 +++++++-- modem/message_system_db_messages.py | 1 - 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/modem/message_p2p.py b/modem/message_p2p.py index 44fcde96..d0ee6c23 100644 --- a/modem/message_p2p.py +++ b/modem/message_p2p.py @@ -17,13 +17,18 @@ def message_transmitted(event_manager, state_manager, data, statistics): decompressed_json_string = data.decode('utf-8') payload_message_obj = MessageP2P.from_payload(decompressed_json_string) payload_message = MessageP2P.to_dict(payload_message_obj) - DatabaseManagerMessages(event_manager).update_message(payload_message["id"], update_data={'status': 'transmitted', 'statistics': statistics}) + # Todo we need to optimize this - WIP + DatabaseManagerMessages(event_manager).update_message(payload_message["id"], update_data={'status': 'transmitted'}) + DatabaseManagerMessages(event_manager).update_message(payload_message["id"], update_data={'statistics': statistics}) + def message_failed(event_manager, state_manager, data, statistics): decompressed_json_string = data.decode('utf-8') payload_message_obj = MessageP2P.from_payload(decompressed_json_string) payload_message = MessageP2P.to_dict(payload_message_obj) - DatabaseManagerMessages(event_manager).update_message(payload_message["id"], statistics, update_data={'status': 'failed', 'statistics': statistics}) + # Todo we need to optimize this - WIP + DatabaseManagerMessages(event_manager).update_message(payload_message["id"], update_data={'status': 'failed'}) + DatabaseManagerMessages(event_manager).update_message(payload_message["id"], update_data={'statistics': statistics}) class MessageP2P: def __init__(self, id: str, origin: str, destination: str, body: str, attachments: list) -> None: diff --git a/modem/message_system_db_messages.py b/modem/message_system_db_messages.py index 6f6739e1..4a1eb312 100644 --- a/modem/message_system_db_messages.py +++ b/modem/message_system_db_messages.py @@ -131,7 +131,6 @@ class DatabaseManagerMessages(DatabaseManager): message.body = update_data['body'] if 'status' in update_data: message.status = self.get_or_create_status(session, update_data['status']) - if 'statistics' in update_data: message.statistics = update_data['statistics']