Merge pull request #34 from KB-JAKKU/feat/account

feat: 주거래 계좌 설정 엔드포인트 추가 및 AccountService 리팩토링

Author: S0HYUNN

src/main/java/org/scoula/jakku/account/controller/AccountController.java

@@ -7,6 +7,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
 
 @RestController
 @RequestMapping("/accounts")
@@ -57,11 +58,15 @@ public ResponseEntity<List<BankLoginResponseDTO>> getBankLoginsByChild(@PathVari
         return ResponseEntity.ok(bankLoginService.getBankLoginsByChildId(childId));
     }
 
-    // 추후 새로고침 기능 시 사용
-    // 계좌 실시간 조회
-//    @GetMapping("/child/{childId}/fetch")
-//    public ResponseEntity<List<AccountResponseDTO>> fetchAccounts(@PathVariable Long childId) {
-//        return ResponseEntity.ok(accountService.fetchAccountsByChildId(childId));
-//    }
+    // 주거래 계좌 설정
+    @PatchMapping("/{accountId}/main")
+    public ResponseEntity<Void> setMainAccount(
+            @PathVariable Long accountId,
+            @RequestBody Map<String, Long> body
+    ) {
+        Long childId = body.get("childId");
+        accountService.setMainAccount(childId, accountId);
+        return ResponseEntity.ok().build();
+    }
 
 }

src/main/java/org/scoula/jakku/account/dto/AccountResponseDTO.java

@@ -15,13 +15,14 @@
 public class AccountResponseDTO {
     private Long accountId;       // 계좌 PK
     private Long bankLoginId;     // 뱅크 로그인 ID
-    private String bankName;
+    private String bankName;      // 은행이름
     private String accountName;   // 계좌명
     private String accountNumber; // 계좌번호
     private String status;        // 계좌 상태 (ACTIVE / INACTIVE)
     private BigDecimal balance;   // 잔액
     private LocalDateTime createdAt; // 생성일
     private String qrBase64;      // QR 이미지 Base64
+    private boolean mainAccount ; // 주거래 계좌 여부
 
     public static AccountResponseDTO fromEntity(Account entity) {
         return AccountResponseDTO.builder()
@@ -34,6 +35,9 @@ public static AccountResponseDTO fromEntity(Account entity) {
                 .balance(entity.getBalance())
                 .createdAt(entity.getCreatedAt())
                 .qrBase64(entity.getQrBase64())
+                .mainAccount(entity.isMainAccount())
                 .build();
     }
-}
+
+
+}

src/main/java/org/scoula/jakku/account/repository/AccountRepository.java

@@ -2,6 +2,9 @@
 
 import org.scoula.jakku.account.entity.Account;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 import java.util.List;
 import java.util.Optional;
@@ -17,5 +20,7 @@ public interface AccountRepository extends JpaRepository<Account, Long> {
     // bankLoginId 기준 주거래 계좌 조회
     Optional<Account> findByBankLoginIdAndMainAccountTrue(Long bankLoginId);
 
-
+    @Modifying
+    @Query("UPDATE Account a SET a.mainAccount = false WHERE a.bankLogin.child.childId = :childId")
+    void clearMainAccountByChild(@Param("childId") Long childId);
 }

src/main/java/org/scoula/jakku/account/service/AccountService.java

@@ -26,4 +26,7 @@ public interface AccountService {
 
     // 계좌 엔티티 저장 또는 업데이트
     Account save(Account account);
+
+    // 주거래 은행 지정
+    void setMainAccount(Long childId, Long accountId);
 }

src/main/java/org/scoula/jakku/account/service/AccountServiceImpl.java

@@ -43,7 +43,7 @@ public class AccountServiceImpl implements AccountService {
     public List<AccountResponseDTO> getAccountsByChildId(Long childId) {
         return accountRepository.findByBankLogin_Child_ChildId(childId)
                 .stream()
-                .map(this::toDTO)
+                .map(AccountResponseDTO::fromEntity)
                 .collect(Collectors.toList());
     }
 
@@ -109,7 +109,7 @@ public List<AccountResponseDTO> fetchAccountsByChildId(Long childId) {
                     }
 
                     accountRepository.save(entity);
-                    results.add(toDTO(entity));
+                    results.add(AccountResponseDTO.fromEntity(entity));
                 }
 
             } catch (Exception e) {
@@ -172,7 +172,7 @@ public List<AccountResponseDTO> fetchAccounts(String bankCode, String connectedI
                 }
 
                 accountRepository.save(entity);
-                results.add(toDTO(entity));
+                results.add(AccountResponseDTO.fromEntity(entity));
             }
 
         } catch (Exception e) {
@@ -182,22 +182,6 @@ public List<AccountResponseDTO> fetchAccounts(String bankCode, String connectedI
         return results;
     }
 
-    // Entity → DTO 변환
-    private AccountResponseDTO toDTO(Account entity) {
-        return AccountResponseDTO.builder()
-                .accountId(entity.getId())
-                .bankLoginId(entity.getBankLogin().getId())
-                .bankName(entity.getBankLogin().getBank().getBankName())
-                .accountName(entity.getAccountName())
-                .accountNumber(entity.getAccountNumber())
-                .status(entity.getStatus().name())
-                .balance(entity.getBalance())
-                .createdAt(entity.getCreatedAt())
-                .qrBase64(entity.getQrBase64())
-                .build();
-    }
-
-
     @Override
     public Account getAccountEntityByNumber(String accountNumber) {
         return accountRepository.findByAccountNumber(accountNumber)
@@ -228,4 +212,21 @@ public Account save(Account account) {
             return accountRepository.save(account);
         }
     }
+
+    @Override
+    @Transactional
+    public void setMainAccount(Long childId, Long accountId) {
+        // 1. childId의 모든 계좌 mainAccount 초기화
+        accountRepository.clearMainAccountByChild(childId);
+
+        // 2. 지정한 계좌만 true로 설정
+        Account account = accountRepository.findById(accountId)
+                .orElseThrow(() -> new RuntimeException("계좌를 찾을 수 없습니다: " + accountId));
+
+        account.setMainAccount(true);
+        accountRepository.save(account);
+
+        log.info("주거래 계좌 설정 완료 - childId={}, accountId={}", childId, accountId);
+    }
+
 }