Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/#30 #31

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions src/main/java/com/eum/bank/common/PackageInfo.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package com.eum.bank.common;

public final class PackageInfo {

private PackageInfo() {
}

// 계좌 번호 길이
public static final int ACCOUNT_NUMBER_LENGTH = 12;
// 송금 타입 자유
public static final String FREE_TYPE = "free";


}
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,17 @@ public static class GetAccount {
@NotEmpty(message = "비밀번호를 입력해주세요.")
private String password;
}

@Getter
public static class Transfer {
@NotEmpty(message = "계좌 번호를 입력해주세요.")
private String accountNumber;
@NotEmpty(message = "비밀번호를 입력해주세요.")
private String password;
@NotEmpty(message = "송금 금액을 입력해주세요.")
private Long deposit;
// 수신자 계좌 번호
@NotEmpty(message = "송금할 계좌 번호를 입력해주세요.")
private String receiverAccountNumber;
}
}
17 changes: 17 additions & 0 deletions src/main/java/com/eum/bank/controller/AccountController.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;

import static com.eum.bank.common.PackageInfo.FREE_TYPE;
@RestController
@RequiredArgsConstructor
@RequestMapping("/account")
Expand All @@ -34,4 +35,20 @@ public ResponseEntity<?> getAccountInfo(@RequestBody AccountRequestDTO.GetAccoun
return ResponseEntity.ok(response);
}

// 자유 송금
@PostMapping("/transfer")
public ResponseEntity<?> transfer(@RequestBody AccountRequestDTO.Transfer transfer) {
String accountNumber = transfer.getAccountNumber();
String password = transfer.getPassword();
Long deposit = transfer.getDeposit();
String receiverAccountNumber = transfer.getReceiverAccountNumber();

accountService.getAccount(accountNumber, password);

APIResponse<?> response = accountService.transfer(
accountNumber, receiverAccountNumber, deposit, password, FREE_TYPE
);

return ResponseEntity.ok(response);
}
}
26 changes: 12 additions & 14 deletions src/main/java/com/eum/bank/service/AccountService.java
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
package com.eum.bank.service;

import com.eum.bank.common.APIResponse;
import com.eum.bank.common.ErrorResponse;
import com.eum.bank.common.dto.request.AccountTransferHistoryRequestDTO;
import com.eum.bank.common.dto.request.TotalTransferHistoryRequestDTO;
import com.eum.bank.common.dto.response.AccountResponseDTO;
import com.eum.bank.common.enums.ErrorCode;
import com.eum.bank.common.enums.SuccessCode;
import com.eum.bank.domain.account.entity.Account;
import com.eum.bank.domain.account.entity.AccountTransferHistory;
import com.eum.bank.domain.account.entity.TotalTransferHistory;
import com.eum.bank.repository.AccountRepository;
import jakarta.transaction.Transactional;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import static com.eum.bank.common.PackageInfo.ACCOUNT_NUMBER_LENGTH;

import org.springframework.security.crypto.password.PasswordEncoder;
import java.util.Random;
Expand Down Expand Up @@ -56,7 +54,7 @@ public String generateAccountNumber() {
Random random = new Random();
StringBuilder uniqueNumber = new StringBuilder();

for (int i = 0; i < 12; i++) {
for (int i = 0; i < ACCOUNT_NUMBER_LENGTH; i++) {
int digit = random.nextInt(10);
uniqueNumber.append(digit);
}
Expand All @@ -65,7 +63,7 @@ public String generateAccountNumber() {
}

public Boolean validateAccountNumber(String accountNumber) {
if (accountNumber.length() != 12) {
if (accountNumber.length() != ACCOUNT_NUMBER_LENGTH) {
return false;
}

Expand Down Expand Up @@ -113,7 +111,7 @@ public Account getAccount(String accountNumber) {
// 4. 수신자 전체금액, 가용금액 플러스
// 5. 통합 거래내역 생성, 각 계좌 거래내역 생성
@Transactional
public APIResponse<?> transfer(String senderAccountNumber, String receiverAccountNumber, Long amount, String password, String transferType) {
public APIResponse<?> transfer(String senderAccountNumber, String receiverAccountNumber, Long deposit, String password, String transferType) {
Account senderAccount = this.validateAccount(senderAccountNumber);
Account receiverAccount = this.validateAccount(receiverAccountNumber);

Expand All @@ -123,25 +121,25 @@ public APIResponse<?> transfer(String senderAccountNumber, String receiverAccoun
}

// 송금자 잔액 검증
if (senderAccount.getAvailableBudget() < amount) {
if (senderAccount.getAvailableBudget() < deposit) {
throw new IllegalArgumentException("Insufficient balance");
}

// 송금자 잔액 마이너스
senderAccount.setTotalBudget(senderAccount.getTotalBudget() - amount);
senderAccount.setAvailableBudget(senderAccount.getAvailableBudget() - amount);
senderAccount.setTotalBudget(senderAccount.getTotalBudget() - deposit);
senderAccount.setAvailableBudget(senderAccount.getAvailableBudget() - deposit);


// 수신자 잔액 플러스
receiverAccount.setTotalBudget(receiverAccount.getTotalBudget() + amount);
receiverAccount.setAvailableBudget(receiverAccount.getAvailableBudget() + amount);
receiverAccount.setTotalBudget(receiverAccount.getTotalBudget() + deposit);
receiverAccount.setAvailableBudget(receiverAccount.getAvailableBudget() + deposit);

// 통합 거래내역 생성
TotalTransferHistory response = totalTransferHistoryService.save(
TotalTransferHistoryRequestDTO.CreateTotalTransferHistory.builder()
.senderAccount(senderAccount)
.receiverAccount(receiverAccount)
.transferAmount(amount)
.transferAmount(deposit)
.transferType(transferType)
.build()
);
Expand All @@ -151,7 +149,7 @@ public APIResponse<?> transfer(String senderAccountNumber, String receiverAccoun
AccountTransferHistoryRequestDTO.CreateAccountTransferHistory.builder()
.ownerAccount(senderAccount)
.oppenentAccount(receiverAccount)
.transferAmount(amount)
.transferAmount(deposit)
.transferType(transferType)
.budgetAfterTransfer(senderAccount.getAvailableBudget())
.memo("")
Expand All @@ -161,7 +159,7 @@ public APIResponse<?> transfer(String senderAccountNumber, String receiverAccoun
AccountTransferHistoryRequestDTO.CreateAccountTransferHistory.builder()
.ownerAccount(receiverAccount)
.oppenentAccount(senderAccount)
.transferAmount(-amount)
.transferAmount(-deposit)
.transferType(transferType)
.budgetAfterTransfer(receiverAccount.getAvailableBudget())
.memo("")
Expand Down
Loading