add deposit another

Author: MC-Moon

src/bank_api.cpp

@@ -6,34 +6,107 @@ BankAPI::BankAPI(){
     // printf("BankAPI create! \n");
 }
 
-void BankAPI::addAccount(std::string card_number,int pin_number, unsigned int balance){
+bool BankAPI::hasAccount(const std::string& card_number){
+    // printf("[%s] has Account is %d",card_number.c_str(),account.find(card_number) != account.end());
+    return account.find(card_number) != account.end();
+}
+
+/**
+ * @brief
+ * addAccount.
+ * This can be omitted if a list of accounts can be received from the server.
+ * @param card_number
+ * @param pin_number
+ * @param balance
+ */
+void BankAPI::addAccount(const std::string& card_number,int pin_number, unsigned int balance){
     printf("addAccount [%s], pin : %d, balance: %d\n",card_number.c_str(),pin_number,balance);
     account[card_number] = {card_number,pin_number,balance};
 }
 
+/**
+ * @brief
+ * validation check by pin
+ * @param card_number
+ * @param pin_number
+ * @return true
+ * @return false
+ */
 bool BankAPI::checkPIN(const std::string& card_number,const int& pin_number){
     // printf("checkPIN \n");
     return account.find(card_number) != account.end() &&
      account[card_number].pin == pin_number;
 }
 
+/**
+ * @brief
+ * see the balance of my account
+ * @param card_number
+ * @return unsigned int
+ */
 unsigned int BankAPI::getBalance(const std::string& card_number){
     // printf("getBalance : %d$\n",account[card_number].balance);
     std::lock_guard<std::mutex> lock(mutex);
     return account[card_number].balance;
 }
 
+/**
+ * @brief
+ * Deposit to my card
+ * @param card_number
+ * @param dollars
+ * @return true
+ * @return false
+ */
 bool BankAPI::deposit(const std::string& card_number,const unsigned int& dollars){
-    // printf("deposit %d$\n",dollars);
+    // printf("[%s] deposit %u$\n",card_number.c_str(),dollars);
     std::lock_guard<std::mutex> lock(mutex);
     if (dollars > MAX-getBalance(card_number))
     {
         return false;
     }
     account[card_number].balance+=dollars;
+    // printf("[%s] deposit %u$\n",card_number.c_str(),getBalance(card_number));
     return true;
 }
 
+/**
+ * @brief
+ * Deposit to another account
+ * @param card_number
+ * @param target_card
+ * @param dollars
+ * @return true
+ * @return false
+ */
+bool BankAPI::deposit(const std::string& card_number,const std::string& target_card,const unsigned int& dollars){
+    // printf("deposit %d$\n",dollars);
+    std::lock_guard<std::mutex> lock(mutex);
+    if(!hasAccount(target_card))
+    {
+        printf("%s card number cannot be found\n",target_card.c_str());
+        return false;
+    }
+    if (getBalance(card_number) < dollars || dollars > MAX-getBalance(target_card))
+    {
+        printf("Please Check your balance: %u $.\nPlease try again.\n",getBalance(card_number));
+        return false;
+    }
+    if(!deposit(target_card,dollars)){
+        return false;
+    }
+    account[card_number].balance-=dollars;
+    return true;
+}
+
+/**
+ * @brief
+ *
+ * @param card_number
+ * @param dollars
+ * @return true
+ * @return false
+ */
 bool BankAPI::withdrawal(const std::string& card_number,const unsigned int& dollars){
     // printf("withdrawal : %d$\n",dollars);
     std::lock_guard<std::mutex> lock(mutex);
@@ -46,3 +119,15 @@ bool BankAPI::withdrawal(const std::string& card_number,const unsigned int& doll
     }
     return true;
 }
+
+void BankAPI::showAllAccountInfo(){
+    printf("===============================\n");
+    for (auto it : account)
+    {
+        printf("card number : %s\n",it.first.c_str());
+        printf("pin number  : %d\n",it.second.pin);
+        printf("balance     : %u\n",it.second.balance);
+        printf("===============================\n");
+    }
+    
+}

src/bank_api.h

@@ -15,14 +15,20 @@ class BankAPI{
     public:
         BankAPI();
         ~BankAPI(){};
-        void addAccount(std::string card_number,int pin, unsigned int balance);
+        void addAccount(const std::string& card_number,int pin, unsigned int balance);
         bool checkPIN(const std::string& card_number,const int& pin_number);
         unsigned int getBalance(const std::string& card_number);
         bool deposit(const std::string& card_number,const unsigned int& dollars);
+        bool deposit(const std::string& card_number,const std::string& target_card,const unsigned int& dollars);
         bool withdrawal(const std::string& card_number,const unsigned int& dollars);
+
+        void showAllAccountInfo(); //for test
     private:
         static std::mutex mutex;
         std::map<std::string,Account> account;
 
+    private:
+        bool hasAccount(const std::string& card_number);
+
 
 };

src/controller.cpp

@@ -1,9 +1,9 @@
 // #include <iostream>
 #include "controller.h"
+#include "version.h"
 
-
-ATMController::ATMController(BankAPI _api):api(_api) {
-    printf("ATMController create! \n");
+ATMController::ATMController(BankAPI& _api):api(_api) {
+    // printf("ATMController create! \n");
     state = Process::IDLE;
 }
 unsigned int ATMController::inputOnlyInteger(){
@@ -23,8 +23,9 @@ unsigned int ATMController::inputOnlyInteger(){
     }
     return data;
 }
+
 ATMController::Process ATMController::inputUserSelcet(){
-    std::cout << "Select Option [1: Check Balance, 2: Deposit, 3: Withdrawal, 4: Exit] : ";
+    std::cout << "Select Option [1: Check Balance, 2: Deposit, 3: Deposit Another, 4: Withdrawal, 5: Exit] : ";
     int select;
     std::cin >> select;
     ATMController::Process state;
@@ -36,6 +37,9 @@ ATMController::Process ATMController::inputUserSelcet(){
     case ATMController::Process::DEPOSIT:
         state = ATMController::Process::DEPOSIT;
         break;
+    case ATMController::Process::DEPOSIT_ANOTHER:
+        state = ATMController::Process::DEPOSIT_ANOTHER;
+        break;
     case ATMController::Process::WITHDRAWAL:
         state = ATMController::Process::WITHDRAWAL;
         break;
@@ -49,11 +53,18 @@ ATMController::Process ATMController::inputUserSelcet(){
     return state;
 }
 
+/**
+ * @brief 
+ * insertCard action
+ * Replace the card input action with the card number input.
+ * @return true 
+ * @return false 
+ */
 bool ATMController::insertCard(){
     std::string _card_number;
     int pin;
     std::cout << "Insert Card (Enter Card Number): ";
-    std::cin >> _card_number;
+    std::getline(std::cin >> std::ws, _card_number);
 
     std::cout << "Enter PIN: ";
     std::cin >> pin;
@@ -67,6 +78,10 @@ bool ATMController::insertCard(){
     return true;
 }
 
+/**
+ * @brief 
+ * main process.
+ */
 void ATMController::start(){
     if(!insertCard()){
         printf("This card is invalid. please insert valid card.\n");
@@ -97,6 +112,22 @@ void ATMController::start(){
                 }
                 break;
             }
+            case ATMController::Process::DEPOSIT_ANOTHER:
+            {
+                unsigned int amount;
+                std::cout << "How much would you like to deposit? : ";
+                amount = inputOnlyInteger();
+                std::cout << "Please enter the card number to deposit : ";
+                std::string target_card_name;
+                std::getline(std::cin >> std::ws, target_card_name);
+                if (api.deposit(card_number,target_card_name,amount))
+                {
+                    printf("Success to deposit.\nThe balance of acocunt is %u $\n",api.getBalance(card_number));
+                }else{
+                    printf("Fail to deposit.\n");
+                }
+                break;
+            }
             case ATMController::Process::WITHDRAWAL:
             {
                 unsigned int amount;
@@ -117,15 +148,26 @@ void ATMController::start(){
     }
 }
 
+void makeAccountListForTest(BankAPI& api){
+    api.addAccount("111 111 111",123,100);
+    api.addAccount("222 222 222",456,200);
+    api.addAccount("333 333 333",789,300);
+    api.addAccount("444 444 444",654,400);
+    api.addAccount("555 555 555",321,500);
+}
+
 int main(int argc, char const *argv[])
 {
+    printf("ATM_Controller Version: %s\n",ATM_CONTROLLER_VERSION_STRING);
     BankAPI bank_api = BankAPI();
 
-    bank_api.addAccount("111",123,500); //add simply account
+    makeAccountListForTest(bank_api); //add simply account
 
     ATMController controller = ATMController(bank_api);
 
     controller.start();
 
+    bank_api.showAllAccountInfo();
+
     return 0;
 }

src/controller.h

@@ -1,26 +1,27 @@
 #include <iostream>
 #include <limits>
 #include "bank_api.h"
-
+#include <vector>
 class ATMController{
     enum Process
     {
         IDLE,
         CHECK_BALANCE,
         DEPOSIT,
+        DEPOSIT_ANOTHER,
         WITHDRAWAL,
         EXIT
     };
     public:
-        ATMController(BankAPI api);
+        ATMController(BankAPI& api);
         ~ATMController(){};
 
         void start(); // do main routine
 
     private:
         std::string card_number;
         int pin_number;
-        BankAPI api;
+        BankAPI& api;
         Process state;
     private:
         Process inputUserSelcet();