diff --git a/services/backup/CMakeLists.txt b/services/backup/CMakeLists.txt --- a/services/backup/CMakeLists.txt +++ b/services/backup/CMakeLists.txt @@ -28,6 +28,7 @@ file(GLOB_RECURSE SOURCE_CODE "./src/*.cpp") include_directories( + ./lib_src ./src ./src/grpc-client ./src/DatabaseEntities diff --git a/services/blob/CMakeLists.txt b/services/blob/CMakeLists.txt --- a/services/blob/CMakeLists.txt +++ b/services/blob/CMakeLists.txt @@ -29,6 +29,7 @@ file(GLOB SOURCE_CODE "./src/*.cpp" "./src/**/*.cpp") include_directories( + ./lib_src ./src ./src/DatabaseEntities ./src/Reactors/ diff --git a/services/blob/src/DatabaseEntities/Item.h b/services/blob/src/DatabaseEntities/Item.h deleted file mode 100644 --- a/services/blob/src/DatabaseEntities/Item.h +++ /dev/null @@ -1,49 +0,0 @@ -#pragma once - -#include -#include - -#include -#include - -namespace comm { -namespace network { -namespace database { - -typedef Aws::Map - AttributeValues; - -struct PrimaryKeyBase { - PrimaryKeyBase(const std::string partitionKey) - : partitionKey(partitionKey), sortKey(nullptr) { - } - PrimaryKeyBase(const std::string partitionKey, const std::string sortKey) - : partitionKey(partitionKey), - sortKey(std::make_unique(sortKey)) { - } - - const std::string partitionKey; - std::unique_ptr sortKey; -}; - -struct PrimaryKey : PrimaryKeyBase { - using PrimaryKeyBase::PrimaryKeyBase; -}; - -struct PrimaryKeyValue : PrimaryKeyBase { - using PrimaryKeyBase::PrimaryKeyBase; -}; - -class Item { - virtual void validate() const = 0; - -public: - virtual std::string getTableName() const = 0; - virtual PrimaryKey getPrimaryKey() const = 0; - virtual PrimaryKeyValue getPrimaryKeyValue() const = 0; - virtual void assignItemFromDatabase(const AttributeValues &itemFromDB) = 0; -}; - -} // namespace database -} // namespace network -} // namespace comm diff --git a/services/backup/src/DatabaseEntities/Item.h b/services/lib/lib_src/Item.h rename from services/backup/src/DatabaseEntities/Item.h rename to services/lib/lib_src/Item.h