Merge branch 'dev'

fix(ci): SSH 개인키 CR 제거

src/main/java/com/sb/web/account/domain/Wallet.java

@@ -6,7 +6,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 
@@ -30,11 +29,6 @@ public class Wallet implements Serializable {
     private Long openingBalance;  // 초기 잔액(부호있음: 자산+, 부채-)
     private LocalDate openingDate;
     private Long currentValue;    // 현재 평가금액 (INVEST 전용, 수동 갱신)
-    private Long loanAmount;       // 대출 실행 금액(원금, 처음 빌린 금액) (LOAN 전용)
-    private BigDecimal loanRate;   // 연이자율(%) e.g. 5.25 (LOAN 전용)
-    private String loanMethod;     // 상환방식: EQUAL_PAYMENT / EQUAL_PRINCIPAL / BULLET (LOAN 전용)
-    private Integer loanMonths;    // 대출기간(개월) (LOAN 전용)
-    private LocalDate loanStart;   // 대출시작일 (LOAN 전용)
     private Integer sortOrder;    // 표시 순서 (타입 내 정렬)
     private LocalDateTime createdAt;
     private LocalDateTime updatedAt;

src/main/java/com/sb/web/account/dto/WalletRequest.java

@@ -1,13 +1,10 @@
 package com.sb.web.account.dto;
 
-import jakarta.validation.constraints.DecimalMax;
-import jakarta.validation.constraints.DecimalMin;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Pattern;
 import jakarta.validation.constraints.Size;
 import lombok.Data;
 
-import java.math.BigDecimal;
 import java.time.LocalDate;
 
 /**
@@ -40,17 +37,4 @@ public class WalletRequest {
 
     /** 현재 평가금액 (INVEST 전용, 수동 갱신) */
     private Long currentValue;
-
-    // ===== 대출(LOAN) 전용 =====
-    private Long loanAmount;       // 대출 실행 금액(원금)
-
-    @DecimalMin(value = "0.0", inclusive = true)
-    @DecimalMax(value = "100.0", message = "이자율은 100% 이하여야 합니다.")
-    private BigDecimal loanRate;   // 연이자율(%)
-
-    @Pattern(regexp = "EQUAL_PAYMENT|EQUAL_PRINCIPAL|BULLET|", message = "상환방식이 올바르지 않습니다.")
-    private String loanMethod;     // 상환방식
-
-    private Integer loanMonths;    // 대출기간(개월)
-    private LocalDate loanStart;   // 대출시작일
 }

src/main/java/com/sb/web/account/dto/WalletResponse.java

@@ -4,7 +4,6 @@ import com.sb.web.account.domain.Wallet;
 import lombok.Builder;
 import lombok.Data;
 
