From be9c951d025fc7083c736b7cb6a091446f686b9e Mon Sep 17 00:00:00 2001 From: Martin Brodbeck Date: Tue, 10 Jul 2018 12:51:03 +0200 Subject: [PATCH] more work on entities --- src/core/entity.cpp | 11 +++++++---- src/core/entity.h | 9 ++++++--- src/core/seller.cpp | 10 +++++----- src/core/seller.h | 10 +++++----- 4 files changed, 23 insertions(+), 17 deletions(-) diff --git a/src/core/entity.cpp b/src/core/entity.cpp index df76d01..c2a0313 100644 --- a/src/core/entity.cpp +++ b/src/core/entity.cpp @@ -5,18 +5,21 @@ #include #include -//Entity::Entity() {} - Entity::~Entity() {} void Entity::createUuid() { static boost::uuids::random_generator generator{}; - uuid = generator(); + uuid_ = generator(); } void Entity::createUuidFromString(const std::string& uuidString) { boost::uuids::string_generator generator{}; - uuid = generator(uuidString); + uuid_ = generator(uuidString); +} + +inline Entity::State Entity::getState() +{ + return state_; } \ No newline at end of file diff --git a/src/core/entity.h b/src/core/entity.h index e416ea7..d67cc73 100644 --- a/src/core/entity.h +++ b/src/core/entity.h @@ -8,14 +8,17 @@ class Entity { public: - //Entity(); + enum class State { NEW, UPDATED, READ }; + // Entity(); virtual ~Entity() = 0; - const boost::uuids::uuid& getUuid() const { return uuid; }; + const boost::uuids::uuid& getUuid() const { return uuid_; }; void createUuid(); void createUuidFromString(const std::string& uuidString); + State getState(); private: - boost::uuids::uuid uuid{}; + boost::uuids::uuid uuid_{}; + State state_{State::NEW}; }; #endif // ENTITY_H \ No newline at end of file diff --git a/src/core/seller.cpp b/src/core/seller.cpp index 58861bd..e4de084 100644 --- a/src/core/seller.cpp +++ b/src/core/seller.cpp @@ -2,25 +2,25 @@ void Seller::setSellerNo(int seller_no) { - this->sellerNo = seller_no; + sellerNo_ = seller_no; } void Seller::setFirstName(const std::string& firstName) { - this->firstName = firstName; + firstName_ = firstName; } void Seller::setLastName(const std::string& lastName) { - this->lastName = lastName; + lastName_ = lastName; } void Seller::setNumberOfOfferedArticles(int number) { - numberOfOfferedArticles = number; + numberOfOfferedArticles_ = number; } size_t Seller::getNumberOfOfferedArticles() { - return articles.size(); + return articles_.size(); } \ No newline at end of file diff --git a/src/core/seller.h b/src/core/seller.h index 16edd98..2848579 100644 --- a/src/core/seller.h +++ b/src/core/seller.h @@ -20,11 +20,11 @@ class Seller : public Entity size_t getNumberOfOfferedArticles(); private: - int sellerNo{}; - int numberOfOfferedArticles{}; - std::string firstName{}; - std::string lastName{}; - std::vector
articles{}; + int sellerNo_{-1}; + int numberOfOfferedArticles_{}; + std::string firstName_{}; + std::string lastName_{}; + std::vector
articles_{}; }; #endif \ No newline at end of file