diff --git a/services/tunnelbroker/src/libcpp/src/Database/DatabaseManager.cpp b/services/tunnelbroker/src/libcpp/src/Database/DatabaseManager.cpp
index 44b4b1f4f..fd00352e0 100644
--- a/services/tunnelbroker/src/libcpp/src/Database/DatabaseManager.cpp
+++ b/services/tunnelbroker/src/libcpp/src/Database/DatabaseManager.cpp
@@ -1,351 +1,352 @@
 #include "DatabaseManager.h"
 #include "DynamoDBTools.h"
 #include "GlobalTools.h"
 
 #include <glog/logging.h>
 
 namespace comm {
 namespace network {
 namespace database {
 
 DatabaseManager &DatabaseManager::getInstance() {
   static DatabaseManager instance;
   return instance;
 }
 
 bool DatabaseManager::isTableAvailable(const std::string &tableName) {
   Aws::DynamoDB::Model::DescribeTableRequest request;
   request.SetTableName(tableName);
 
   // Check table availability by invoking DescribeTable
   const Aws::DynamoDB::Model::DescribeTableOutcome &result =
       getDynamoDBClient()->DescribeTable(request);
   return result.IsSuccess();
 }
 
 void DatabaseManager::putSessionItem(const DeviceSessionItem &item) {
   Aws::DynamoDB::Model::PutItemRequest request;
   request.SetTableName(item.getTableName());
   request.AddItem(
       DeviceSessionItem::FIELD_SESSION_ID,
       Aws::DynamoDB::Model::AttributeValue(item.getSessionID()));
   request.AddItem(
       DeviceSessionItem::FIELD_DEVICE_ID,
       Aws::DynamoDB::Model::AttributeValue(item.getDeviceID()));
   request.AddItem(
       DeviceSessionItem::FIELD_PUBKEY,
       Aws::DynamoDB::Model::AttributeValue(item.getPubKey()));
   request.AddItem(
       DeviceSessionItem::FIELD_NOTIFY_TOKEN,
       Aws::DynamoDB::Model::AttributeValue(item.getNotifyToken()));
   request.AddItem(
       DeviceSessionItem::FIELD_DEVICE_TYPE,
-      Aws::DynamoDB::Model::AttributeValue(item.getDeviceType()));
+      Aws::DynamoDB::Model::AttributeValue(
+          std::to_string(item.getDeviceType())));
   request.AddItem(
       DeviceSessionItem::FIELD_APP_VERSION,
       Aws::DynamoDB::Model::AttributeValue(item.getAppVersion()));
   request.AddItem(
       DeviceSessionItem::FIELD_DEVICE_OS,
       Aws::DynamoDB::Model::AttributeValue(item.getDeviceOs()));
   request.AddItem(
       DeviceSessionItem::FIELD_CHECKPOINT_TIME,
       Aws::DynamoDB::Model::AttributeValue(
           std::to_string(item.getCheckpointTime())));
   request.AddItem(
       DeviceSessionItem::FIELD_EXPIRE,
       Aws::DynamoDB::Model::AttributeValue(std::to_string(
           static_cast<size_t>(std::time(0)) + SESSION_RECORD_TTL)));
   request.AddItem(
       DeviceSessionItem::FIELD_IS_ONLINE,
       Aws::DynamoDB::Model::AttributeValue().SetBool(false));
   this->innerPutItem(std::make_shared<DeviceSessionItem>(item), request);
 }
 
 std::shared_ptr<DeviceSessionItem>
 DatabaseManager::findSessionItem(const std::string &sessionID) {
   Aws::DynamoDB::Model::GetItemRequest request;
   request.AddKey(
       DeviceSessionItem::FIELD_SESSION_ID,
       Aws::DynamoDB::Model::AttributeValue(sessionID));
   return this->innerFindItem<DeviceSessionItem>(request);
 }
 
 void DatabaseManager::removeSessionItem(const std::string &sessionID) {
   std::shared_ptr<DeviceSessionItem> item = this->findSessionItem(sessionID);
   if (item == nullptr) {
     return;
   }
   this->innerRemoveItem(*item);
 }
 
 void DatabaseManager::updateSessionItemIsOnline(
     const std::string &sessionID,
     bool isOnline) {
   std::shared_ptr<DeviceSessionItem> item = this->findSessionItem(sessionID);
   if (item == nullptr) {
     LOG(ERROR) << "Can't find for update sessionItem for sessionID: "
                << sessionID;
     return;
   }
   Aws::DynamoDB::Model::UpdateItemRequest request;
   request.SetTableName(item->getTableName());
 
   Aws::DynamoDB::Model::AttributeValue attributeKeyValue;
   attributeKeyValue.SetS(sessionID);
   request.AddKey(DeviceSessionItem::FIELD_SESSION_ID, attributeKeyValue);
   Aws::String update_expression("SET #a = :valueA");
   request.SetUpdateExpression(update_expression);
   Aws::Map<Aws::String, Aws::String> expressionAttributeNames;
   expressionAttributeNames["#a"] = DeviceSessionItem::FIELD_IS_ONLINE;
   request.SetExpressionAttributeNames(expressionAttributeNames);
 
   Aws::DynamoDB::Model::AttributeValue attributeUpdatedValue;
   attributeUpdatedValue.SetBool(isOnline);
   Aws::Map<Aws::String, Aws::DynamoDB::Model::AttributeValue>
       expressionAttributeValue;
   expressionAttributeValue[":valueA"] = attributeUpdatedValue;
   request.SetExpressionAttributeValues(expressionAttributeValue);
 
   const Aws::DynamoDB::Model::UpdateItemOutcome &result =
       getDynamoDBClient()->UpdateItem(request);
   if (!result.IsSuccess()) {
     LOG(ERROR) << "Error updating device online status at "
                   "`updateSessionItemIsOnline`: "
                << result.GetError().GetMessage();
   }
 }
 
 bool DatabaseManager::updateSessionItemDeviceToken(
     const std::string &sessionID,
     const std::string &newDeviceToken) {
   std::shared_ptr<DeviceSessionItem> item = this->findSessionItem(sessionID);
   if (item == nullptr) {
     LOG(ERROR) << "Can't find for update sessionItem for sessionID: "
                << sessionID;
     return false;
   }
   Aws::DynamoDB::Model::UpdateItemRequest request;
   request.SetTableName(item->getTableName());
 
   Aws::DynamoDB::Model::AttributeValue attributeKeyValue;
   attributeKeyValue.SetS(sessionID);
   request.AddKey(DeviceSessionItem::FIELD_SESSION_ID, attributeKeyValue);
   Aws::String update_expression("SET #a = :valueA");
   request.SetUpdateExpression(update_expression);
   Aws::Map<Aws::String, Aws::String> expressionAttributeNames;
   expressionAttributeNames["#a"] = DeviceSessionItem::FIELD_NOTIFY_TOKEN;
   request.SetExpressionAttributeNames(expressionAttributeNames);
 
   Aws::DynamoDB::Model::AttributeValue attributeUpdatedValue;
   attributeUpdatedValue.SetS(newDeviceToken);
   Aws::Map<Aws::String, Aws::DynamoDB::Model::AttributeValue>
       expressionAttributeValue;
   expressionAttributeValue[":valueA"] = attributeUpdatedValue;
   request.SetExpressionAttributeValues(expressionAttributeValue);
 
   const Aws::DynamoDB::Model::UpdateItemOutcome &result =
       getDynamoDBClient()->UpdateItem(request);
   if (!result.IsSuccess()) {
     LOG(ERROR)
         << "Error updating device token at updateSessionItemDeviceToken: "
         << result.GetError().GetMessage();
     return false;
   }
   return true;
 }
 
 void DatabaseManager::putSessionSignItem(const SessionSignItem &item) {
   Aws::DynamoDB::Model::PutItemRequest request;
   request.SetTableName(item.getTableName());
   request.AddItem(
       SessionSignItem::FIELD_SESSION_VERIFICATION,
       Aws::DynamoDB::Model::AttributeValue(item.getSign()));
   request.AddItem(
       SessionSignItem::FIELD_DEVICE_ID,
       Aws::DynamoDB::Model::AttributeValue(item.getDeviceID()));
   request.AddItem(
       SessionSignItem::FIELD_EXPIRE,
       Aws::DynamoDB::Model::AttributeValue(std::to_string(
           static_cast<size_t>(std::time(0)) + SESSION_SIGN_RECORD_TTL)));
   this->innerPutItem(std::make_shared<SessionSignItem>(item), request);
 }
 
 std::shared_ptr<SessionSignItem>
 DatabaseManager::findSessionSignItem(const std::string &deviceID) {
   Aws::DynamoDB::Model::GetItemRequest request;
   request.AddKey(
       SessionSignItem::FIELD_DEVICE_ID,
       Aws::DynamoDB::Model::AttributeValue(deviceID));
   return this->innerFindItem<SessionSignItem>(request);
 }
 
 void DatabaseManager::removeSessionSignItem(const std::string &deviceID) {
   std::shared_ptr<SessionSignItem> item = this->findSessionSignItem(deviceID);
   if (item == nullptr) {
     return;
   }
   this->innerRemoveItem(*item);
 }
 
 void DatabaseManager::putPublicKeyItem(const PublicKeyItem &item) {
   Aws::DynamoDB::Model::PutItemRequest request;
   request.SetTableName(item.getTableName());
   request.AddItem(
       PublicKeyItem::FIELD_DEVICE_ID,
       Aws::DynamoDB::Model::AttributeValue(item.getDeviceID()));
   request.AddItem(
       PublicKeyItem::FIELD_PUBLIC_KEY,
       Aws::DynamoDB::Model::AttributeValue(item.getPublicKey()));
   this->innerPutItem(std::make_shared<PublicKeyItem>(item), request);
 }
 
 std::shared_ptr<PublicKeyItem>
 DatabaseManager::findPublicKeyItem(const std::string &deviceID) {
   Aws::DynamoDB::Model::GetItemRequest request;
   request.AddKey(
       PublicKeyItem::FIELD_DEVICE_ID,
       Aws::DynamoDB::Model::AttributeValue(deviceID));
   return this->innerFindItem<PublicKeyItem>(request);
 }
 
 void DatabaseManager::removePublicKeyItem(const std::string &deviceID) {
   std::shared_ptr<PublicKeyItem> item = this->findPublicKeyItem(deviceID);
   if (item == nullptr) {
     return;
   }
   this->innerRemoveItem(*item);
 }
 
 template <class T>
 T DatabaseManager::populatePutRequestFromMessageItem(
     T &putRequest,
     const MessageItem &item) {
   putRequest.AddItem(
       MessageItem::FIELD_MESSAGE_ID,
       Aws::DynamoDB::Model::AttributeValue(item.getMessageID()));
   putRequest.AddItem(
       MessageItem::FIELD_FROM_DEVICE_ID,
       Aws::DynamoDB::Model::AttributeValue(item.getFromDeviceID()));
   putRequest.AddItem(
       MessageItem::FIELD_TO_DEVICE_ID,
       Aws::DynamoDB::Model::AttributeValue(item.getToDeviceID()));
   putRequest.AddItem(
       MessageItem::FIELD_PAYLOAD,
       Aws::DynamoDB::Model::AttributeValue(item.getPayload()));
   putRequest.AddItem(
       MessageItem::FIELD_BLOB_HASHES,
       Aws::DynamoDB::Model::AttributeValue(item.getBlobHashes()));
   putRequest.AddItem(
       MessageItem::FIELD_EXPIRE,
       Aws::DynamoDB::Model::AttributeValue(std::to_string(
           static_cast<size_t>(std::time(0) + MESSAGE_RECORD_TTL))));
   putRequest.AddItem(
       MessageItem::FIELD_CREATED_AT,
       Aws::DynamoDB::Model::AttributeValue(
           std::to_string(tools::getCurrentTimestamp())));
   return putRequest;
 }
 
 void DatabaseManager::putMessageItem(const MessageItem &item) {
   Aws::DynamoDB::Model::PutItemRequest request;
   request = this->populatePutRequestFromMessageItem(request, item);
   request.SetTableName(item.getTableName());
   this->innerPutItem(std::make_shared<MessageItem>(item), request);
 }
 
 void DatabaseManager::putMessageItemsByBatch(
     std::vector<MessageItem> &messageItems) {
   std::vector<Aws::DynamoDB::Model::WriteRequest> writeRequests;
   for (MessageItem &messageItem : messageItems) {
     Aws::DynamoDB::Model::PutRequest putRequest;
     putRequest =
         this->populatePutRequestFromMessageItem(putRequest, messageItem);
     Aws::DynamoDB::Model::WriteRequest writeRequest;
     writeRequest.SetPutRequest(putRequest);
     writeRequests.push_back(writeRequest);
   }
   this->innerBatchWriteItem(
       messageItems[0].getTableName(),
       DYNAMODB_MAX_BATCH_ITEMS,
       DYNAMODB_BACKOFF_FIRST_RETRY_DELAY,
       DYNAMODB_MAX_BACKOFF_TIME,
       writeRequests);
 }
 
 std::shared_ptr<MessageItem> DatabaseManager::findMessageItem(
     const std::string &toDeviceID,
     const std::string &messageID) {
   Aws::DynamoDB::Model::GetItemRequest request;
   request.AddKey(
       MessageItem::FIELD_TO_DEVICE_ID,
       Aws::DynamoDB::Model::AttributeValue(toDeviceID));
   request.AddKey(
       MessageItem::FIELD_MESSAGE_ID,
       Aws::DynamoDB::Model::AttributeValue(messageID));
   return this->innerFindItem<MessageItem>(request);
 }
 
 std::vector<std::shared_ptr<MessageItem>>
 DatabaseManager::findMessageItemsByReceiver(const std::string &toDeviceID) {
   std::vector<std::shared_ptr<MessageItem>> result;
 
   Aws::DynamoDB::Model::QueryRequest req;
   req.SetTableName(MessageItem().getTableName());
   req.SetKeyConditionExpression(
       MessageItem::FIELD_TO_DEVICE_ID + " = :valueToMatch");
 
   AttributeValues attributeValues;
   attributeValues.emplace(":valueToMatch", toDeviceID);
 
   req.SetExpressionAttributeValues(attributeValues);
   const Aws::DynamoDB::Model::QueryOutcome &outcome =
       getDynamoDBClient()->Query(req);
   if (!outcome.IsSuccess()) {
     throw std::runtime_error(outcome.GetError().GetMessage());
   }
   const Aws::Vector<AttributeValues> &items = outcome.GetResult().GetItems();
   for (auto &item : items) {
     result.push_back(std::make_shared<MessageItem>(item));
   }
 
   return result;
 }
 
 void DatabaseManager::removeMessageItem(
     const std::string &toDeviceID,
     const std::string &messageID) {
   std::shared_ptr<MessageItem> item =
       this->findMessageItem(toDeviceID, messageID);
   if (item == nullptr) {
     return;
   }
   this->innerRemoveItem(*item);
 }
 
 void DatabaseManager::removeMessageItemsByIDsForDeviceID(
     std::vector<std::string> &messageIDs,
     const std::string &toDeviceID) {
   std::vector<Aws::DynamoDB::Model::WriteRequest> writeRequests;
   for (std::string &messageID : messageIDs) {
     Aws::DynamoDB::Model::DeleteRequest deleteRequest;
     deleteRequest.AddKey(
         MessageItem::FIELD_TO_DEVICE_ID,
         Aws::DynamoDB::Model::AttributeValue(toDeviceID));
     deleteRequest.AddKey(
         MessageItem::FIELD_MESSAGE_ID,
         Aws::DynamoDB::Model::AttributeValue(messageID));
     Aws::DynamoDB::Model::WriteRequest currentWriteRequest;
     currentWriteRequest.SetDeleteRequest(deleteRequest);
     writeRequests.push_back(currentWriteRequest);
   }
   this->innerBatchWriteItem(
       MessageItem().getTableName(),
       DYNAMODB_MAX_BATCH_ITEMS,
       DYNAMODB_BACKOFF_FIRST_RETRY_DELAY,
       DYNAMODB_MAX_BACKOFF_TIME,
       writeRequests);
 }
 
 } // namespace database
 } // namespace network
 } // namespace comm
