refacturing

src/core/article.cpp

@@ -2,7 +2,7 @@
 
 Article::Article() : Entity() {}
 
-Article::Article(std::shared_ptr<Seller> sellerPtr) : Entity() { sellerPtr_ = sellerPtr; }
+// Article::Article(std::shared_ptr<Seller> sellerPtr) : Entity() { sellerPtr_ = sellerPtr; }
 
 void Article::setArticleNo(int articleNo) { articleNo_ = articleNo; }
 
@@ -10,12 +10,14 @@ void Article::setPrice(int price) { price_ = price; }
 
 void Article::setDescription(const std::string& description) { description_ = description; }
 
-void Article::setSale(std::shared_ptr<Sale> salePtr) { salePtr_ = salePtr; }
+void Article::setSale(Sale* salePtr) { salePtr_ = salePtr; }
+
+void Article::setSeller(Seller* sellerPtr) { sellerPtr_ = sellerPtr; }
 
 bool Article::isSold() { return salePtr_ ? true : false; }
 
 std::string Article::getDescription() { return description_; }
 
-Seller* Article::getSeller() { return sellerPtr_.get(); }
+Seller* Article::getSeller() { return sellerPtr_; }
 
 int Article::getPrice() { return price_; }

src/core/article.h

@@ -15,21 +15,22 @@ class Article : public Entity
 {
   public:
     Article();
-    Article(std::shared_ptr<Seller> sellerPtr);
+    //Article(std::shared_ptr<Seller> sellerPtr);
     void setArticleNo(int articleNo);
     void setPrice(int price);
     void setDescription(const std::string& description);
     bool isSold();
-    void setSale(std::shared_ptr<Sale> salePtr);
-    void setSeller(std::shared_ptr<Seller> sellerPtr);
+    void setSale(Sale* salePtr);
+    //void setSeller(std::shared_ptr<Seller> sellerPtr);
+    void setSeller(Seller* sellerPtr);
 
     std::string getDescription();
     Seller* getSeller();
     int getPrice();
 
   private:
-    std::shared_ptr<Seller> sellerPtr_{};
-    std::shared_ptr<Sale> salePtr_{};
+    Seller* sellerPtr_{};
+    Sale* salePtr_{};
     int articleNo_{};
     int price_{};
     std::string description_{};

src/core/database.cpp

@@ -174,7 +174,7 @@ unsigned int Database::storeSellers(std::vector<Seller>& sellers)
             sqlite3_bind_text(stmt, sqlite3_bind_parameter_index(stmt, ":last_name"),
                               seller.getLastName().c_str(), -1, nullptr);
             sqlite3_bind_int(stmt, sqlite3_bind_parameter_index(stmt, ":num_offered_articles"),
-                             seller.getNumberOfOfferedArticles());
+                             seller.numArticlesOffered());
 
             retCode = sqlite3_step(stmt);
 

src/core/entity.cpp

@@ -13,7 +13,7 @@ void Entity::createUuid()
     uuid_ = generator();
 }
 
-void Entity::createUuidFromString(const std::string& uuidString)
+void Entity::setUuidFromString(const std::string& uuidString)
 {
     boost::uuids::string_generator generator{};
     uuid_ = generator(uuidString);

src/core/entity.h

@@ -14,7 +14,7 @@ class Entity
     virtual ~Entity() = 0;
     const boost::uuids::uuid& getUuid() const { return uuid_; };
     void createUuid();
-    void createUuidFromString(const std::string& uuidString);
+    void setUuidFromString(const std::string& uuidString);
     virtual State getState() const;
     void setState(State state) { state_ = state; }
 

src/core/sale.cpp

@@ -2,9 +2,15 @@
 
 #include <numeric>
 
+void Sale::addArticle(std::shared_ptr<Article> articlePtr)
+{
+    articlePtr->setSale(this);
+    articles_.push_back(articlePtr);
+}
+
 int Sale::sumInCents()
 {
-    int test = std::accumulate(articles_.begin(), articles_.end(), 0,
-                               [](int a, Article* b) { return a + b->getPrice(); });
-    return test;
+    int sum = std::accumulate(articles_.begin(), articles_.end(), 0,
+                               [](int a, std::shared_ptr<Article> b) { return a + b->getPrice(); });
+    return sum;
 }

src/core/sale.h

@@ -13,9 +13,10 @@ class Sale : public Entity
 {
   public:
     int sumInCents();
+    void addArticle(std::shared_ptr<Article> articlePtr);
   private:
     boost::posix_time::ptime systemTime_{boost::posix_time::second_clock::local_time()};
-    std::vector<Article*> articles_{};
+    std::vector<std::shared_ptr<Article>> articles_{};
 };
 
 #endif

src/core/seller.cpp

@@ -3,13 +3,13 @@
 Seller::Seller() : Entity() {}
 
 Seller::Seller(const std::string& firstName, const std::string& lastName, int sellerNo,
-               int numberOfArticles)
+               int numArticlesOffered)
     : Entity()
 {
     firstName_ = firstName;
     lastName_ = lastName;
     sellerNo_ = sellerNo;
-    numberOfOfferedArticles_ = numberOfArticles;
+    numArticlesOffered_ = numArticlesOffered;
 }
 
 void Seller::setSellerNo(int seller_no) { sellerNo_ = seller_no; }
