From f56b631eb6d138cc385f85013abdd33589269497 Mon Sep 17 00:00:00 2001 From: Pawel Olejniczak Date: Wed, 20 Jul 2022 15:47:49 +0200 Subject: [PATCH] [CP-563] Return correct threadID after adding new message After adding new message via Messages EP API, threadID field was always 0, which was incorrect. --- module-db/Interface/SMSRecord.cpp | 3 ++- test/pytest/service-desktop/test_messages.py | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/module-db/Interface/SMSRecord.cpp b/module-db/Interface/SMSRecord.cpp index 5b62aab446285bfced4d4b48791ab65f673da03c..4ee83bb48e661958cf854cfa3e6a1be48d3bc0ec 100644 --- a/module-db/Interface/SMSRecord.cpp +++ b/module-db/Interface/SMSRecord.cpp @@ -409,8 +409,9 @@ std::unique_ptr SMSRecordInterface::addQuery(const std::shared_ auto record = localQuery->record; const auto result = Add(record); if (result) { - record.ID = GetLastID(); + record = GetByID(GetLastID()); } + auto response = std::make_unique(record, result); response->setRequestQuery(query); response->setRecordID(record.ID); diff --git a/test/pytest/service-desktop/test_messages.py b/test/pytest/service-desktop/test_messages.py index 9c9f16af1e2de76aea9be78dcfe8ea9807e1a42a..4e87c382c9c9ae90f9d475582c3fbd99db28f3ca 100644 --- a/test/pytest/service-desktop/test_messages.py +++ b/test/pytest/service-desktop/test_messages.py @@ -89,6 +89,8 @@ def test_add_and_delete_message(harness): result, message_record = messages_tester.add_message(message_number, message_body) assert result, "Failed to add message!" assert message_record["messageBody"] == message_body, "Message body corrupted!" + assert message_record["messageID"] > 0, "Message ID not correct!" + assert message_record["threadID"] > 0, "Thread ID not correct!" result, received_messages_records_count = messages_tester.get_messages_count() assert result, "Failed to get messages count!"