diff --git a/services/tunnelbroker/src/libcpp/src/Database/DeviceSessionItem.cpp b/services/tunnelbroker/src/libcpp/src/Database/DeviceSessionItem.cpp
index ca78381a1..b10af5b68 100644
--- a/services/tunnelbroker/src/libcpp/src/Database/DeviceSessionItem.cpp
+++ b/services/tunnelbroker/src/libcpp/src/Database/DeviceSessionItem.cpp
@@ -1,134 +1,133 @@
 #include "DeviceSessionItem.h"
 #include "ConfigManager.h"
 #include "Tools.h"
 
 #include <vector>
 
 namespace comm {
 namespace network {
 namespace database {
 
 const std::string DeviceSessionItem::FIELD_SESSION_ID = "SessionID";
 const std::string DeviceSessionItem::FIELD_DEVICE_ID = "DeviceID";
 const std::string DeviceSessionItem::FIELD_PUBKEY = "PubKey";
 const std::string DeviceSessionItem::FIELD_NOTIFY_TOKEN = "NotifyToken";
 const std::string DeviceSessionItem::FIELD_DEVICE_TYPE = "DeviceType";
 const std::string DeviceSessionItem::FIELD_APP_VERSION = "AppVersion";
 const std::string DeviceSessionItem::FIELD_DEVICE_OS = "DeviceOS";
 const std::string DeviceSessionItem::FIELD_CHECKPOINT_TIME = "CheckpointTime";
 const std::string DeviceSessionItem::FIELD_EXPIRE = "Expire";
 const std::string DeviceSessionItem::FIELD_IS_ONLINE = "IsOnline";
 
 DeviceSessionItem::DeviceSessionItem(
     const std::string sessionID,
     const std::string deviceID,
     const std::string pubKey,
     const std::string notifyToken,
-    const std::string deviceType,
+    const size_t deviceType,
     const std::string appVersion,
     const std::string deviceOs)
     : sessionID(sessionID),
       deviceID(deviceID),
       pubKey(pubKey),
       notifyToken(notifyToken),
       deviceType(deviceType),
       appVersion(appVersion),
       deviceOs(deviceOs) {
   this->validate();
 }
 
 DeviceSessionItem::DeviceSessionItem(const AttributeValues &itemFromDB) {
   this->assignItemFromDatabase(itemFromDB);
 }
 
 void DeviceSessionItem::validate() const {
   if (!tools::validateSessionID(this->sessionID)) {
     throw std::runtime_error("Error: SessionID format is wrong.");
   }
   if (!tools::validateDeviceID(this->deviceID)) {
     throw std::runtime_error("Error: DeviceID format is wrong.");
   }
   tools::checkIfNotEmpty("pubKey", this->pubKey);
-  tools::checkIfNotEmpty("deviceType", this->deviceType);
   tools::checkIfNotEmpty("appVersion", this->appVersion);
   tools::checkIfNotEmpty("deviceOs", this->deviceOs);
 }
 
 void DeviceSessionItem::assignItemFromDatabase(
     const AttributeValues &itemFromDB) {
   try {
     this->sessionID = itemFromDB.at(DeviceSessionItem::FIELD_SESSION_ID).GetS();
     this->deviceID = itemFromDB.at(DeviceSessionItem::FIELD_DEVICE_ID).GetS();
     this->pubKey = itemFromDB.at(DeviceSessionItem::FIELD_PUBKEY).GetS();
     this->notifyToken =
         itemFromDB.at(DeviceSessionItem::FIELD_NOTIFY_TOKEN).GetS();
     this->deviceType =
-        itemFromDB.at(DeviceSessionItem::FIELD_DEVICE_TYPE).GetS();
+        std::stoul(itemFromDB.at(DeviceSessionItem::FIELD_DEVICE_TYPE).GetS());
     this->appVersion =
         itemFromDB.at(DeviceSessionItem::FIELD_APP_VERSION).GetS();
     this->deviceOs = itemFromDB.at(DeviceSessionItem::FIELD_DEVICE_OS).GetS();
     this->checkpointTime = std::stoll(
         std::string(
             itemFromDB.at(DeviceSessionItem::FIELD_CHECKPOINT_TIME).GetS())
             .c_str());
     this->isOnline =
         itemFromDB.at(DeviceSessionItem::FIELD_IS_ONLINE).GetBool();
   } catch (std::logic_error &e) {
     throw std::runtime_error(
         "Invalid device session database value " + std::string(e.what()));
   }
   this->validate();
 }
 
 std::string DeviceSessionItem::getTableName() const {
   return config::ConfigManager::getInstance().getParameter(
       config::ConfigManager::OPTION_DYNAMODB_SESSIONS_TABLE);
 }
 
 PrimaryKeyDescriptor DeviceSessionItem::getPrimaryKeyDescriptor() const {
   return PrimaryKeyDescriptor(DeviceSessionItem::FIELD_SESSION_ID);
 }
 
 PrimaryKeyValue DeviceSessionItem::getPrimaryKeyValue() const {
   return PrimaryKeyValue(this->sessionID);
 }
 
 std::string DeviceSessionItem::getSessionID() const {
   return this->sessionID;
 }
 
 std::string DeviceSessionItem::getDeviceID() const {
   return this->deviceID;
 }
 
 std::string DeviceSessionItem::getPubKey() const {
   return this->pubKey;
 }
 
 std::string DeviceSessionItem::getNotifyToken() const {
   return this->notifyToken;
 }
 
-std::string DeviceSessionItem::getDeviceType() const {
+size_t DeviceSessionItem::getDeviceType() const {
   return this->deviceType;
 }
 
 std::string DeviceSessionItem::getAppVersion() const {
   return this->appVersion;
 }
 
 std::string DeviceSessionItem::getDeviceOs() const {
   return this->deviceOs;
 }
 
 int64_t DeviceSessionItem::getCheckpointTime() const {
   return this->checkpointTime;
 }
 
 bool DeviceSessionItem::getIsOnline() const {
   return this->isOnline;
 }
 
 } // namespace database
 } // namespace network
 } // namespace comm
diff --git a/services/tunnelbroker/src/libcpp/src/Database/DeviceSessionItem.h b/services/tunnelbroker/src/libcpp/src/Database/DeviceSessionItem.h
index fd8975306..e574efcb2 100644
--- a/services/tunnelbroker/src/libcpp/src/Database/DeviceSessionItem.h
+++ b/services/tunnelbroker/src/libcpp/src/Database/DeviceSessionItem.h
@@ -1,65 +1,67 @@
 #pragma once
 
 #include "Item.h"
 
 #include <string>
 
 namespace comm {
 namespace network {
 namespace database {
 
 class DeviceSessionItem : public Item {
   std::string sessionID;
   std::string deviceID;
   std::string pubKey;
   std::string notifyToken;
-  std::string deviceType;
+  size_t deviceType;
   std::string appVersion;
   std::string deviceOs;
   int64_t checkpointTime = 0;
   bool isOnline = false;
 
   void validate() const override;
 
 public:
   static const std::string FIELD_SESSION_ID;
   static const std::string FIELD_DEVICE_ID;
   static const std::string FIELD_PUBKEY;
   static const std::string FIELD_NOTIFY_TOKEN;
   static const std::string FIELD_DEVICE_TYPE;
   static const std::string FIELD_APP_VERSION;
   static const std::string FIELD_DEVICE_OS;
   static const std::string FIELD_CHECKPOINT_TIME;
   static const std::string FIELD_EXPIRE;
   static const std::string FIELD_IS_ONLINE;
 
+  enum DeviceTypes { MOBILE = 0, WEB = 1, KEYSERVER = 2 };
+
   PrimaryKeyDescriptor getPrimaryKeyDescriptor() const override;
   PrimaryKeyValue getPrimaryKeyValue() const override;
   std::string getTableName() const override;
   std::string getSessionID() const;
   std::string getDeviceID() const;
   std::string getPubKey() const;
   std::string getNotifyToken() const;
-  std::string getDeviceType() const;
+  size_t getDeviceType() const;
   std::string getAppVersion() const;
   std::string getDeviceOs() const;
   int64_t getCheckpointTime() const;
   bool getIsOnline() const;
 
   DeviceSessionItem() {
   }
   DeviceSessionItem(
       const std::string sessionID,
       const std::string deviceID,
       const std::string pubKey,
       const std::string notifyToken,
-      const std::string deviceType,
+      size_t deviceType,
       const std::string appVersion,
       const std::string deviceOs);
   DeviceSessionItem(const AttributeValues &itemFromDB);
   void assignItemFromDatabase(const AttributeValues &itemFromDB) override;
 };
 
 } // namespace database
 } // namespace network
 } // namespace comm
diff --git a/services/tunnelbroker/src/libcpp/test/DatabaseManagerTest.cpp b/services/tunnelbroker/src/libcpp/test/DatabaseManagerTest.cpp
index ff2e59a2d..90779e415 100644
--- a/services/tunnelbroker/src/libcpp/test/DatabaseManagerTest.cpp
+++ b/services/tunnelbroker/src/libcpp/test/DatabaseManagerTest.cpp
@@ -1,462 +1,462 @@
 #include "DatabaseManager.h"
 #include "ConfigManager.h"
 #include "Constants.h"
 #include "GlobalTools.h"
 #include "Tools.h"
 
 #include <gtest/gtest.h>
 
 #include <ctime>
 #include <memory>
 #include <string>
 
 using namespace comm::network;
 
 class DatabaseManagerTest : public testing::Test {
 protected:
   virtual void SetUp() {
     config::ConfigManager::getInstance().load();
     Aws::InitAPI({});
   }
 
   virtual void TearDown() {
     Aws::ShutdownAPI({});
   }
 };
 
 TEST_F(DatabaseManagerTest, PutAndFoundMessageItemsStaticDataIsSame) {
   const database::MessageItem item(
       "bc0c1aa2-bf09-11ec-9d64-0242ac120002",
       "mobile:EMQNoQ7b2ueEmQ4QsevRWlXxFCNt055y20T1PHdoYAQRt0S6TLzZWNM6XSvdWqxm",
       "web:JouLWf84zqRIsjBdHLOcHS9M4eSCz7VF84wT1uOD83u1qxDAqmqI4swmxNINjuhd",
       "lYlNcO6RR4i9UW3G1DGjdJTRRGbqtPya2aj94ZRjIGZWoHwT5MB9ciAgnQf2VafYb9Tl"
       "8SZkX37tg4yZ9pOb4lqslY4g4h58OmWjumghVRvrPUZDalUuK8OLs1Qoengpu9wccxAk"
       "Bti2leDTNeiJDy36NnwS9aCIUc0ozsMvXfX1gWdBdmKbiRG1LvpNd6S7BNGG7Zly5zYj"
       "xz7s6ZUSDoFfZe3eJWQ15ngYhgMw1TsfbECnMVQTYvY6OyqWPBQi5wiftFcluoxor8G5"
       "RJ1NEDQq2q2FRfWjNHLhky92C2C7Nnfe4oVzSinfC1319uUkNLpSzI4MvEMi6g5Ukbl7"
       "iGhpnX7Hp4xpBL3h2IkvGviDRQ98UvW0ugwUuPxm1NOQpjLG5dPoqQ0jrMst0Bl5rgPw"
       "ajjNGsUWmp9r0ST0wRQXrQcY30PoSoqKSlCEgFMLzHWLrPQ86QFyCICismGSe7iBIqdD"
       "6d37StvXBzfJoZVU79UeOF2bFvb3DNoArEOe",
       "7s6ZUSDoFfZe3eJWQ15ngYhgMw1TsfbECnMVQTYvY6OyqWPBQi5wiftFcluoxor8");
   const size_t currentTimestamp = tools::getCurrentTimestamp();
   EXPECT_EQ(
       database::DatabaseManager::getInstance().isTableAvailable(
           item.getTableName()),
       true);
   database::DatabaseManager::getInstance().putMessageItem(item);
   std::shared_ptr<database::MessageItem> foundItem =
       database::DatabaseManager::getInstance().findMessageItem(
           item.getToDeviceID(), item.getMessageID());
   EXPECT_NE(foundItem, nullptr);
   EXPECT_EQ(item.getFromDeviceID(), foundItem->getFromDeviceID());
   EXPECT_EQ(item.getToDeviceID(), foundItem->getToDeviceID());
   EXPECT_EQ(item.getPayload(), foundItem->getPayload());
   EXPECT_EQ(item.getBlobHashes(), foundItem->getBlobHashes());
   EXPECT_EQ(
       (foundItem->getExpire() >= static_cast<size_t>(std::time(0))) &&
           (foundItem->getExpire() <=
            static_cast<size_t>(std::time(0) + MESSAGE_RECORD_TTL)),
       true);
   EXPECT_EQ(
       foundItem->getCreatedAt() >= currentTimestamp &&
           foundItem->getCreatedAt() <= tools::getCurrentTimestamp(),
       true);
   database::DatabaseManager::getInstance().removeMessageItem(
       item.getToDeviceID(), item.getMessageID());
 }
 
 TEST_F(DatabaseManagerTest, PutAndFoundMessageItemsGeneratedDataIsSame) {
   const database::MessageItem item(
       tools::generateUUID(),
       "mobile:" + tools::generateRandomString(DEVICEID_CHAR_LENGTH),
       "web:" + tools::generateRandomString(DEVICEID_CHAR_LENGTH),
       tools::generateRandomString(256),
       tools::generateRandomString(256));
   EXPECT_EQ(
       database::DatabaseManager::getInstance().isTableAvailable(
           item.getTableName()),
       true);
   database::DatabaseManager::getInstance().putMessageItem(item);
   std::shared_ptr<database::MessageItem> foundItem =
       database::DatabaseManager::getInstance().findMessageItem(
           item.getToDeviceID(), item.getMessageID());
   EXPECT_NE(foundItem, nullptr);
   EXPECT_EQ(item.getFromDeviceID(), foundItem->getFromDeviceID())
       << "Generated FromDeviceID \"" << item.getFromDeviceID()
       << "\" differs from what is found in the database "
       << foundItem->getFromDeviceID();
   EXPECT_EQ(item.getToDeviceID(), foundItem->getToDeviceID())
       << "Generated ToDeviceID \"" << item.getToDeviceID()
       << "\" differs from what is found in the database "
       << foundItem->getToDeviceID();
   EXPECT_EQ(item.getPayload(), foundItem->getPayload())
       << "Generated Payload \"" << item.getPayload()
       << "\" differs from what is found in the database "
       << foundItem->getPayload();
   EXPECT_EQ(item.getBlobHashes(), foundItem->getBlobHashes())
       << "Generated BlobHashes \"" << item.getBlobHashes()
       << "\" differs from what is found in the database "
       << foundItem->getBlobHashes();
   database::DatabaseManager::getInstance().removeMessageItem(
       item.getToDeviceID(), item.getMessageID());
 }
 
 TEST_F(DatabaseManagerTest, BatchPutAndFoundMessagesItemsCountIsSame) {
   const std::string receiverID =
       "web:JouLWf84zqRIsjBdHLOcHS9M4eSCz7VF84wT1uOD83u1qxDAqmqI4swmxNINjuhd";
   const size_t itemsSize = 29;
   std::vector<database::MessageItem> messageItems;
 
   for (size_t i = 1; i <= itemsSize; ++i) {
     database::MessageItem item{
         tools::generateUUID(),
         "mobile:" + tools::generateRandomString(DEVICEID_CHAR_LENGTH),
         receiverID,
         tools::generateRandomString(256),
         tools::generateRandomString(256)};
     messageItems.push_back(item);
   }
   EXPECT_EQ(
       database::DatabaseManager::getInstance().isTableAvailable(
           messageItems[0].getTableName()),
       true);
   database::DatabaseManager::getInstance().putMessageItemsByBatch(messageItems);
   std::vector<std::shared_ptr<database::MessageItem>> foundItems =
       database::DatabaseManager::getInstance().findMessageItemsByReceiver(
           receiverID);
   EXPECT_EQ(foundItems.size(), itemsSize);
   for (std::shared_ptr<database::MessageItem> messageItem : foundItems) {
     database::DatabaseManager::getInstance().removeMessageItem(
         messageItem->getToDeviceID(), messageItem->getMessageID());
   }
 }
 
 TEST_F(DatabaseManagerTest, PutAndFoundDeviceSessionItemStaticDataIsSame) {
   const database::DeviceSessionItem item(
       "bc0c1aa2-bf09-11ec-9d64-0242ac120002",
       "mobile:"
       "EMQNoQ7b2ueEmQ4QsevRWlXxFCNt055y20T1PHdoYAQRt0S6TLzZWNM6XSvdWqxm",
       "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC9Q9wodsQdZNynbTnC35hA4mFW"
       "mwZf9BhbI93aGAwPF9au0eYsawRz0jtYi4lSFXC9KleyQDg+6J+UW1kiWvE3ZRYG"
       "ECqgx4zqajPTzVt7EAOGaIh/dPyQ6x2Ul1GlkkSYXUhhixEzExGp9g84eCyVkbCB"
       "U3SK6SNKyR7anAXDVQIDAQAB",
       "hbI93aGAwPF9au0eYsawRz0jtYi4lSFXC9KleyQDg+6J+UW1kiWvE3",
-      "phone",
+      database::DeviceSessionItem::DeviceTypes::MOBILE,
       "ios:1.1.1",
       "iOS 99.99.99");
   EXPECT_EQ(
       database::DatabaseManager::getInstance().isTableAvailable(
           item.getTableName()),
       true);
   database::DatabaseManager::getInstance().putSessionItem(item);
   std::shared_ptr<database::DeviceSessionItem> foundItem =
       database::DatabaseManager::getInstance().findSessionItem(
           item.getSessionID());
   EXPECT_NE(foundItem, nullptr);
   EXPECT_EQ(item.getDeviceID(), foundItem->getDeviceID());
   EXPECT_EQ(item.getPubKey(), foundItem->getPubKey());
   EXPECT_EQ(item.getNotifyToken(), foundItem->getNotifyToken());
   EXPECT_EQ(item.getDeviceType(), foundItem->getDeviceType());
   EXPECT_EQ(item.getAppVersion(), foundItem->getAppVersion());
   EXPECT_EQ(item.getDeviceOs(), foundItem->getDeviceOs());
   database::DatabaseManager::getInstance().removeSessionItem(
       item.getSessionID());
 }
 
 TEST_F(DatabaseManagerTest, PutAndFoundDeviceSessionItemGeneratedDataIsSame) {
   const database::DeviceSessionItem item(
       tools::generateUUID(),
       "mobile:" + tools::generateRandomString(DEVICEID_CHAR_LENGTH),
       tools::generateRandomString(451),
       tools::generateRandomString(64),
-      tools::generateRandomString(12),
+      database::DeviceSessionItem::DeviceTypes::MOBILE,
       tools::generateRandomString(12),
       tools::generateRandomString(12));
   EXPECT_EQ(
       database::DatabaseManager::getInstance().isTableAvailable(
           item.getTableName()),
       true);
   database::DatabaseManager::getInstance().putSessionItem(item);
   std::shared_ptr<database::DeviceSessionItem> foundItem =
       database::DatabaseManager::getInstance().findSessionItem(
           item.getSessionID());
   EXPECT_NE(foundItem, nullptr);
   EXPECT_EQ(item.getDeviceID(), foundItem->getDeviceID())
       << "Generated DeviceID \"" << item.getDeviceID()
       << "\" differs from what is found in the database "
       << foundItem->getDeviceID();
   EXPECT_EQ(item.getPubKey(), foundItem->getPubKey())
       << "Generated PubKey \"" << item.getPubKey()
       << "\" differs from what is found in the database "
       << foundItem->getPubKey();
   EXPECT_EQ(item.getNotifyToken(), foundItem->getNotifyToken())
       << "Generated NotifyToken \"" << item.getNotifyToken()
       << "\" differs from what is found in the database "
       << foundItem->getNotifyToken();
   EXPECT_EQ(item.getDeviceType(), foundItem->getDeviceType())
       << "Generated DeviceType \"" << item.getDeviceType()
       << "\" differs from what is found in the database "
       << foundItem->getDeviceType();
   EXPECT_EQ(item.getAppVersion(), foundItem->getAppVersion())
       << "Generated AppVersion \"" << item.getAppVersion()
       << "\" differs from what is found in the database "
       << foundItem->getAppVersion();
   EXPECT_EQ(item.getDeviceOs(), foundItem->getDeviceOs())
       << "Generated DeviceOS \"" << item.getDeviceOs()
       << "\" differs from what is found in the database "
       << foundItem->getDeviceOs();
   database::DatabaseManager::getInstance().removeSessionItem(
       item.getSessionID());
 }
 
 TEST_F(DatabaseManagerTest, UpdateIsOnlineDeviceSessionItem) {
   const database::DeviceSessionItem item(
       "bc0c1aa2-bf09-11ec-9d64-0242ac120002",
       "mobile:"
       "EMQNoQ7b2ueEmQ4QsevRWlXxFCNt055y20T1PHdoYAQRt0S6TLzZWNM6XSvdWqxm",
       "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC9Q9wodsQdZNynbTnC35hA4mFW"
       "mwZf9BhbI93aGAwPF9au0eYsawRz0jtYi4lSFXC9KleyQDg+6J+UW1kiWvE3ZRYG"
       "ECqgx4zqajPTzVt7EAOGaIh/dPyQ6x2Ul1GlkkSYXUhhixEzExGp9g84eCyVkbCB"
       "U3SK6SNKyR7anAXDVQIDAQAB",
       "hbI93aGAwPF9au0eYsawRz0jtYi4lSFXC9KleyQDg+6J+UW1kiWvE3",
-      "phone",
+      database::DeviceSessionItem::DeviceTypes::MOBILE,
       "ios:1.1.1",
       "iOS 99.99.99");
   EXPECT_EQ(
       database::DatabaseManager::getInstance().isTableAvailable(
           item.getTableName()),
       true);
   database::DatabaseManager::getInstance().putSessionItem(item);
   std::shared_ptr<database::DeviceSessionItem> foundItem =
       database::DatabaseManager::getInstance().findSessionItem(
           item.getSessionID());
   EXPECT_NE(foundItem, nullptr);
   EXPECT_FALSE(foundItem->getIsOnline());
 
   database::DatabaseManager::getInstance().updateSessionItemIsOnline(
       item.getSessionID(), true);
   foundItem = database::DatabaseManager::getInstance().findSessionItem(
       item.getSessionID());
   EXPECT_NE(foundItem, nullptr);
   EXPECT_TRUE(foundItem->getIsOnline());
 
   database::DatabaseManager::getInstance().removeSessionItem(
       item.getSessionID());
 }
 
 TEST_F(DatabaseManagerTest, UpdateNotifTokenInDeviceSessionItem) {
   const database::DeviceSessionItem item(
       "bc0c1aa2-bf09-11ec-9d64-0242ac120002",
       "mobile:"
       "EMQNoQ7b2ueEmQ4QsevRWlXxFCNt055y20T1PHdoYAQRt0S6TLzZWNM6XSvdWqxm",
       "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC9Q9wodsQdZNynbTnC35hA4mFW"
       "mwZf9BhbI93aGAwPF9au0eYsawRz0jtYi4lSFXC9KleyQDg+6J+UW1kiWvE3ZRYG"
       "ECqgx4zqajPTzVt7EAOGaIh/dPyQ6x2Ul1GlkkSYXUhhixEzExGp9g84eCyVkbCB"
       "U3SK6SNKyR7anAXDVQIDAQAB",
       "hbI93aGAwPF9au0eYsawRz0jtYi4lSFXC9KleyQDg+6J+UW1kiWvE3",
-      "phone",
+      database::DeviceSessionItem::DeviceTypes::MOBILE,
       "ios:1.1.1",
       "iOS 99.99.99");
   EXPECT_EQ(
       database::DatabaseManager::getInstance().isTableAvailable(
           item.getTableName()),
       true);
   database::DatabaseManager::getInstance().putSessionItem(item);
   std::shared_ptr<database::DeviceSessionItem> foundItem =
       database::DatabaseManager::getInstance().findSessionItem(
           item.getSessionID());
   EXPECT_NE(foundItem, nullptr);
   EXPECT_EQ(foundItem->getNotifyToken(), item.getNotifyToken());
 
   const std::string newToken =
       "HDVRgx4zqajPTzVt7EAOGaIh/dPyQ6x2Ul1GlkkSYXUhhixEzExGp9g84eCyVGHT";
   database::DatabaseManager::getInstance().updateSessionItemDeviceToken(
       item.getSessionID(), newToken);
 
   foundItem = database::DatabaseManager::getInstance().findSessionItem(
       item.getSessionID());
   EXPECT_NE(foundItem, nullptr);
   EXPECT_EQ(foundItem->getNotifyToken(), newToken);
 
   database::DatabaseManager::getInstance().removeSessionItem(
       item.getSessionID());
 }
 
 TEST_F(DatabaseManagerTest, PutAndFoundSessionSignItemStaticDataIsSame) {
   const database::SessionSignItem item(
       "bB3OSLdKlY60KPBpw6VoGKX7Lmw3SA07FmNhnqnclvVeaxXueAQ0dpQSpiQTtlGn",
       "mobile:"
       "EMQNoQ7b2ueEmQ4QsevRWlXxFCNt055y20T1PHdoYAQRt0S6TLzZWNM6XSvdWqxm");
   EXPECT_EQ(
       database::DatabaseManager::getInstance().isTableAvailable(
           item.getTableName()),
       true);
   database::DatabaseManager::getInstance().putSessionSignItem(item);
   std::shared_ptr<database::SessionSignItem> foundItem =
       database::DatabaseManager::getInstance().findSessionSignItem(
           item.getDeviceID());
   EXPECT_NE(foundItem, nullptr);
   EXPECT_EQ(item.getSign(), foundItem->getSign());
   database::DatabaseManager::getInstance().removeSessionSignItem(
       item.getDeviceID());
 }
 
 TEST_F(DatabaseManagerTest, PutAndFoundSessionSignItemGeneratedDataIsSame) {
   const database::SessionSignItem item(
       tools::generateRandomString(SIGNATURE_REQUEST_LENGTH),
       "mobile:" + tools::generateRandomString(DEVICEID_CHAR_LENGTH));
   EXPECT_EQ(
       database::DatabaseManager::getInstance().isTableAvailable(
           item.getTableName()),
       true);
   database::DatabaseManager::getInstance().putSessionSignItem(item);
   std::shared_ptr<database::SessionSignItem> foundItem =
       database::DatabaseManager::getInstance().findSessionSignItem(
           item.getDeviceID());
   EXPECT_NE(foundItem, nullptr) << "Item with the key of deviceID \""
                                 << item.getDeviceID() << "\" is not found";
   EXPECT_EQ(item.getSign(), foundItem->getSign())
       << "Generated signature value \"" << item.getSign()
       << "\" is not equal of \"" + foundItem->getSign() +
           "\" from the database value";
   database::DatabaseManager::getInstance().removeSessionSignItem(
       item.getDeviceID());
 }
 
 TEST_F(DatabaseManagerTest, PutAndFoundPublicKeyItemsStaticDataIsSame) {
   const database::PublicKeyItem item(
       "mobile:"
       "EMQNoQ7b2ueEmQ4QsevRWlXxFCNt055y20T1PHdoYAQRt0S6TLzZWNM6XSvdWqxm",
       "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC9Q9wodsQdZNynbTnC35hA4mFW"
       "mwZf9BhbI93aGAwPF9au0eYsawRz0jtYi4lSFXC9KleyQDg+6J+UW1kiWvE3ZRYG"
       "ECqgx4zqajPTzVt7EAOGaIh/dPyQ6x2Ul1GlkkSYXUhhixEzExGp9g84eCyVkbCB"
       "U3SK6SNKyR7anAXDVQIDAQAB");
   EXPECT_EQ(
       database::DatabaseManager::getInstance().isTableAvailable(
           item.getTableName()),
       true);
   database::DatabaseManager::getInstance().putPublicKeyItem(item);
   std::shared_ptr<database::PublicKeyItem> foundItem =
       database::DatabaseManager::getInstance().findPublicKeyItem(
           item.getDeviceID());
   EXPECT_NE(foundItem, nullptr);
   EXPECT_EQ(item.getPublicKey(), foundItem->getPublicKey());
   database::DatabaseManager::getInstance().removePublicKeyItem(
       item.getDeviceID());
 }
 
 TEST_F(DatabaseManagerTest, PutAndFoundPublicKeyItemsGeneratedDataIsSame) {
   const database::PublicKeyItem item(
       "mobile:" + tools::generateRandomString(DEVICEID_CHAR_LENGTH),
       tools::generateRandomString(451));
   EXPECT_EQ(
       database::DatabaseManager::getInstance().isTableAvailable(
           item.getTableName()),
       true);
   database::DatabaseManager::getInstance().putPublicKeyItem(item);
   std::shared_ptr<database::PublicKeyItem> foundItem =
       database::DatabaseManager::getInstance().findPublicKeyItem(
           item.getDeviceID());
   EXPECT_NE(foundItem, nullptr);
   EXPECT_EQ(item.getPublicKey(), foundItem->getPublicKey())
       << "Generated PublicKey \"" << item.getPublicKey()
       << "\" differs from what is found in the database "
       << foundItem->getPublicKey();
   database::DatabaseManager::getInstance().removePublicKeyItem(
       item.getDeviceID());
 }
 
 TEST_F(DatabaseManagerTest, PutAndFoundByReceiverMessageItemsDataIsSame) {
   const std::string receiverID =
       "mobile:"
       "EMQNoQ7b2ueEmQ4QsevRWlXxFCNt055y20T1PHdoYAQRt0S6TLzZWNM6XSvdWqxm";
   const database::MessageItem item(
       "bc0c1aa2-bf09-11ec-9d64-0242ac120002",
       "mobile:"
       "EMQNoQ7b2ueEmQ4QsevRWlXxFCNt055y20T1PHdoYAQRt0S6TLzZWNM6XSvdWqxm",
       receiverID,
       "lYlNcO6RR4i9UW3G1DGjdJTRRGbqtPya2aj94ZRjIGZWoHwT5MB9ciAgnQf2VafYb9Tl"
       "8SZkX37tg4yZ9pOb4lqslY4g4h58OmWjumghVRvrPUZDalUuK8OLs1Qoengpu9wccxAk"
       "Bti2leDTNeiJDy36NnwS9aCIUc0ozsMvXfX1gWdBdmKbiRG1LvpNd6S7BNGG7Zly5zYj"
       "xz7s6ZUSDoFfZe3eJWQ15ngYhgMw1TsfbECnMVQTYvY6OyqWPBQi5wiftFcluoxor8G5"
       "RJ1NEDQq2q2FRfWjNHLhky92C2C7Nnfe4oVzSinfC1319uUkNLpSzI4MvEMi6g5Ukbl7"
       "iGhpnX7Hp4xpBL3h2IkvGviDRQ98UvW0ugwUuPxm1NOQpjLG5dPoqQ0jrMst0Bl5rgPw"
       "ajjNGsUWmp9r0ST0wRQXrQcY30PoSoqKSlCEgFMLzHWLrPQ86QFyCICismGSe7iBIqdD"
       "6d37StvXBzfJoZVU79UeOF2bFvb3DNoArEOe",
       "7s6ZUSDoFfZe3eJWQ15ngYhgMw1TsfbECnMVQTYvY6OyqWPBQi5wiftFcluoxor8");
   EXPECT_EQ(
       database::DatabaseManager::getInstance().isTableAvailable(
           item.getTableName()),
       true);
   database::DatabaseManager::getInstance().putMessageItem(item);
   std::vector<std::shared_ptr<database::MessageItem>> foundItems =
       database::DatabaseManager::getInstance().findMessageItemsByReceiver(
           receiverID);
   EXPECT_NE(foundItems.size(), 0);
   EXPECT_EQ(item.getFromDeviceID(), foundItems[0]->getFromDeviceID());
   EXPECT_EQ(item.getToDeviceID(), foundItems[0]->getToDeviceID());
   EXPECT_EQ(item.getPayload(), foundItems[0]->getPayload());
   EXPECT_EQ(item.getBlobHashes(), foundItems[0]->getBlobHashes());
   EXPECT_EQ(
       (foundItems[0]->getExpire() >= static_cast<size_t>(std::time(0))) &&
           (foundItems[0]->getExpire() <=
            static_cast<size_t>(std::time(0) + MESSAGE_RECORD_TTL)),
       true);
   database::DatabaseManager::getInstance().removeMessageItem(
       item.getToDeviceID(), item.getMessageID());
 }
 
 TEST_F(DatabaseManagerTest, RemoveMessageItemsInBatch) {
   const size_t randomStringSize = 256;
   const std::string receiverID =
       "mobile:EMQNoQ7b2ueEmQ4QsevRWlXxFCNt055y20T1PHdoYAQRt0S6TLzZWNM6XSvdWqxm";
   const database::MessageItem messageFirstToRemove(
       tools::generateUUID(),
       "mobile:" + tools::generateRandomString(DEVICEID_CHAR_LENGTH),
       receiverID,
       tools::generateRandomString(randomStringSize),
       tools::generateRandomString(randomStringSize));
   const database::MessageItem messageSecondToRemove(
       tools::generateUUID(),
       "web:" + tools::generateRandomString(DEVICEID_CHAR_LENGTH),
       receiverID,
       tools::generateRandomString(randomStringSize),
       tools::generateRandomString(randomStringSize));
   const database::MessageItem messageThirdToNotRemove(
       tools::generateUUID(),
       "web:" + tools::generateRandomString(DEVICEID_CHAR_LENGTH),
       receiverID,
       tools::generateRandomString(randomStringSize),
       tools::generateRandomString(randomStringSize));
 
   EXPECT_EQ(
       database::DatabaseManager::getInstance().isTableAvailable(
           messageFirstToRemove.getTableName()),
       true);
   database::DatabaseManager::getInstance().putMessageItem(messageFirstToRemove);
   database::DatabaseManager::getInstance().putMessageItem(
       messageSecondToRemove);
   database::DatabaseManager::getInstance().putMessageItem(
       messageThirdToNotRemove);
   std::vector<std::shared_ptr<database::MessageItem>> foundItems =
       database::DatabaseManager::getInstance().findMessageItemsByReceiver(
           receiverID);
   EXPECT_EQ(foundItems.size(), 3)
       << "Items count found by receiverID after insert is not equal to 3";
   std::vector<std::string> messageIDs = {
       messageFirstToRemove.getMessageID(),
       messageSecondToRemove.getMessageID()};
   database::DatabaseManager::getInstance().removeMessageItemsByIDsForDeviceID(
       messageIDs, receiverID);
   foundItems =
       database::DatabaseManager::getInstance().findMessageItemsByReceiver(
           receiverID);
   // `messageThirdToNotRemove` must not be removed and must be persisted
   EXPECT_EQ(foundItems.size(), 1)
       << "Items found by receiverID is not equal to 1 after calling "
          "`removeMessageItemsByIDsForDeviceID`. The one message must be "
          "persisted.";
   database::DatabaseManager::getInstance().removeMessageItem(
       messageThirdToNotRemove.getToDeviceID(),
       messageThirdToNotRemove.getMessageID());
 }