-import java.math.BigDecimal;
 import java.time.LocalDate;
 
 /**
@@ -32,13 +31,6 @@ public class WalletResponse {
     private Long currentValue;    // 평가액 직접입력값(퇴직연금·연금 등 수동 갱신). 있으면 총평가로 사용
     private Boolean manualValuation; // true면 평가액 직접입력형(종목 자동계산 대신)
 
-    // 대출(LOAN) 전용
-    private Long loanAmount;       // 대출 실행 금액(원금)
-    private BigDecimal loanRate;   // 연이자율(%) e.g. 5.25
-    private String loanMethod;     // EQUAL_PAYMENT / EQUAL_PRINCIPAL / BULLET
-    private Integer loanMonths;    // 대출기간(개월)
-    private LocalDate loanStart;   // 대출시작일
-
     public static WalletResponse from(Wallet w, long balance) {
         return WalletResponse.builder()
                 .id(w.getId())
@@ -51,11 +43,6 @@ public class WalletResponse {
                 .openingDate(w.getOpeningDate())
                 .balance(balance)
                 .currentValue(w.getCurrentValue())
-                .loanAmount(w.getLoanAmount())
-                .loanRate(w.getLoanRate())
-                .loanMethod(w.getLoanMethod())
-                .loanMonths(w.getLoanMonths())
-                .loanStart(w.getLoanStart())
                 .build();
     }
 }

src/main/java/com/sb/web/account/service/AccountService.java

@@ -535,12 +535,6 @@ public class AccountService {
         wallet.setOpeningBalance(req.getOpeningBalance() != null ? req.getOpeningBalance() : 0L);
         wallet.setOpeningDate(req.getOpeningDate());
         wallet.setCurrentValue("INVEST".equals(req.getType()) ? req.getCurrentValue() : null);
-        boolean isLoan = "LOAN".equals(req.getType());
-        wallet.setLoanAmount(isLoan ? req.getLoanAmount() : null);
-        wallet.setLoanRate(isLoan ? req.getLoanRate() : null);
-        wallet.setLoanMethod(isLoan ? blankToNull(req.getLoanMethod()) : null);
-        wallet.setLoanMonths(isLoan ? req.getLoanMonths() : null);
-        wallet.setLoanStart(isLoan ? req.getLoanStart() : null);
         walletMapper.update(wallet);
         return WalletResponse.from(wallet, balanceMap(memberId).getOrDefault(id, wallet.getOpeningBalance()));
     }
@@ -570,7 +564,6 @@ public class AccountService {
     }
 
     private Wallet toWallet(WalletRequest req) {
-        boolean isLoan = "LOAN".equals(req.getType());
         return Wallet.builder()
                 .type(req.getType())
                 .name(req.getName().trim())
@@ -580,11 +573,6 @@ public class AccountService {
                 .openingBalance(req.getOpeningBalance() != null ? req.getOpeningBalance() : 0L)
                 .openingDate(req.getOpeningDate())
                 .currentValue("INVEST".equals(req.getType()) ? req.getCurrentValue() : null)
-                .loanAmount(isLoan ? req.getLoanAmount() : null)
-                .loanRate(isLoan ? req.getLoanRate() : null)
-                .loanMethod(isLoan ? blankToNull(req.getLoanMethod()) : null)
-                .loanMonths(isLoan ? req.getLoanMonths() : null)
-                .loanStart(isLoan ? req.getLoanStart() : null)
                 .build();
     }
 

src/main/resources/db/account.sql

@@ -28,11 +28,6 @@ ALTER TABLE wallet ADD COLUMN IF NOT EXISTS opening_balance BIGINT NOT NULL DEFA
 ALTER TABLE wallet ADD COLUMN IF NOT EXISTS opening_date DATE NULL;
 ALTER TABLE wallet ADD COLUMN IF NOT EXISTS current_value BIGINT NULL;
 ALTER TABLE wallet ADD COLUMN IF NOT EXISTS sort_order INT NOT NULL DEFAULT 0;
-ALTER TABLE wallet ADD COLUMN IF NOT EXISTS loan_rate    DECIMAL(7,4) NULL COMMENT '연이자율(%) 예: 5.2500';
-ALTER TABLE wallet ADD COLUMN IF NOT EXISTS loan_method  VARCHAR(20)  NULL COMMENT '상환방식: EQUAL_PAYMENT/EQUAL_PRINCIPAL/BULLET';
-ALTER TABLE wallet ADD COLUMN IF NOT EXISTS loan_months  INT          NULL COMMENT '대출기간(개월)';
-ALTER TABLE wallet ADD COLUMN IF NOT EXISTS loan_start   DATE         NULL COMMENT '대출시작일';
-ALTER TABLE wallet ADD COLUMN IF NOT EXISTS loan_amount  BIGINT       NULL COMMENT '대출 실행 금액(원금, 처음 빌린 금액)';
 -- 계좌번호 암호화 저장(AES-GCM)으로 평문보다 길어 VARCHAR(255) 필요 — 운영 적용 완료(CREATE TABLE 정의에 반영).
 -- 매 기동 MODIFY 는 라이브 테이블 락 위험이 있어 제거. 기존 환경 확장이 필요하면 1회 수동 적용:
 --   ALTER TABLE wallet MODIFY account_number VARCHAR(255) NULL;

src/main/resources/mapper/WalletMapper.xml

@@ -15,20 +15,13 @@
         <result property="openingBalance" column="opening_balance"/>
         <result property="openingDate" column="opening_date"/>
         <result property="currentValue" column="current_value"/>
-        <result property="loanAmount" column="loan_amount"/>
-        <result property="loanRate" column="loan_rate"/>
-        <result property="loanMethod" column="loan_method"/>
-        <result property="loanMonths" column="loan_months"/>
-        <result property="loanStart" column="loan_start"/>
         <result property="sortOrder" column="sort_order"/>
         <result property="createdAt" column="created_at"/>
         <result property="updatedAt" column="updated_at"/>
     </resultMap>
 
     <sql id="cols">id, member_id, type, name, issuer, account_number, card_type,
-        opening_balance, opening_date, current_value,
+        opening_balance, opening_date, current_value, sort_order, created_at, updated_at</sql>
-        loan_amount, loan_rate, loan_method, loan_months, loan_start,
-        sort_order, created_at, updated_at</sql>
 
     <select id="findByMember" parameterType="long" resultMap="walletResultMap">
         SELECT <include refid="cols"/> FROM wallet
@@ -44,14 +37,10 @@
     <insert id="insert" parameterType="com.sb.web.account.domain.Wallet"
             useGeneratedKeys="true" keyProperty="id">
         INSERT INTO wallet (member_id, type, name, issuer, account_number, card_type,
-                            opening_balance, opening_date, current_value,
+                            opening_balance, opening_date, current_value, sort_order, created_at, updated_at)
-                            loan_amount, loan_rate, loan_method, loan_months, loan_start,
-                            sort_order, created_at, updated_at)
         VALUES (#{memberId}, #{type}, #{name}, #{issuer},
                 #{accountNumber, typeHandler=com.sb.web.common.crypto.EncryptedStringTypeHandler}, #{cardType},
-                #{openingBalance}, #{openingDate}, #{currentValue},
+                #{openingBalance}, #{openingDate}, #{currentValue}, #{sortOrder}, NOW(), NOW())
-                #{loanAmount}, #{loanRate}, #{loanMethod}, #{loanMonths}, #{loanStart},
-                #{sortOrder}, NOW(), NOW())
     </insert>
 
     <update id="update" parameterType="com.sb.web.account.domain.Wallet">
@@ -60,10 +49,7 @@
             account_number = #{accountNumber, typeHandler=com.sb.web.common.crypto.EncryptedStringTypeHandler},
             card_type = #{cardType},
             opening_balance = #{openingBalance}, opening_date = #{openingDate},
-            current_value = #{currentValue},
+            current_value = #{currentValue}
-            loan_amount = #{loanAmount},
-            loan_rate = #{loanRate}, loan_method = #{loanMethod},
-            loan_months = #{loanMonths}, loan_start = #{loanStart}
         WHERE id = #{id} AND member_id = #{memberId}
     </update>