@@ -18,11 +18,13 @@ inline void Seller::setFirstName(const std::string& firstName) { firstName_ = fi
 
 inline void Seller::setLastName(const std::string& lastName) { lastName_ = lastName; }
 
-inline void Seller::setNumberOfOfferedArticles(int number) { numberOfOfferedArticles_ = number; }
+inline void Seller::setNumArticlesOffered(int number) { numArticlesOffered_ = number; }
 
-int Seller::getNumberOfOfferedArticles() const { return static_cast<int>(articles_.size()); }
-
-void Seller::addArticle(std::shared_ptr<Article> article) { articles_.push_back(article); }
+void Seller::addArticle(std::shared_ptr<Article> article)
+{
+    article->setSeller(this);
+    articles_.push_back(article);
+}
 
 std::string Seller::getFirstName() const { return firstName_; }
 
@@ -43,4 +45,8 @@ std::vector<Article*> Seller::getArticles(bool onlySold) const
     return articles;
 }
 
-size_t Seller::soldArticles() const { return getArticles(true).size(); }
+int Seller::numArticlesSold() const { return static_cast<int>(getArticles(true).size()); }
+
+int Seller::numArticlesOffered() const { return numArticlesOffered_; }
+
+//int Seller::numArticlesTotal() const { return static_cast<int>(getArticles().size()); }

src/core/seller.h

@@ -15,24 +15,25 @@ class Seller : public Entity
   public:
     Seller();
     Seller(const std::string& firstName, const std::string& lastName, int sellerNo = 0,
-           int numberOfArticles = 0);
+           int numArticlesOffered = 0);
 
     void setSellerNo(int sellerNo);
     void setFirstName(const std::string& firstName);
     void setLastName(const std::string& lastName);
-    void setNumberOfOfferedArticles(int number);
+    void setNumArticlesOffered(int number);
     void addArticle(std::shared_ptr<Article> article);
 
     std::string getFirstName() const;
     std::string getLastName() const;
     int getSellerNo() const;
-    int getNumberOfOfferedArticles() const;
-    size_t soldArticles() const;
-    std::vector<Article*> getArticles(bool onlySold = false) const;
+    int numArticlesOffered() const;
+    int numArticlesSold() const;
+    //int numArticlesTotal() const;
+    std::vector<Article*> getArticles(bool onlySold = true) const;
 
   private:
     int sellerNo_{-1};
-    int numberOfOfferedArticles_{};
+    int numArticlesOffered_{};
     std::string firstName_{};
     std::string lastName_{};
     std::vector<std::shared_ptr<Article>> articles_{};

test/CMakeLists.txt

@@ -11,3 +11,7 @@ add_test(NAME Article COMMAND ${CMAKE_BINARY_DIR}/bin/test_article)
 add_executable(test_database test_database.cpp)
 target_link_libraries(test_database core Boost::unit_test_framework stdc++fs)
 add_test(NAME Database COMMAND ${CMAKE_BINARY_DIR}/bin/test_database)
+
+add_executable(test_sale test_sale.cpp)
+target_link_libraries(test_sale core Boost::unit_test_framework)
+add_test(NAME Sale COMMAND ${CMAKE_BINARY_DIR}/bin/test_sale)

test/test_article.cpp

@@ -16,6 +16,6 @@ BOOST_AUTO_TEST_CASE(check_is_sold)
     BOOST_TEST(article.isSold() == false);
 
     auto salePtr = std::make_shared<Sale>();
-    article.setSale(salePtr);
+    article.setSale(salePtr.get());
     BOOST_TEST(article.isSold() == true);
 }

test/test_sale.cpp

@@ -0,0 +1,33 @@
+#define BOOST_TEST_MODULE sale
+
+#include "../src/core/sale.h"
+
+#include <vector>
+
+#include <boost/test/included/unit_test.hpp>
+
+
+BOOST_AUTO_TEST_CASE(articles_sum)
+{
+    const int NUM_ARTICLES = 30;
+
+    Seller seller("Max", "Mustermann", 1, NUM_ARTICLES);
+    std::vector<std::shared_ptr<Article>> articles{};
+    Sale sale{};
+
+    for(int i = 0; i < NUM_ARTICLES; ++i)
+    {
+        auto art = std::make_shared<Article>();
+        art->setPrice((i+1) * 10);
+        articles.push_back(art);
+        seller.addArticle(art);
+    }
+
+    for(int i = 0; i < 10; ++i)
+    {
+        sale.addArticle(articles.at(i));
+    }
+
+    BOOST_TEST(sale.sumInCents() == 550);
+    BOOST_TEST(seller.getArticles(true).size() == 10);
+}

test/test_seller.cpp

@@ -34,6 +34,6 @@ BOOST_AUTO_TEST_CASE(with_article) {
     auto article = std::make_shared<Article>();
     article->setDescription("Test article");
     seller.addArticle(article);
-    BOOST_TEST(seller.getArticles().at(0)->getDescription() == "Test article");
-    BOOST_TEST(seller.soldArticles() == 0);
+    BOOST_TEST(seller.getArticles(false).at(0)->getDescription() == "Test article");
+    BOOST_TEST(seller.numArticlesSold() == 0);
 }