From 220ab0f123a557820a8b58c64e2fcd55ddc58e07 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Wed, 29 Nov 2017 15:43:33 +0100 Subject: [PATCH] feat(MainDb): explicit insert of basic chat room --- src/db/main-db-p.h | 3 +-- src/db/main-db.cpp | 7 +++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/db/main-db-p.h b/src/db/main-db-p.h index e871661d2..d4c90cfd6 100644 --- a/src/db/main-db-p.h +++ b/src/db/main-db-p.h @@ -54,10 +54,9 @@ private: void insertContent (long long messageEventId, const Content &content); void updateContent (long long messageEventId, long long messageContentId, const Content &content); long long insertContentType (const std::string &contentType); - long long insertChatRoom ( + long long insertBasicChatRoom ( long long peerSipAddressId, long long localSipAddressId, - int capabilities, const tm &creationTime ); long long insertChatRoom (const std::shared_ptr &chatRoom); diff --git a/src/db/main-db.cpp b/src/db/main-db.cpp index f14ddc1ca..013e26474 100644 --- a/src/db/main-db.cpp +++ b/src/db/main-db.cpp @@ -200,10 +200,9 @@ MainDb::MainDb (const shared_ptr &core) : AbstractDb(*new MainDbPrivate), return q->getLastInsertId(); } - long long MainDbPrivate::insertChatRoom ( + long long MainDbPrivate::insertBasicChatRoom ( long long peerSipAddressId, long long localSipAddressId, - int capabilities, const tm &creationTime ) { L_Q(); @@ -214,6 +213,7 @@ MainDb::MainDb (const shared_ptr &core) : AbstractDb(*new MainDbPrivate), if (id >= 0) return id; + static const int capabilities = static_cast(ChatRoom::Capabilities::Basic); lInfo() << "Insert new chat room in database: (peer=" << peerSipAddressId << ", local=" << localSipAddressId << ", capabilities=" << capabilities << ")."; *session << "INSERT INTO chat_room (" @@ -1989,10 +1989,9 @@ MainDb::MainDb (const shared_ptr &core) : AbstractDb(*new MainDbPrivate), const long long &eventId = getLastInsertId(); const long long &localSipAddressId = d->insertSipAddress(message.get(LEGACY_MESSAGE_COL_LOCAL_ADDRESS)); const long long &remoteSipAddressId = d->insertSipAddress(message.get(LEGACY_MESSAGE_COL_REMOTE_ADDRESS)); - const long long &chatRoomId = d->insertChatRoom( + const long long &chatRoomId = d->insertBasicChatRoom( remoteSipAddressId, localSipAddressId, - static_cast(ChatRoom::Capabilities::Basic), creationTime ); const int &isSecured = message.get(LEGACY_MESSAGE_COL_IS_SECURED, 0);