feat: 입금기능 구현 #1

GO-SOPT-SERVER · Apr 15, 2023 · 0ef309a · 0ef309a
1 parent d37ee7f
commit 0ef309a
Show file tree

Hide file tree

Showing 8 changed files with 70 additions and 6 deletions.
diff --git a/firstSeminarAdvancedAssignment/docs/readme.md b/firstSeminarAdvancedAssignment/docs/readme.md
@@ -20,9 +20,9 @@
     + [X] ⚠️ 존재하지 않는 계좌번호 입력 시, 예외발생
     + [X] ⚠️ 잘못된 비밀번호 입력 시, 예외발생
     + [X] ⚠️ 계좌 내의 금액이 출금할 금액보다 적을 시, 예외 발생
-- [ ] 입금 기능
-  - [ ] 계좌번호와 입금액 입력 시, 입금
-    + [ ] ⚠️ 존재하지 않는 계좌번호 입력 시, 예외발생
+- [X] 입금 기능
+  - [X] 계좌번호와 입금액 입력 시, 입금
+    + [X] ⚠️ 존재하지 않는 계좌번호 입력 시, 예외발생
 - [ ] 송금 기능
   - [ ] 계좌번호 / 비밀번호 / 송금할 계좌번호 / 송금할 금액 입력 시, 송금
     + [ ] ⚠️ 존재하지 않는 계좌번호 입력 시, 예외발생

diff --git a/...va/sopt/org/firstSeminarAdvancedAssignment/FirstSeminarAdvancedAssignmentApplication.java b/...va/sopt/org/firstSeminarAdvancedAssignment/FirstSeminarAdvancedAssignmentApplication.java
@@ -12,6 +12,7 @@ public static void main(String[] args) {
         SpringApplication.run(FirstSeminarAdvancedAssignmentApplication.class, args);
         clientController.registerClient();
         clientController.getClientAccountBalance();
+        clientController.depositMoneyIntoAccount();
         clientController.withdrawAccountBalance();
     }
 

diff --git a/...nt/src/main/java/sopt/org/firstSeminarAdvancedAssignment/controller/ClientController.java b/...nt/src/main/java/sopt/org/firstSeminarAdvancedAssignment/controller/ClientController.java
@@ -29,4 +29,15 @@ public void withdrawAccountBalance() {
         outputView.printRemainAmountAfterWithdrawMessage(remainAmount);
     }
 
+    public void depositMoneyIntoAccount() {
+        outputView.printDepositIntoAccountMessage();
+
+        int nowAmount = clientService.depositIntoAccount(inputView.inputAccountNumber(), inputView.inputDepositMoney());
+        outputView.printAmountAfterDeposit(nowAmount);
+
+
+    }
+
+
+
 }
diff --git a/...vancedAssignment/src/main/java/sopt/org/firstSeminarAdvancedAssignment/domain/Client.java b/...vancedAssignment/src/main/java/sopt/org/firstSeminarAdvancedAssignment/domain/Client.java
@@ -66,4 +66,9 @@ public int withdraw(int withdrawAmount) {
         this.amount -= withdrawAmount;
         return this.amount;
     }
+
+    public int deposit(int amount) {
+        this.amount += amount;
+        return this.amount;
+    }
 }
diff --git a/...nt/src/main/java/sopt/org/firstSeminarAdvancedAssignment/repository/ClientRepository.java b/...nt/src/main/java/sopt/org/firstSeminarAdvancedAssignment/repository/ClientRepository.java
@@ -27,12 +27,12 @@ public void register(Client client) {
         clientDB.put(client.getAccountNumber(), client);
     }
 
-    public int getAccountBalance(String clientAcountNumber, String password) {
+    public int getAccountBalance(String clientAccountNumber, String password) {
         int clientMoneyAmount = -1;
 
         for (String accountNumber : clientDB.keySet()) {
-            if (accountNumber.equals(clientAcountNumber)) {
-                Client clientInfo = clientDB.get(clientAcountNumber);
+            if (accountNumber.equals(clientAccountNumber)) {
+                Client clientInfo = clientDB.get(clientAccountNumber);
 
                 if (clientInfo.checkPassword(password)) {
                     clientMoneyAmount = clientInfo.getAmount();
@@ -53,4 +53,27 @@ public int withdrawAccountBalance(String accountNumber, int amount) {
 
         return remainAmount;
     }
+
+    public int deposit(String accountNumber, int depositAmount) {
+        validateIsExistAccountNumber(accountNumber);
+
+        Client client = clientDB.get(accountNumber);
+        int amountAfterDeposit = client.deposit(depositAmount);
+
+        return amountAfterDeposit;
+    }
+
+    private void validateIsExistAccountNumber(String clientAccountNumber) {
+        boolean isAccountExist = false;
+        for (String accountNumber : clientDB.keySet()) {
+            if (accountNumber.equals(clientAccountNumber)) {
+                isAccountExist = true;
+                break;
+            }
+        }
+
+        if(!isAccountExist) {
+            throw new IllegalArgumentException(WRONG_ACCOUNT_NUMBER_ERROR_MESSAGE);
+        }
+    }
 }
diff --git a/...signment/src/main/java/sopt/org/firstSeminarAdvancedAssignment/service/ClientService.java b/...signment/src/main/java/sopt/org/firstSeminarAdvancedAssignment/service/ClientService.java
@@ -26,6 +26,12 @@ public int withdrawFromClientAccount(String accountNumber, String password, int
         return remainAmount;
     }
 
+    public int depositIntoAccount(String accountNumber, int depositAmount) {
+        int amountAfterDeposit = clientRepository.deposit(accountNumber, depositAmount);
+
+        return amountAfterDeposit;
+    }
+
     private void validateAccountBalanceAmount(int amount, int accountBalance) {
         if(accountBalance < amount) {
             throw new IllegalArgumentException(WRONG_ACCOUNT_BALANCE_AMOUNT_ERROR_MESSAGE);

diff --git a/...ancedAssignment/src/main/java/sopt/org/firstSeminarAdvancedAssignment/view/InputView.java b/...ancedAssignment/src/main/java/sopt/org/firstSeminarAdvancedAssignment/view/InputView.java
@@ -51,6 +51,11 @@ public int inputWithdrawAccount() {
         return inputInt();
     }
 
+    public int inputDepositMoney() {
+        outputView.printDepositAmountMessage();
+        return inputInt();
+    }
+
 
     private String inputString() {
         return sc.nextLine();

diff --git a/...ncedAssignment/src/main/java/sopt/org/firstSeminarAdvancedAssignment/view/OutputView.java b/...ncedAssignment/src/main/java/sopt/org/firstSeminarAdvancedAssignment/view/OutputView.java
@@ -51,6 +51,19 @@ public void printRemainAmountAfterWithdrawMessage(int amount) {
         System.out.println("출금 후 잔액은 " + amount + "원 입니다.");
     }
 
+    //입금 메세지
+    public final void printDepositIntoAccountMessage() {
+        System.out.println("입금을 위해 계좌번호를 입력해주세요.");
+    }
+
+    public void printDepositAmountMessage() {
+        System.out.println("입금하실 금액을 입력해주세요.");
+    }
+
+    public void printAmountAfterDeposit(int amount) {
+        System.out.println("입금 후 계좌 내 금액은 " + amount + "원 입니다.");
+    }
+
     //기본 메세지
     public final void printInputClientNameMessage() {
         System.out.println("이름을 입력해주세요.");