Merge pull request #52 from woorifisa-projects-3rd/card-remove-api

feat:카드 해지 api 구현

Author: riverkite0708

src/main/java/org/baas/baascore/controller/CardController.java

@@ -4,12 +4,10 @@
 import org.baas.baascore.dto.request.CardReissuedRequest;
 import org.baas.baascore.dto.request.CommonRequest;
 import org.baas.baascore.dto.response.CardIssuedResponse;
+import org.baas.baascore.dto.response.MessageResponse;
 import org.baas.baascore.service.CardService;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RequiredArgsConstructor
 @RestController
@@ -22,6 +20,11 @@ public ResponseEntity<CardIssuedResponse> cardIssued(@RequestBody CommonRequest
         return ResponseEntity.ok().body(cardService.cardIssued(commonRequest));
     }
 
+    @DeleteMapping
+    public ResponseEntity<MessageResponse> cardRemove(@RequestBody CardReissuedRequest cardReissuedRequest){
+        return ResponseEntity.ok().body(cardService.cardRemove(cardReissuedRequest));
+    }
+
     @PostMapping("/reissue")
     public ResponseEntity<CardIssuedResponse> cardReissued(@RequestBody CardReissuedRequest cardReissuedRequest){
         return ResponseEntity.ok().body(cardService.cardReissued(cardReissuedRequest));

src/main/java/org/baas/baascore/dto/response/AccountInitResponse.java

@@ -23,7 +23,7 @@ public class AccountInitResponse {
     private LocalDate createdAt;
     private LocalDate updatedAt;
 
-    public static AccountInitResponse from(Account account, int index) {
+    public static AccountInitResponse of(Account account, int index) {
         return AccountInitResponse.builder()
                 .index(index)
                 .customerName(account.getCustomer().getName())

src/main/java/org/baas/baascore/dto/response/MessageResponse.java

@@ -0,0 +1,15 @@
+package org.baas.baascore.dto.response;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class MessageResponse {
+
+    private String message;
+}

src/main/java/org/baas/baascore/model/Customer.java

@@ -38,7 +38,7 @@ public class Customer extends BaseTimeEntity {
     @Column(name = "name", nullable = false)
     private String name;
 
-    @Column(name = "ci",length = 88)
+    @Column(name = "ci",length = 88, nullable = false, unique = true)
     private String ci;
 
     // 한 고객이 여러 계좌를 소유할 수 있도록 양방향 매핑 추가

src/main/java/org/baas/baascore/model/Subscribe.java

@@ -33,6 +33,7 @@ public class Subscribe extends BaseTimeEntity {
     private Bank bank;
 
     // 구독상품명
+    @Column(name = "product_name", nullable = false)
     private String productName;
 
     // 사업자 등록 번호

src/main/java/org/baas/baascore/model/TransactionHistory.java

@@ -45,7 +45,7 @@ public class TransactionHistory extends BaseTimeEntity {
     private BigDecimal afterBalanceAmt;
 
     // 출금 상대 이름
-    @Column(name = "counterparty_Name", nullable = false)
+    @Column(name = "counterparty_name", nullable = false)
     private String counterpartyName;
 
     // 출금 상대 계좌 번호
@@ -62,7 +62,7 @@ public class TransactionHistory extends BaseTimeEntity {
 
     // CoreTransaction과의 다대일 관계 설정
     @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "core_transaction_id", nullable = false)
+    @JoinColumn(name = "transaction_id", nullable = false)
     private CoreTransaction coreTransaction;
 
     public TransactionHistory() {

src/main/java/org/baas/baascore/service/AccountService.java

@@ -21,7 +21,6 @@
 import java.util.Random;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
 @Service
@@ -192,7 +191,7 @@ public AccountsInfoResponse findAccountInfo(MemberInitRequest memberInitRequest)
 
         AtomicInteger index = new AtomicInteger(1);
         List<AccountInitResponse> accountInfoList = accountRepository.findByCustomerId(customer.getId()).stream()
-                .map(account -> AccountInitResponse.from(account, index.getAndIncrement()))
+                .map(account -> AccountInitResponse.of(account, index.getAndIncrement()))
                 .toList();
 
         return new AccountsInfoResponse(accountInfoList.size(), accountInfoList);

src/main/java/org/baas/baascore/service/CardService.java

@@ -4,6 +4,7 @@
 import org.baas.baascore.dto.request.CardReissuedRequest;
 import org.baas.baascore.dto.request.CommonRequest;
 import org.baas.baascore.dto.response.CardIssuedResponse;
+import org.baas.baascore.dto.response.MessageResponse;
 import org.baas.baascore.exception.CustomException;
 import org.baas.baascore.exception.ErrorCode;
 import org.baas.baascore.model.Account;
@@ -118,4 +119,35 @@ private String createNumber(int count, String prefix) {
         }
         return randomNum.toString();
     }
+
+    @Transactional
+    public MessageResponse cardRemove(CardReissuedRequest cardReissuedRequest) {
+        Card card = cardRepository.findByCardNumberAndCardStatusTrueAndExpiredAtGreaterThan(
+                        cardReissuedRequest.getCardNumber(), LocalDateTime.now())
+                .orElseThrow(
+                        () -> new CustomException(ErrorCode.CARDNUMBER_NOT_FOUND)
+                );
+
+        Customer customer = customerRepository.findByCi(cardReissuedRequest.getCi()).orElseThrow(
+                () -> new CustomException(ErrorCode.IDENTITYCODE_NOT_FOUND)
+        );
+
+        if (!card.getCustomer().equals(customer)) {
+            throw new CustomException(ErrorCode.CARD_OWNER_MISMATCH);
+        }
+
+        Account account = accountRepository.findByFintechUseNum(cardReissuedRequest.getFintechUseNum())
+                .orElseThrow(
+                        () -> new CustomException(ErrorCode.FINTECHCODE_NOT_FOUND)
+                );
+
+        if (!card.getAccount().equals(account)) {
+            throw new CustomException(ErrorCode.ACCOUNT_MISMATCH_WITH_CARD);
+        } else if (!card.getAccount().getBank().getBankCode().equals(BANK_CODE)) {
+            throw new CustomException(ErrorCode.CARD_NOT_FROM_WOORI_BANK);
+        }
+
+        card.changeCardStatus(false);
+        return MessageResponse.builder().message("카드가 정상적으로 삭제 되었습니다.").build();
+    }
 }