Merge branch 'TEST_develop' into fix_delegate

Author: lukasz-kukulka

shm/inc/Store.hpp

@@ -10,6 +10,7 @@ class Player;
 
 constexpr size_t MIN_CARGO_IN_STORE{ 0 };
 constexpr size_t MAX_CARGO_IN_STORE{ 100 };
+constexpr size_t STORE_CAPACITY { 1000 };
 
 class Store : public Subscriber {
 public:

shm/src/Alcohol.cpp

@@ -2,10 +2,8 @@
 
 #include <stdexcept>
 
-Alcohol::Alcohol(const std::string& name, size_t amount, size_t basePrice, size_t percentage) 
-    : Cargo(name, amount, basePrice)
-    , percentage_(percentage)
-{}
+Alcohol::Alcohol(const std::string& name, size_t amount, size_t basePrice, size_t percentage)
+    : Cargo(name, amount, basePrice), percentage_(percentage) {}
 
 Cargo& Alcohol::operator+=(size_t amount) {
     if (amount_ + amount > MAX_AMOUNT_OF_CARGO) {
@@ -20,9 +18,13 @@ Cargo& Alcohol::operator-=(size_t amount) {
     return *this;
 }
 
-bool Alcohol::operator==(const Cargo& alcohol) const {
-    // TODO:
-    return alcohol.getAmount() == amount_ ? true : false;
+bool Alcohol::operator==(const Cargo& cargo) const {
+    if (typeid(cargo) == typeid(Alcohol)) {
+        const Alcohol* alcohol = static_cast<const Alcohol*>(&cargo);
+        return name_ == alcohol->getName() && basePrice_ == alcohol->getBasePrice() &&
+               percentage_ == alcohol->getPercentage();
+    }
+    return false;
 }
 
 size_t Alcohol::getPrice() const {
@@ -33,7 +35,6 @@ size_t Alcohol::getPrice() const {
 void Alcohol::nextDay() {
 }
 
-
 size_t Alcohol::getPercentage() const {
     return percentage_;
 }

shm/src/Store.cpp

@@ -6,6 +6,9 @@
 #include "shm/inc/Player.hpp"
 
 Store::Response Store::buy(Cargo* cargo, size_t amount, Player* player) {
+    if (!cargo) {
+        return Response::lack_of_cargo;
+    }
     if (amount * cargo->getPrice() > player->getMoney()){
         return Response::lack_of_money;
     }
@@ -18,6 +21,16 @@ Store::Response Store::buy(Cargo* cargo, size_t amount, Player* player) {
     return Response::done;   
 }
 
+Store::Response Store::sell(Cargo* cargo, size_t amount, Player* player) {
+    if (!cargo) {
+        return Response::lack_of_cargo;
+    }
+    if (cargo->getAmount() + amount > STORE_CAPACITY) {
+        return Response::lack_of_space;
+    }
+    return Response::done;
+}
+
 void Store::nextDay() {
     std::mt19937 generator(std::random_device{}());
     std::uniform_int_distribution<size_t> distribution{
@@ -29,9 +42,3 @@ void Store::nextDay() {
     }
 }
 
-Store::Response Store::sell(Cargo* cargo, size_t amount, Player* player) {
-    if (cargo->getAmount() + amount > MAX_CARGO_IN_STORE) {
-        return Response::lack_of_space;
-    }
-    return Response::done;
-}