From 14a01945b619c7d3410256b2234d01359fb655c1 Mon Sep 17 00:00:00 2001 From: "Wiktor S. Ovalle Correa" Date: Thu, 8 Apr 2021 14:29:10 +0200 Subject: [PATCH] [EGD-6485] ServiceDB cleanup Remove old unused ServiceDB API and deprecate its remains still being in use. --- .../ApplicationCallLog.cpp | 1 - .../windows/CallLogDetailsWindow.cpp | 1 - .../windows/SMSTemplatesWindow.cpp | 9 +- .../windows/SMSTemplatesWindow.hpp | 3 +- .../windows/SearchResults.cpp | 4 +- .../application-notes/ApplicationNotes.cpp | 1 - .../windows/NoteMainWindow.cpp | 3 +- .../ApplicationOnBoarding.cpp | 1 - module-services/service-db/CMakeLists.txt | 7 +- module-services/service-db/DBServiceAPI.cpp | 95 ------ module-services/service-db/ServiceDB.cpp | 315 ------------------ .../service-db/messages/DBCalllogMessage.cpp | 6 +- .../service-db/messages/DBContactMessage.cpp | 14 +- .../messages/DBCountryCodeMessage.cpp | 16 - .../service-db/messages/DBNotesMessage.cpp | 23 -- .../service-db/messages/DBSMSMessage.cpp | 22 -- .../messages/DBSMSTemplateMessage.cpp | 25 -- .../service-db/messages/DBServiceMessage.cpp | 3 +- .../service-db/messages/DBThreadMessage.cpp | 30 -- .../service-db/messages/QueryMessage.cpp | 3 +- .../service-db/DBCalllogMessage.hpp | 10 +- .../service-db/DBContactMessage.hpp | 24 +- .../service-db/DBCountryCodeMessage.hpp | 32 -- .../service-db/service-db/DBNotesMessage.hpp | 36 -- .../service-db/service-db/DBSMSMessage.hpp | 36 -- .../service-db/DBSMSTemplateMessage.hpp | 41 --- .../service-db/service-db/DBServiceAPI.hpp | 44 +-- .../service-db/service-db/DBThreadMessage.hpp | 51 --- .../service-desktop/tests/test-contacts.cpp | 26 -- source/MessageType.hpp | 65 +--- 30 files changed, 39 insertions(+), 908 deletions(-) delete mode 100644 module-services/service-db/messages/DBCountryCodeMessage.cpp delete mode 100644 module-services/service-db/messages/DBNotesMessage.cpp delete mode 100644 module-services/service-db/messages/DBSMSMessage.cpp delete mode 100644 module-services/service-db/messages/DBSMSTemplateMessage.cpp delete mode 100644 module-services/service-db/messages/DBThreadMessage.cpp delete mode 100644 module-services/service-db/service-db/DBCountryCodeMessage.hpp delete mode 100644 module-services/service-db/service-db/DBNotesMessage.hpp delete mode 100644 module-services/service-db/service-db/DBSMSMessage.hpp delete mode 100644 module-services/service-db/service-db/DBSMSTemplateMessage.hpp delete mode 100644 module-services/service-db/service-db/DBThreadMessage.hpp diff --git a/module-apps/application-calllog/ApplicationCallLog.cpp b/module-apps/application-calllog/ApplicationCallLog.cpp index 72fdec230b66e106a6fe235e9cc5829788497059..47566e62740ed99c43714c5d4a6d772fd9a316ac 100644 --- a/module-apps/application-calllog/ApplicationCallLog.cpp +++ b/module-apps/application-calllog/ApplicationCallLog.cpp @@ -10,7 +10,6 @@ #include "windows/CallLogOptionsWindow.hpp" #include -#include #include #include #include diff --git a/module-apps/application-calllog/windows/CallLogDetailsWindow.cpp b/module-apps/application-calllog/windows/CallLogDetailsWindow.cpp index ef56fe93b04f6ff543e1f6a446801c2b2ed79841..08d411e02374ae808a79a7591acc8aa7fa604a09 100644 --- a/module-apps/application-calllog/windows/CallLogDetailsWindow.cpp +++ b/module-apps/application-calllog/windows/CallLogDetailsWindow.cpp @@ -13,7 +13,6 @@ #include "../ApplicationCallLog.hpp" -#include #include #include "../data/CallLogInternals.hpp" // TODO: alek: add easier paths diff --git a/module-apps/application-messages/windows/SMSTemplatesWindow.cpp b/module-apps/application-messages/windows/SMSTemplatesWindow.cpp index 7633ea2c30b7da80b6fa0ae4973a84873081299f..e4cdc88b720ce2579fe5d033f8c62d031b533d2b 100644 --- a/module-apps/application-messages/windows/SMSTemplatesWindow.cpp +++ b/module-apps/application-messages/windows/SMSTemplatesWindow.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved. +// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved. // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md #include "SMSTemplatesWindow.hpp" @@ -8,7 +8,6 @@ #include "application-messages/data/MessagesStyle.hpp" #include -#include #include #include #include @@ -103,10 +102,4 @@ namespace gui } } - bool SMSTemplatesWindow::onDatabaseMessage(sys::Message *msgl) - { - auto msg = dynamic_cast(msgl); - return msg && smsTemplateModel->updateRecords(*msg->records); - } - } /* namespace gui */ diff --git a/module-apps/application-messages/windows/SMSTemplatesWindow.hpp b/module-apps/application-messages/windows/SMSTemplatesWindow.hpp index 93aeca7f7f86fefb507ab69858b0d34f3b64a9bb..1c76473147a1461699ababd228366e8b37e7ea94 100644 --- a/module-apps/application-messages/windows/SMSTemplatesWindow.hpp +++ b/module-apps/application-messages/windows/SMSTemplatesWindow.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved. +// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved. // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md #pragma once @@ -33,7 +33,6 @@ namespace gui void rebuild() override; void buildInterface() override; void destroyInterface() override; - bool onDatabaseMessage(sys::Message *msg) override; }; } /* namespace gui */ diff --git a/module-apps/application-messages/windows/SearchResults.cpp b/module-apps/application-messages/windows/SearchResults.cpp index 48c7e3b3e587222ce874f446a8ee9dcf0b705c15..077c0512c536a8c4796cce424c6a3d1b96f447af 100644 --- a/module-apps/application-messages/windows/SearchResults.cpp +++ b/module-apps/application-messages/windows/SearchResults.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved. +// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved. // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md #include "SearchResults.hpp" @@ -8,9 +8,7 @@ #include "module-apps/application-messages/data/MessagesStyle.hpp" #include "queries/messages/threads/QueryThreadsSearchForList.hpp" -#include #include -#include #include diff --git a/module-apps/application-notes/ApplicationNotes.cpp b/module-apps/application-notes/ApplicationNotes.cpp index 956453ada7e863caab98ade17af55dcdff343a18..6d455718d846d3807d076881b56616d0bc67fb18 100644 --- a/module-apps/application-notes/ApplicationNotes.cpp +++ b/module-apps/application-notes/ApplicationNotes.cpp @@ -10,7 +10,6 @@ #include "windows/SearchEngineWindow.hpp" #include "windows/SearchResultsWindow.hpp" -#include #include #include diff --git a/module-apps/application-notes/windows/NoteMainWindow.cpp b/module-apps/application-notes/windows/NoteMainWindow.cpp index 0f3c3ae5ada5e6e63f2e82009918109f022d7dfa..a7aec7e959ab609f0374734eda2f9dbef293fa29 100644 --- a/module-apps/application-notes/windows/NoteMainWindow.cpp +++ b/module-apps/application-notes/windows/NoteMainWindow.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved. +// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved. // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md #include "NoteMainWindow.hpp" @@ -7,7 +7,6 @@ #include #include -#include #include diff --git a/module-apps/application-onboarding/ApplicationOnBoarding.cpp b/module-apps/application-onboarding/ApplicationOnBoarding.cpp index c0aac4f15119d2c49062cc44541311ed697d9cd0..643969e30c50f9daa1bea49cfecff07f911376f8 100644 --- a/module-apps/application-onboarding/ApplicationOnBoarding.cpp +++ b/module-apps/application-onboarding/ApplicationOnBoarding.cpp @@ -16,7 +16,6 @@ #include "windows/OnBoardingDateAndTimeWindow.hpp" #include "windows/OnBoardingChangeDateAndTimeWindow.hpp" -#include #include #include #include diff --git a/module-services/service-db/CMakeLists.txt b/module-services/service-db/CMakeLists.txt index 97cbe581db83778acde738fb08e7b92719211c69..b2732e5d6379e1565a368e3b3309f6609b47671b 100644 --- a/module-services/service-db/CMakeLists.txt +++ b/module-services/service-db/CMakeLists.txt @@ -7,15 +7,10 @@ set(SOURCES DBServiceAPI_GetByQuery.cpp DatabaseAgent.cpp ServiceDB.cpp - messages/DBCalllogMessage.cpp + messages/DBCalllogMessage.cpp messages/DBContactMessage.cpp - messages/DBCountryCodeMessage.cpp - messages/DBNotesMessage.cpp messages/DBNotificationMessage.cpp messages/DBServiceMessage.cpp - messages/DBSMSMessage.cpp - messages/DBSMSTemplateMessage.cpp - messages/DBThreadMessage.cpp messages/QueryMessage.cpp agents/settings/SettingsAgent.cpp agents/settings/Settings.cpp diff --git a/module-services/service-db/DBServiceAPI.cpp b/module-services/service-db/DBServiceAPI.cpp index 233ce8b158db510f7e5825c67ab0f8e59c82b4d1..b527fa607d26f7146ad44d23a1974aae87e32585 100644 --- a/module-services/service-db/DBServiceAPI.cpp +++ b/module-services/service-db/DBServiceAPI.cpp @@ -2,11 +2,8 @@ // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md #include "service-db/DBServiceAPI.hpp" -#include "service-db/DBThreadMessage.hpp" #include "service-db/DBContactMessage.hpp" -#include "service-db/DBNotesMessage.hpp" #include "service-db/DBCalllogMessage.hpp" -#include "service-db/DBCountryCodeMessage.hpp" #include "service-db/DBServiceMessage.hpp" #include "service-db/QueryMessage.hpp" #include "service-db/DBServiceName.hpp" @@ -50,22 +47,6 @@ auto DBServiceAPI::ThreadGetByNumber(sys::Service *serv, return nullptr; } -auto DBServiceAPI::ThreadGetCount(sys::Service *serv, EntryState state) -> uint32_t -{ - auto msg = std::make_shared(state); - - auto ret = serv->bus.sendUnicast(msg, service::name::db, DefaultTimeoutInMs); - auto threadResponse = dynamic_cast(ret.second.get()); - if (threadResponse == nullptr) { - LOG_ERROR("DB response error, return code: %s", c_str(ret.first)); - return 0; - } - if ((ret.first == sys::ReturnCodes::Success) && (threadResponse->retCode == 1)) { - return threadResponse->count; - } - return 0; -} - auto DBServiceAPI::ContactGetByID(sys::Service *serv, uint32_t contactID) -> std::unique_ptr> { ContactRecord rec; @@ -116,18 +97,6 @@ auto DBServiceAPI::ContactGetBySpeeddial(sys::Service *serv, UTF8 speeddial) return ContactGetByIDCommon(serv, msg); } -auto DBServiceAPI::ContactGetByPhoneNumber(sys::Service *serv, UTF8 phoneNumber) - -> std::unique_ptr> -{ - ContactRecord rec; - auto number = ContactRecord::Number(utils::PhoneNumber(phoneNumber).getView(), ContactNumberType ::PAGER); - rec.numbers.push_back(number); - - std::shared_ptr msg = std::make_shared(MessageType::DBContactGetByNumber, rec); - - return ContactGetByIDCommon(serv, msg); -} - auto DBServiceAPI::MatchContactByPhoneNumber(sys::Service *serv, const utils::PhoneNumber::View &numberView) -> std::unique_ptr { @@ -228,27 +197,6 @@ auto DBServiceAPI::ContactUpdate(sys::Service *serv, const ContactRecord &rec) - return false; } -auto DBServiceAPI::ContactSearch(sys::Service *serv, UTF8 primaryName, UTF8 alternativeName, UTF8 number) - -> std::unique_ptr> -{ - std::shared_ptr msg = - std::make_shared(MessageType::DBContactSearch, - (primaryName.length() > 0) ? primaryName.c_str() : "", - (alternativeName.length() > 0) ? alternativeName.c_str() : "", - (number.length() > 0) ? number.c_str() : ""); - - auto ret = serv->bus.sendUnicast(std::move(msg), service::name::db, DefaultTimeoutInMs); - auto contactResponse = dynamic_cast(ret.second.get()); - if (contactResponse == nullptr) { - LOG_ERROR("DB response error, return code: %s", c_str(ret.first)); - return nullptr; - } - if ((ret.first == sys::ReturnCodes::Success) && (contactResponse->retCode != 0)) { - return std::move(contactResponse->records); - } - return std::make_unique>(); -} - auto DBServiceAPI::CalllogAdd(sys::Service *serv, const CalllogRecord &rec) -> CalllogRecord { std::shared_ptr msg = std::make_shared(MessageType::DBCalllogAdd, rec); @@ -306,49 +254,6 @@ auto DBServiceAPI::CalllogUpdate(sys::Service *serv, const CalllogRecord &rec) - return false; } -auto DBServiceAPI::CalllogGetCount(sys::Service *serv, EntryState state) -> uint32_t -{ - std::shared_ptr msg = std::make_shared(state); - - auto ret = serv->bus.sendUnicast(msg, service::name::db, DefaultTimeoutInMs); - auto calllogResponse = dynamic_cast(ret.second.get()); - if (calllogResponse == nullptr) { - LOG_ERROR("DB response error, return code: %s", c_str(ret.first)); - return 0; - } - if ((ret.first == sys::ReturnCodes::Success) && (calllogResponse->retCode != 0)) { - return calllogResponse->count; - } - return 0; -} - -auto DBServiceAPI::CalllogGetLimitOffset(sys::Service *serv, uint32_t offset, uint32_t limit) -> bool -{ - std::shared_ptr msg = std::make_shared(MessageType::DBCalllogGetLimitOffset); - msg->offset = offset; - msg->limit = limit; - - serv->bus.sendUnicast(msg, service::name::db); - return true; -} - -auto DBServiceAPI::GetCountryCodeByMCC(sys::Service *serv, uint32_t mcc) -> uint32_t -{ - std::shared_ptr msg = - std::make_shared(MessageType::DBCountryCode, mcc, 0); - - auto ret = serv->bus.sendUnicast(msg, service::name::db, DefaultTimeoutInMs); - auto response = dynamic_cast(ret.second.get()); - if (response == nullptr) { - LOG_ERROR("DB response error, return code: %s", c_str(ret.first)); - return 0; - } - if (ret.first == sys::ReturnCodes::Success) { - return (response->row.country_code); - } - return 0; -} - auto DBServiceAPI::DBBackup(sys::Service *serv, std::string backupPath) -> bool { LOG_INFO("DBBackup %s", backupPath.c_str()); diff --git a/module-services/service-db/ServiceDB.cpp b/module-services/service-db/ServiceDB.cpp index d781b844b08f707ff7256f09aaa34e684137bdf8..824a10ca13955dd5d9e05c36d2cddd8381949574 100644 --- a/module-services/service-db/ServiceDB.cpp +++ b/module-services/service-db/ServiceDB.cpp @@ -5,13 +5,8 @@ #include "service-db/DBCalllogMessage.hpp" #include "service-db/DBContactMessage.hpp" -#include "service-db/DBCountryCodeMessage.hpp" -#include "service-db/DBNotesMessage.hpp" #include "service-db/DBNotificationMessage.hpp" -#include "service-db/DBSMSMessage.hpp" -#include "service-db/DBSMSTemplateMessage.hpp" #include "service-db/DBServiceMessage.hpp" -#include "service-db/DBThreadMessage.hpp" #include "service-db/QueryMessage.hpp" #include "service-db/DatabaseAgent.hpp" #include "agents/quotes/QuotesAgent.cpp" @@ -107,191 +102,6 @@ sys::MessagePointer ServiceDB::DataReceivedHandler(sys::DataMessage *msgl, sys:: std::shared_ptr responseMsg; auto type = static_cast(msgl->messageType); switch (type) { - - /* - * SMS records - */ - - case MessageType::DBSMSAdd: { - auto time = utils::time::Scoped("DBSMSAdd"); - DBSMSMessage *msg = reinterpret_cast(msgl); - auto ret = smsRecordInterface->Add(msg->record); - if (ret == true) { - // update db ID in response message - auto record = std::make_unique>(); - msg->record.ID = smsRecordInterface->GetLastID(); - record->push_back(msg->record); - LOG_INFO("SMS added, record ID: %" PRIu32, msg->record.ID); - responseMsg = std::make_shared(std::move(record), ret); - sendUpdateNotification(db::Interface::Name::SMS, db::Query::Type::Create); - } - } break; - - case MessageType::DBSMSRemove: { - auto time = utils::time::Scoped("DBSMSRemove"); - DBSMSMessage *msg = reinterpret_cast(msgl); - auto ret = smsRecordInterface->RemoveByID(msg->record.ID); - responseMsg = std::make_shared(nullptr, ret); - sendUpdateNotification(db::Interface::Name::SMS, db::Query::Type::Delete); - auto thread = threadRecordInterface->GetByID((msg->record.threadID)); - if (!thread.isValid()) { - LOG_DEBUG("also thread has been deleted"); - sendUpdateNotification(db::Interface::Name::SMSThread, db::Query::Type::Delete); - } - } break; - - case MessageType::DBSMSUpdate: { - auto time = utils::time::Scoped("DBSMSUpdate"); - DBSMSMessage *msg = reinterpret_cast(msgl); - auto ret = smsRecordInterface->Update(msg->record); - responseMsg = std::make_shared(nullptr, ret); - sendUpdateNotification(db::Interface::Name::SMS, db::Query::Type::Update); - } break; - - case MessageType::DBSMSGetSMSLimitOffset: { - auto time = utils::time::Scoped("DBSMSGetSMSLimitOffset"); - DBSMSMessage *msg = reinterpret_cast(msgl); - auto ret = smsRecordInterface->GetLimitOffset(msg->offset, msg->limit); - responseMsg = std::make_shared(std::move(ret), true); - } break; - - case MessageType::DBSMSGetSMSLimitOffsetByThreadID: { - auto time = utils::time::Scoped("DBSMSGetSMSLimitOffsetByThreadID"); - DBSMSMessage *msg = reinterpret_cast(msgl); - auto ret = smsRecordInterface->GetLimitOffsetByField( - msg->offset, msg->limit, SMSRecordField::ThreadID, std::to_string(msg->id).c_str()); - responseMsg = std::make_shared(std::move(ret), true); - } break; - - case MessageType::DBSMSGetLastRecord: { - auto time = utils::time::Scoped("DBSMSGetLastRecord"); - uint32_t id = smsRecordInterface->GetLastID(); - auto rec = smsRecordInterface->GetByID(id); - auto records = std::make_unique>(); - records->push_back(rec); - responseMsg = std::make_shared(std::move(records), true); - break; - } - case MessageType::DBSMSGetCount: { - auto time = utils::time::Scoped("DBSMSGetCount"); - auto ret = smsRecordInterface->GetCount(); - responseMsg = std::make_shared(nullptr, true, ret); - break; - } - /** - * Thread records - */ - - case MessageType::DBThreadGet: { - auto time = utils::time::Scoped("DBThreadGet"); - DBThreadMessage *msg = reinterpret_cast(msgl); - auto ret = threadRecordInterface->GetByID(msg->id); - auto records = std::make_unique>(); - records->push_back(ret); - responseMsg = std::make_shared(std::move(records), ret.isValid()); - } break; - - case MessageType::DBThreadGetForContact: { - auto time = utils::time::Scoped("DBThreadGetForContact"); - auto msg = dynamic_cast(msgl); - if (!msg) { - LOG_ERROR("ERROR wrong message sent!"); - } - auto ret = threadRecordInterface->GetByContact(msg->contactID); - auto records = std::make_unique>(); - records->push_back(ret); - responseMsg = std::make_shared(std::move(records), ret.isValid()); - }; break; - - case MessageType::DBThreadRemove: { - auto time = utils::time::Scoped("DBThreadRemove"); - DBThreadMessage *msg = reinterpret_cast(msgl); - auto ret = threadRecordInterface->RemoveByID(msg->id); - responseMsg = std::make_shared(nullptr, ret); - sendUpdateNotification(db::Interface::Name::SMSThread, db::Query::Type::Delete); - } break; - - case MessageType::DBThreadGetCount: { - auto *msg = static_cast(msgl); - auto time = utils::time::Scoped("DBThreadGetCountMessage"); - auto ret = threadRecordInterface->GetCount(msg->state); - responseMsg = std::make_shared(nullptr, true, 0, 0, ret); - } break; - - case MessageType::DBThreadUpdate: { - auto time = utils::time::Scoped("DBThreadUpdate"); - auto msg = static_cast(msgl); - auto ret = threadRecordInterface->Update(msg->record); - responseMsg = std::make_shared(nullptr, true, 0, 0, ret); - sendUpdateNotification(db::Interface::Name::SMSThread, db::Query::Type::Update); - } break; - - /** - * SMS templates records - */ - - case MessageType::DBSMSTemplateAdd: { - auto time = utils::time::Scoped("DBSMSTemplateAdd"); - auto msg = static_cast(msgl); - auto ret = smsTemplateRecordInterface->Add(msg->record); - responseMsg = std::make_shared(nullptr, ret); - } break; - - case MessageType::DBSMSTemplateUpdate: { - auto time = utils::time::Scoped("DBSMSTemplateUpdate"); - auto msg = static_cast(msgl); - auto ret = smsTemplateRecordInterface->Update(msg->record); - responseMsg = std::make_shared(nullptr, ret); - }; break; - - case MessageType::DBSMSTemplateRemove: { - auto time = utils::time::Scoped("DBSMSTemplateRemove"); - auto msg = static_cast(msgl); - auto ret = smsTemplateRecordInterface->RemoveByID(msg->id); - responseMsg = std::make_shared(nullptr, ret); - } break; - - case MessageType::DBSMSTemplateGetLimitOffset: { - auto time = utils::time::Scoped("DBSMSTemplateGetLimitOffset"); - auto msg = static_cast(msgl); - auto ret = smsTemplateRecordInterface->GetLimitOffset(msg->offset, msg->limit); - responseMsg = std::make_shared( - std::move(ret), true, msg->limit, msg->offset, ret->size(), type); - } break; - - case MessageType::DBSMSTemplateGetCount: { - auto time = utils::time::Scoped("DBSMSTemplateGetCount"); - auto ret = smsTemplateRecordInterface->GetCount(); - responseMsg = std::make_shared(nullptr, true, 0, 0, ret); - } break; - - /** - * Contact records - */ - - case MessageType::DBContactAdd: { - auto time = utils::time::Scoped("DBContactAdd"); - DBContactMessage *msg = reinterpret_cast(msgl); - auto ret = contactRecordInterface->Add(msg->record); - responseMsg = std::make_shared(nullptr, ret); - sendUpdateNotification(db::Interface::Name::Contact, db::Query::Type::Create); - } break; - - case MessageType::DBContactGetByName: { - auto time = utils::time::Scoped("DBContactGetByName"); - DBContactMessage *msg = reinterpret_cast(msgl); - auto ret = contactRecordInterface->GetByName(msg->record.primaryName, msg->record.alternativeName); - responseMsg = std::make_shared( - std::move(ret), true, msg->limit, msg->offset, msg->favourite, ret->size(), type); - } break; - - case MessageType::DBContactSearch: { - auto time = utils::time::Scoped("DBContactSearch"); - DBContactSearchMessage *msg = reinterpret_cast(msgl); - auto ret = contactRecordInterface->Search(msg->primaryName, msg->alternativeName, msg->number); - responseMsg = std::make_shared(std::move(ret), true); - } break; - case MessageType::DBContactGetByID: { auto time = utils::time::Scoped("DBContactGetByID"); DBContactMessage *msg = reinterpret_cast(msgl); @@ -316,19 +126,6 @@ sys::MessagePointer ServiceDB::DataReceivedHandler(sys::DataMessage *msgl, sys:: MessageType::DBContactGetBySpeedDial); } break; - case MessageType::DBContactGetByNumber: { - auto time = utils::time::Scoped("DBContactGetByNumber"); - DBContactMessage *msg = reinterpret_cast(msgl); - auto ret = contactRecordInterface->GetByNumber(msg->record.numbers[0].number); - responseMsg = std::make_shared(std::move(ret), - true, - msg->limit, - msg->offset, - msg->favourite, - ret->size(), - MessageType::DBContactGetByNumber); - } break; - case MessageType::DBContactMatchByNumber: { auto time = utils::time::Scoped("DBContactMatchByNumber"); auto *msg = dynamic_cast(msgl); @@ -344,96 +141,6 @@ sys::MessagePointer ServiceDB::DataReceivedHandler(sys::DataMessage *msgl, sys:: } } break; - case MessageType::DBContactRemove: { - auto time = utils::time::Scoped("DBContactRemove"); - DBContactMessage *msg = reinterpret_cast(msgl); - auto ret = contactRecordInterface->RemoveByID(msg->id); - responseMsg = std::make_shared(nullptr, ret); - sendUpdateNotification(db::Interface::Name::Contact, db::Query::Type::Delete); - } break; - - case MessageType::DBContactBlock: { - auto time = utils::time::Scoped("DBContactBlock"); - DBContactBlock *msg = reinterpret_cast(msgl); - auto ret = contactRecordInterface->BlockByID(msg->id, msg->shouldBeBlocked); - responseMsg = std::make_shared(nullptr, ret); - } break; - - case MessageType::DBContactUpdate: { - auto time = utils::time::Scoped("DBContactUpdate"); - DBContactMessage *msg = reinterpret_cast(msgl); - auto ret = contactRecordInterface->Update(msg->record); - responseMsg = std::make_shared(nullptr, ret); - sendUpdateNotification(db::Interface::Name::Contact, db::Query::Type::Update); - } break; - - case MessageType::DBContactGetCount: { - auto time = utils::time::Scoped("DBContactGetCount"); - DBContactMessage *msg = reinterpret_cast(msgl); - uint32_t ret = 0; - if (msg->favourite) - ret = contactRecordInterface->GetCountFavourites(); - else - ret = contactRecordInterface->GetCount(); - responseMsg = std::make_shared(nullptr, true, 0, 0, msg->favourite, ret); - } break; - - case MessageType::DBContactGetLimitOffset: { - auto time = utils::time::Scoped("DBContactGetLimitOffset"); - DBContactMessage *msg = reinterpret_cast(msgl); - std::unique_ptr> ret; - - ret = contactRecordInterface->GetLimitOffset(msg->offset, msg->limit); - - responseMsg = std::make_shared(std::move(ret), - true, - msg->limit, - msg->offset, - msg->favourite, - ret->size(), - MessageType::DBContactGetLimitOffset); - - } break; - - /** - * Notes records - */ - - case MessageType::DBNotesAdd: { - auto time = utils::time::Scoped("DBNotesAdd"); - DBNotesMessage *msg = reinterpret_cast(msgl); - auto ret = notesRecordInterface->Add(msg->record); - responseMsg = std::make_shared(nullptr, ret); - } break; - - case MessageType::DBNotesRemove: { - auto time = utils::time::Scoped("DBNotesRemove"); - DBNotesMessage *msg = reinterpret_cast(msgl); - auto ret = notesRecordInterface->RemoveByID(msg->id); - responseMsg = std::make_shared(nullptr, ret); - } break; - - case MessageType::DBNotesUpdate: { - auto time = utils::time::Scoped("DBNotesUpdate"); - DBNotesMessage *msg = reinterpret_cast(msgl); - auto ret = notesRecordInterface->Update(msg->record); - responseMsg = std::make_shared(nullptr, ret); - } break; - - case MessageType::DBNotesGetCount: { - auto time = utils::time::Scoped("DBNotesGetCount"); - auto ret = notesRecordInterface->GetCount(); - responseMsg = std::make_shared(nullptr, true, 0, 0, ret); - } break; - - case MessageType::DBNotesGetLimitOffset: { - auto time = utils::time::Scoped("DBNotesGetLimitOffset"); - DBNotesMessage *msg = reinterpret_cast(msgl); - auto ret = notesRecordInterface->GetLimitOffset(msg->offset, msg->limit); - responseMsg = - std::make_shared(std::move(ret), true, msg->limit, msg->offset, ret->size()); - } break; - /** * Calllog records */ @@ -470,28 +177,6 @@ sys::MessagePointer ServiceDB::DataReceivedHandler(sys::DataMessage *msgl, sys:: sendUpdateNotification(db::Interface::Name::Calllog, db::Query::Type::Update); } break; - case MessageType::DBCalllogGetCount: { - auto *msg = dynamic_cast(msgl); - assert(msg); - auto time = utils::time::Scoped("DBCalllogGetCount"); - auto ret = calllogRecordInterface->GetCount(msg->state); - responseMsg = std::make_shared(nullptr, true, 0, 0, ret); - } break; - - case MessageType::DBCalllogGetLimitOffset: { - auto time = utils::time::Scoped("DBCalllogGetLimitOffset"); - DBCalllogMessage *msg = reinterpret_cast(msgl); - auto ret = calllogRecordInterface->GetLimitOffset(msg->offset, msg->limit); - responseMsg = - std::make_shared(std::move(ret), true, msg->limit, msg->offset, ret->size()); - } break; - - case MessageType::DBCountryCode: { - DBCountryCodeMessage *msg = reinterpret_cast(msgl); - auto ret = countryCodeRecordInterface->GetByMCC(msg->mcc); - responseMsg = std::make_shared(ret); - } break; - case MessageType::DBQuery: { auto msg = dynamic_cast(msgl); assert(msg); diff --git a/module-services/service-db/messages/DBCalllogMessage.cpp b/module-services/service-db/messages/DBCalllogMessage.cpp index 474c04564e76782a96b155f6d86986a1a4865b15..709d0730ae20dd51409f9d942698a8f1d6fd1953 100644 --- a/module-services/service-db/messages/DBCalllogMessage.cpp +++ b/module-services/service-db/messages/DBCalllogMessage.cpp @@ -1,8 +1,7 @@ -// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved. +// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved. // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md #include -#include #include @@ -11,9 +10,6 @@ DBCalllogMessage::DBCalllogMessage(MessageType messageType, const CalllogRecord : DBMessage(messageType), record(rec) {} -DBCalllogGetCount::DBCalllogGetCount(EntryState state) : DBCalllogMessage(MessageType::DBCalllogGetCount), state(state) -{} - DBCalllogResponseMessage ::DBCalllogResponseMessage(std::unique_ptr> rec, uint32_t retCode, uint32_t limit, diff --git a/module-services/service-db/messages/DBContactMessage.cpp b/module-services/service-db/messages/DBContactMessage.cpp index 198d5a9a4f6488568081d182102c0d2789b5a30a..70cb72ad7311f5f37e678c40f5781cd4d5f3fb1f 100644 --- a/module-services/service-db/messages/DBContactMessage.cpp +++ b/module-services/service-db/messages/DBContactMessage.cpp @@ -1,8 +1,7 @@ -// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved. +// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved. // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md #include -#include #include #include @@ -15,17 +14,6 @@ DBContactMessage ::DBContactMessage(MessageType messageType, const ContactRecord : DBMessage(messageType), record(rec), favourite{favourite} {} -DBContactBlock::DBContactBlock(MessageType messageType, const uint32_t _id, bool _shouldBeBlocked) - : DBMessage(messageType), id(_id), shouldBeBlocked(_shouldBeBlocked) -{} - -DBContactSearchMessage ::DBContactSearchMessage(MessageType messageType, - const char *_primaryName, - const char *_alternativeName, - const char *_number) - : DBMessage(messageType), primaryName(_primaryName), alternativeName(_alternativeName), number(_number) -{} - DBContactResponseMessage ::DBContactResponseMessage(std::unique_ptr> rec, uint32_t retCode, uint32_t limit, diff --git a/module-services/service-db/messages/DBCountryCodeMessage.cpp b/module-services/service-db/messages/DBCountryCodeMessage.cpp deleted file mode 100644 index cc03d867c52cbaae95f46b149f3362434b8b6cfd..0000000000000000000000000000000000000000 --- a/module-services/service-db/messages/DBCountryCodeMessage.cpp +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved. -// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md - -#include -#include - -DBCountryCodeMessage::DBCountryCodeMessage(MessageType messageType, const uint32_t _mcc, const uint32_t _country_code) - : DBMessage(messageType), mcc(_mcc), country_code(_country_code) -{} - -DBCountryCodeResponseMessage::DBCountryCodeResponseMessage(const CodesTableRow _row, - bool retCode, - int count, - MessageType respTo) - : DBResponseMessage(retCode, count, respTo), row(_row) -{} diff --git a/module-services/service-db/messages/DBNotesMessage.cpp b/module-services/service-db/messages/DBNotesMessage.cpp deleted file mode 100644 index 02e6813d0ded10161a2880d43dec89a2141cacbf..0000000000000000000000000000000000000000 --- a/module-services/service-db/messages/DBNotesMessage.cpp +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved. -// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md - -#include -#include - -#include - -#include - -DBNotesMessage::DBNotesMessage(MessageType messageType, const NotesRecord &rec) : DBMessage(messageType), record(rec) -{} - -DBNotesResponseMessage::DBNotesResponseMessage(std::unique_ptr> rec, - uint32_t retCode, - uint32_t limit, - uint32_t offset, - uint32_t count, - MessageType respTo) - : DBResponseMessage(retCode, count, respTo), records(std::move(rec)), limit(limit), offset(offset) -{ - this->count = count; -} diff --git a/module-services/service-db/messages/DBSMSMessage.cpp b/module-services/service-db/messages/DBSMSMessage.cpp deleted file mode 100644 index e0403b459746e2387f1b4eb4ba48e86831ca5efe..0000000000000000000000000000000000000000 --- a/module-services/service-db/messages/DBSMSMessage.cpp +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved. -// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md - -#include -#include - -#include - -#include // for move - -DBSMSMessage::DBSMSMessage(MessageType messageType, const SMSRecord &rec) : DBMessage(messageType), record(rec) -{} - -DBSMSGetCount::DBSMSGetCount() : DBSMSMessage(MessageType::DBSMSGetCount) -{} - -DBSMSResponseMessage::DBSMSResponseMessage(std::unique_ptr> rec, - uint32_t retCode, - uint32_t count, - MessageType respTo) - : DBResponseMessage(retCode, count, respTo), records(std::move(rec)) -{} diff --git a/module-services/service-db/messages/DBSMSTemplateMessage.cpp b/module-services/service-db/messages/DBSMSTemplateMessage.cpp deleted file mode 100644 index 5bd973f7bd59b438e23339bf7926ea8317140306..0000000000000000000000000000000000000000 --- a/module-services/service-db/messages/DBSMSTemplateMessage.cpp +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved. -// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md - -#include -#include - -#include - -#include // for move - -DBSMSTemplateMessage::DBSMSTemplateMessage(MessageType messageType, const SMSTemplateRecord &rec) - : DBMessage(messageType), record(rec) -{} - -DBSMSTemplateGetCount ::DBSMSTemplateGetCount() : DBSMSTemplateMessage(MessageType::DBSMSTemplateGetCount) -{} - -DBSMSTemplateResponseMessage::DBSMSTemplateResponseMessage(std::unique_ptr> rec, - uint32_t retCode, - uint32_t limit, - uint32_t offset, - uint32_t count, - MessageType respTo) - : DBResponseMessage(retCode, count, respTo), records(std::move(rec)), limit(limit), offset(offset) -{} diff --git a/module-services/service-db/messages/DBServiceMessage.cpp b/module-services/service-db/messages/DBServiceMessage.cpp index 0443cd9b501b1f688760a1131a9aeb39cdd4f09c..b2783bb7df78fd43feebfa5fd04c6d96342a5446 100644 --- a/module-services/service-db/messages/DBServiceMessage.cpp +++ b/module-services/service-db/messages/DBServiceMessage.cpp @@ -1,8 +1,7 @@ -// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved. +// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved. // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md #include -#include DBServiceMessageBackup::DBServiceMessageBackup(MessageType messageType, std::string backupPath) : DBMessage(messageType), backupPath(backupPath) diff --git a/module-services/service-db/messages/DBThreadMessage.cpp b/module-services/service-db/messages/DBThreadMessage.cpp deleted file mode 100644 index 98d361f2513353c008adfe738953e460f42cda57..0000000000000000000000000000000000000000 --- a/module-services/service-db/messages/DBThreadMessage.cpp +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved. -// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md - -#include -#include // for DBMessage, DBResponseMessage - -#include // for ThreadRecord - -#include // for move -DBThreadMessage::DBThreadMessage(MessageType messageType, const ThreadRecord &rec) : DBMessage(messageType), record(rec) -{} - -DBThreadMessageGet::DBThreadMessageGet(MessageType messageType, uint32_t contactID) - : DBMessage(messageType), contactID(contactID) -{} - -DBThreadGetCountMessage::DBThreadGetCountMessage(EntryState state) - : DBMessage(MessageType::DBThreadGetCount), state(state) -{} - -DBThreadResponseMessage::DBThreadResponseMessage(std::unique_ptr> rec, - uint32_t retCode, - uint32_t limit, - uint32_t offset, - uint32_t count, - MessageType respTo) - : DBResponseMessage(retCode, count, respTo), records(std::move(rec)), limit(limit), offset(offset) -{ - this->count = count; -} diff --git a/module-services/service-db/messages/QueryMessage.cpp b/module-services/service-db/messages/QueryMessage.cpp index 45c29a5a9ed88baf14a84d38221f62ce9c6497dd..376a4d7dda557d157a3f6ef47e6eaf95278b6721 100644 --- a/module-services/service-db/messages/QueryMessage.cpp +++ b/module-services/service-db/messages/QueryMessage.cpp @@ -1,8 +1,7 @@ -// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved. +// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved. // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md #include -#include #include #include diff --git a/module-services/service-db/service-db/DBCalllogMessage.hpp b/module-services/service-db/service-db/DBCalllogMessage.hpp index ebe7c166cb0cfbf6dfef1751fd5e677a1fa6baef..579d558c5b35722012c1ef112fcfbfce6a9785e6 100644 --- a/module-services/service-db/service-db/DBCalllogMessage.hpp +++ b/module-services/service-db/service-db/DBCalllogMessage.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved. +// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved. // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md #pragma once @@ -7,7 +7,6 @@ #include #include -#include #include #include @@ -20,13 +19,6 @@ class DBCalllogMessage : public DBMessage CalllogRecord record; }; -class DBCalllogGetCount : public DBCalllogMessage -{ - public: - EntryState state; - DBCalllogGetCount(EntryState state); -}; - class DBCalllogResponseMessage : public DBResponseMessage { public: diff --git a/module-services/service-db/service-db/DBContactMessage.hpp b/module-services/service-db/service-db/DBContactMessage.hpp index 221c04f7be0257e74f56100cded6b751987621d9..e250119ea8085c4bc532688fddd49bdde780a1d9 100644 --- a/module-services/service-db/service-db/DBContactMessage.hpp +++ b/module-services/service-db/service-db/DBContactMessage.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved. +// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved. // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md #pragma once @@ -82,28 +82,6 @@ class DBContactNumberResponseMessage : public sys::ResponseMessage std::unique_ptr contact; }; -class DBContactBlock : public DBMessage -{ - public: - DBContactBlock(MessageType messageType, const uint32_t _id, bool _shouldBeBlocked); - - uint32_t id; - bool shouldBeBlocked; -}; - -class DBContactSearchMessage : public DBMessage -{ - public: - DBContactSearchMessage(MessageType messageType, - const char *_primaryName, - const char *_alternativeName, - const char *_number); - - const char *primaryName; - const char *alternativeName; - const char *number; -}; - class DBContactResponseMessage : public DBResponseMessage { public: diff --git a/module-services/service-db/service-db/DBCountryCodeMessage.hpp b/module-services/service-db/service-db/DBCountryCodeMessage.hpp deleted file mode 100644 index c67c52544feec2d50b2ba1128ec5dfe0ed7119fd..0000000000000000000000000000000000000000 --- a/module-services/service-db/service-db/DBCountryCodeMessage.hpp +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved. -// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md - -#pragma once - -#include "DBMessage.hpp" - -#include -#include -#include - -#include - -class DBCountryCodeMessage : public DBMessage -{ - public: - DBCountryCodeMessage(MessageType messageType, const uint32_t _mcc, const uint32_t _country_code); - - uint32_t mcc; - uint32_t country_code; -}; - -class DBCountryCodeResponseMessage : public DBResponseMessage -{ - public: - DBCountryCodeResponseMessage(const CodesTableRow _row, - bool retCode = true, - int count = 0, - MessageType respTo = MessageType::MessageTypeUninitialized); - - CodesTableRow row; -}; diff --git a/module-services/service-db/service-db/DBNotesMessage.hpp b/module-services/service-db/service-db/DBNotesMessage.hpp deleted file mode 100644 index 38d89e9034327b571e869fffccd2a8af3caf8a6c..0000000000000000000000000000000000000000 --- a/module-services/service-db/service-db/DBNotesMessage.hpp +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved. -// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md - -#pragma once - -#include "DBMessage.hpp" // for DBMessage, DBResponseMessage - -#include -#include - -#include -#include -#include - -class DBNotesMessage : public DBMessage -{ - public: - DBNotesMessage(MessageType messageType, const NotesRecord &rec = NotesRecord{}); - - NotesRecord record; -}; - -class DBNotesResponseMessage : public DBResponseMessage -{ - public: - DBNotesResponseMessage(std::unique_ptr> rec, - uint32_t retCode = 0, - uint32_t limit = 0, - uint32_t offset = 0, - uint32_t count = 0, - MessageType respTo = MessageType::MessageTypeUninitialized); - - std::unique_ptr> records; - uint32_t limit = 0; - uint32_t offset = 0; -}; diff --git a/module-services/service-db/service-db/DBSMSMessage.hpp b/module-services/service-db/service-db/DBSMSMessage.hpp deleted file mode 100644 index 97584458344b301b65dd8d4e096094817082411e..0000000000000000000000000000000000000000 --- a/module-services/service-db/service-db/DBSMSMessage.hpp +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved. -// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md - -#pragma once - -#include "DBMessage.hpp" // for DBMessage, DBResponseMessage - -#include -#include - -#include -#include -#include - -class DBSMSMessage : public DBMessage -{ - public: - DBSMSMessage(MessageType messageType, const SMSRecord &rec = SMSRecord{}); - SMSRecord record; -}; - -class DBSMSGetCount : public DBSMSMessage -{ - public: - DBSMSGetCount(); -}; - -class DBSMSResponseMessage : public DBResponseMessage -{ - public: - DBSMSResponseMessage(std::unique_ptr> rec, - uint32_t retCode = 0, - uint32_t count = 0, - MessageType respTo = MessageType::MessageTypeUninitialized); - std::unique_ptr> records; -}; diff --git a/module-services/service-db/service-db/DBSMSTemplateMessage.hpp b/module-services/service-db/service-db/DBSMSTemplateMessage.hpp deleted file mode 100644 index bfa0a8fe5a452553292ba6243a64a06b2055e651..0000000000000000000000000000000000000000 --- a/module-services/service-db/service-db/DBSMSTemplateMessage.hpp +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved. -// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md - -#pragma once - -#include "DBMessage.hpp" // for DBMessage, DBResponseMessage - -#include -#include - -#include -#include -#include - -class DBSMSTemplateMessage : public DBMessage -{ - public: - DBSMSTemplateMessage(MessageType messageType, const SMSTemplateRecord &rec = SMSTemplateRecord{}); - SMSTemplateRecord record; -}; - -class DBSMSTemplateGetCount : public DBSMSTemplateMessage -{ - public: - DBSMSTemplateGetCount(); -}; - -class DBSMSTemplateResponseMessage : public DBResponseMessage -{ - public: - DBSMSTemplateResponseMessage(std::unique_ptr> rec, - uint32_t retCode, - uint32_t limit = 0, - uint32_t offset = 0, - uint32_t count = 0, - MessageType respTo = MessageType::MessageTypeUninitialized); - - std::unique_ptr> records; - uint32_t limit = 0; - uint32_t offset = 0; -}; diff --git a/module-services/service-db/service-db/DBServiceAPI.hpp b/module-services/service-db/service-db/DBServiceAPI.hpp index 06b716fcfb004f395da578a48c16a8611581ee6b..17333b516ce26225745864ed2a33793b4949c203 100644 --- a/module-services/service-db/service-db/DBServiceAPI.hpp +++ b/module-services/service-db/service-db/DBServiceAPI.hpp @@ -8,7 +8,6 @@ #include #include #include -#include #include #include #include @@ -32,8 +31,6 @@ namespace sys { class Service; } // namespace sys -struct ContactRecord; -struct NotesRecord; class DBServiceAPI { @@ -50,10 +47,10 @@ class DBServiceAPI success }; - static auto ThreadGetByNumber(sys::Service *serv, - const utils::PhoneNumber::View &phoneNumber, - std::uint32_t timeout = DefaultTimeoutInMs) -> std::unique_ptr; - static auto ThreadGetCount(sys::Service *serv, EntryState state = EntryState::ALL) -> uint32_t; + [[deprecated]] static auto ThreadGetByNumber(sys::Service *serv, + const utils::PhoneNumber::View &phoneNumber, + std::uint32_t timeout = DefaultTimeoutInMs) + -> std::unique_ptr; /** * Queries the database. @@ -83,19 +80,18 @@ class DBServiceAPI * * @note This function is blocking. It's checking until first error. */ - static auto verifyContact(sys::Service *serv, const ContactRecord &rec) -> ContactVerificationResult; - static auto ContactGetByID(sys::Service *serv, uint32_t contactID) -> std::unique_ptr>; - static auto ContactGetByIDWithTemporary(sys::Service *serv, uint32_t contactID) + [[deprecated]] static auto verifyContact(sys::Service *serv, const ContactRecord &rec) -> ContactVerificationResult; + [[deprecated]] static auto ContactGetByID(sys::Service *serv, uint32_t contactID) + -> std::unique_ptr>; + [[deprecated]] static auto ContactGetByIDWithTemporary(sys::Service *serv, uint32_t contactID) -> std::unique_ptr>; private: - static auto ContactGetByIDCommon(sys::Service *serv, std::shared_ptr contactMsg) + [[deprecated]] static auto ContactGetByIDCommon(sys::Service *serv, std::shared_ptr contactMsg) -> std::unique_ptr>; public: - static auto ContactGetBySpeeddial(sys::Service *serv, UTF8 speeddial) - -> std::unique_ptr>; - static auto ContactGetByPhoneNumber(sys::Service *serv, UTF8 phoneNumber) + [[deprecated]] static auto ContactGetBySpeeddial(sys::Service *serv, UTF8 speeddial) -> std::unique_ptr>; /** @@ -105,22 +101,16 @@ class DBServiceAPI * @param numberView - number to match contact with * @return std::unique_ptr */ - static auto MatchContactByPhoneNumber(sys::Service *serv, const utils::PhoneNumber::View &numberView) + [[deprecated]] static auto MatchContactByPhoneNumber(sys::Service *serv, const utils::PhoneNumber::View &numberView) -> std::unique_ptr; - static auto ContactAdd(sys::Service *serv, const ContactRecord &rec) -> bool; - static auto ContactRemove(sys::Service *serv, uint32_t id) -> bool; - static auto ContactUpdate(sys::Service *serv, const ContactRecord &rec) -> bool; - static auto ContactSearch(sys::Service *serv, UTF8 primaryName, UTF8 alternativeName, UTF8 number) - -> std::unique_ptr>; - static auto CalllogAdd(sys::Service *serv, const CalllogRecord &rec) -> CalllogRecord; - static auto CalllogRemove(sys::Service *serv, uint32_t id) -> bool; - static auto CalllogUpdate(sys::Service *serv, const CalllogRecord &rec) -> bool; - static auto CalllogGetCount(sys::Service *serv, EntryState state = EntryState::ALL) -> uint32_t; - static auto CalllogGetLimitOffset(sys::Service *serv, uint32_t offset, uint32_t limit) -> bool; + [[deprecated]] static auto ContactAdd(sys::Service *serv, const ContactRecord &rec) -> bool; + [[deprecated]] static auto ContactRemove(sys::Service *serv, uint32_t id) -> bool; + [[deprecated]] static auto ContactUpdate(sys::Service *serv, const ContactRecord &rec) -> bool; - /* country codes */ - static auto GetCountryCodeByMCC(sys::Service *serv, uint32_t mcc) -> uint32_t; + [[deprecated]] static auto CalllogAdd(sys::Service *serv, const CalllogRecord &rec) -> CalllogRecord; + [[deprecated]] static auto CalllogRemove(sys::Service *serv, uint32_t id) -> bool; + [[deprecated]] static auto CalllogUpdate(sys::Service *serv, const CalllogRecord &rec) -> bool; static auto DBBackup(sys::Service *serv, std::string backupPath) -> bool; diff --git a/module-services/service-db/service-db/DBThreadMessage.hpp b/module-services/service-db/service-db/DBThreadMessage.hpp deleted file mode 100644 index 46872a7c6f0ca54089c7cddaf23b585aadca8618..0000000000000000000000000000000000000000 --- a/module-services/service-db/service-db/DBThreadMessage.hpp +++ /dev/null @@ -1,51 +0,0 @@ -// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved. -// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md - -#pragma once - -#include "DBMessage.hpp" - -#include -#include -#include - -#include -#include -#include - -class DBThreadMessage : public DBMessage -{ - public: - DBThreadMessage(MessageType messageType, const ThreadRecord &rec = ThreadRecord{}); - ThreadRecord record; -}; - -class DBThreadGetCountMessage : public DBMessage -{ - public: - EntryState state; - DBThreadGetCountMessage(EntryState state = EntryState::ALL); -}; - -class DBThreadMessageGet : public DBMessage -{ - public: - DBThreadMessageGet(MessageType messageType, uint32_t contactID); - ThreadRecord record = {}; - uint32_t contactID; -}; - -class DBThreadResponseMessage : public DBResponseMessage -{ - public: - DBThreadResponseMessage(std::unique_ptr> rec, - uint32_t retCode = 0, - uint32_t limit = 0, - uint32_t offset = 0, - uint32_t count = 0, - MessageType respTo = MessageType::MessageTypeUninitialized); - - std::unique_ptr> records; - uint32_t limit = 0; - uint32_t offset = 0; -}; diff --git a/module-services/service-desktop/tests/test-contacts.cpp b/module-services/service-desktop/tests/test-contacts.cpp index 9c1c4c03bf1852909b15e525365db8a8e33c4b05..1798e7961731ffde0fe4432ab96a9f803f270d3c 100644 --- a/module-services/service-desktop/tests/test-contacts.cpp +++ b/module-services/service-desktop/tests/test-contacts.cpp @@ -41,10 +41,6 @@ auto DBServiceAPI::ThreadGetByNumber(sys::Service *serv, { return nullptr; } -auto DBServiceAPI::ThreadGetCount(sys::Service *serv, EntryState state) -> uint32_t -{ - return 0; -} auto DBServiceAPI::GetQueryWithReply(sys::Service *serv, db::Interface::Name database, @@ -77,11 +73,6 @@ auto DBServiceAPI::ContactGetBySpeeddial(sys::Service *serv, UTF8 speeddial) { return nullptr; } -auto DBServiceAPI::ContactGetByPhoneNumber(sys::Service *serv, UTF8 phoneNumber) - -> std::unique_ptr> -{ - return nullptr; -} auto DBServiceAPI::MatchContactByPhoneNumber(sys::Service *serv, const utils::PhoneNumber::View &numberView) -> std::unique_ptr { @@ -99,11 +90,6 @@ auto DBServiceAPI::ContactUpdate(sys::Service *serv, const ContactRecord &rec) - { return false; } -auto DBServiceAPI::ContactSearch(sys::Service *serv, UTF8 primaryName, UTF8 alternativeName, UTF8 number) - -> std::unique_ptr> -{ - return nullptr; -} auto DBServiceAPI::CalllogAdd(sys::Service *serv, const CalllogRecord &rec) -> CalllogRecord { return {}; @@ -116,18 +102,6 @@ auto DBServiceAPI::CalllogUpdate(sys::Service *serv, const CalllogRecord &rec) - { return false; } -auto DBServiceAPI::CalllogGetCount(sys::Service *serv, EntryState state) -> uint32_t -{ - return 0; -} -auto DBServiceAPI::CalllogGetLimitOffset(sys::Service *serv, uint32_t offset, uint32_t limit) -> bool -{ - return false; -} -auto DBServiceAPI::GetCountryCodeByMCC(sys::Service *serv, uint32_t mcc) -> uint32_t -{ - return 0; -} auto DBServiceAPI::DBBackup(sys::Service *serv, std::string backupPath) -> bool { return false; diff --git a/source/MessageType.hpp b/source/MessageType.hpp index cf550bc9defe19ad554e6baafd079ee99a1ee22b..0237076e3cbbe976ae6ef6370208e3a14ef5d44b 100644 --- a/source/MessageType.hpp +++ b/source/MessageType.hpp @@ -22,49 +22,14 @@ enum class MessageType DBSettingsGet, ///< get current settings from database DBSettingsUpdate, ///< update settings - DBSMSAdd, ///< Add new sms record - DBSMSRemove, ///< Remove specified SMS record - DBSMSUpdate, ///< Update specified SMS record - DBSMSGetSMSLimitOffset, ///< Get SMS records by limit,offset - DBSMSGetSMSLimitOffsetByThreadID, ///< Get SMS records by limit,offset with specified ThreadID field - DBSMSGetLastRecord, ///< Get last edited record - DBSMSGetCount, ///< Get all sms count - - DBThreadGet, ///< Get thread by ID - DBThreadGetForContact, ///< Get thread between 2 contacts - DBThreadRemove, ///< Remove thread by ID - DBThreadGetLimitOffset, ///< Get Thread record by limit,offset - DBThreadGetCount, ///< get Thread count - DBThreadUpdate, ///< Thread update - - DBSMSTemplateAdd, ///< Add new sms template record - DBSMSTemplateRemove, ///< Remove selected sms template record - DBSMSTemplateUpdate, ///< Update selected sms template record - DBSMSTemplateGetLimitOffset, ///< Get sms templates records by limit,offset - DBSMSTemplateGetCount, ///< Get sms templates reocrds count - - DBContactVerify, ///< checks database for a contact that has the same name (primary+" "+alternative) or phone number - ///< 1 or phone number 2 or speed dial key - DBContactGetByName, ///< used to ask for a contact with specified primary and alternative name. - DBContactSearch, - DBContactGetByID, ///< used to ask for a contact with specified id - DBContactGetBySpeedDial, ///< used to ask for a contact with specified speed dial key assigned - DBContactGetByNumber, ///< used to ask for a contact with specified primary or secondary phone number - DBContactMatchByNumber, ///< used to best match with a single contact using a phone number (primary or secondary) - DBContactAdd, ///< Add contact record - DBContactRemove, ///< Remove contact remove - DBContactUpdate, ///< Update contact remove - DBContactGetLimitOffset, ///< Get contact records by limit,offset - DBContactGetCount, ///< Get contacts count - DBContactBlock, - DBAlarmAdd, ///< Add alarm record - DBAlarmRemove, ///< Remove alarm remove - DBAlarmUpdate, ///< Update alarm remove - DBAlarmGetLimitOffset, ///< Get alarm records by limit,offset - DBAlarmGetCount, ///< Get alarm count - DBAlarmGetNext, ///< Get alarm, closest or equal to current timestamp. - - DBCountryCode, + DBContactGetByID [[deprecated]], ///< used to ask for a contact with specified id + DBContactGetBySpeedDial [[deprecated]], ///< used to ask for a contact with specified speed dial key assigned + DBContactMatchByNumber + [[deprecated]], ///< used to best match with a single contact using a phone number (primary or secondary) + DBContactAdd [[deprecated]], ///< Add contact record + DBContactRemove [[deprecated]], ///< Remove contact remove + DBContactUpdate [[deprecated]], ///< Update contact remove + DBQuery, // Cellular messages @@ -114,17 +79,9 @@ enum class MessageType CellularRadioOnOff, CellularSendSMS, - DBNotesAdd, ///< Add new note's record - DBNotesRemove, ///< Remove selected note's record - DBNotesUpdate, ///< Update selected note's record - DBNotesGetLimitOffset, ///< Get notes records by limit,offset - DBNotesGetCount, ///< Get notes reocrds count - - DBCalllogAdd, ///< Add new note's record - DBCalllogRemove, ///< Remove selected note's record - DBCalllogUpdate, ///< Update selected note's record - DBCalllogGetLimitOffset, ///< Get Calllog records by limit,offset - DBCalllogGetCount, ///< Get Calllog reocrds count + DBCalllogAdd [[deprecated]], ///< Add new note's record + DBCalllogRemove [[deprecated]], ///< Remove selected note's record + DBCalllogUpdate [[deprecated]], ///< Update selected note's record // Audio service messages AudioMessage,