Release 1.0.4 (#12)

## 📝 작업 내용

- feature: 주문 결제 원거래일시 yyMMdd 포맷으로 변경

## 📷 스크린샷 (선택)

## 💬 리뷰 요구사항(선택)

Author: handwoong

docker-compose.yml

@@ -2,7 +2,7 @@ services:
   everyonewaiter-api:
     container_name: everyonewaiter-api
     build: .
-    image: everyonewaiter-api:1.0.3
+    image: everyonewaiter-api:1.0.4
     ports:
       - "8081:8081"
     volumes:

gradle.properties

@@ -1,6 +1,6 @@
 # Artifact
 appGroup=com.everyonewaiter
-appVersion=1.0.3
+appVersion=1.0.4
 
 # Plugin
 springBoot=3.5.4

src/main/java/com/everyonewaiter/domain/order/OrderPayment.java

@@ -77,7 +77,7 @@ public class OrderPayment extends AggregateRootEntity<OrderPayment> {
   private String merchantNo; // 카드사/포인트사 가맹점 번호
 
   @Column(name = "trade_time", nullable = false, length = 20)
-  private String tradeTime; // 거래일시 yyMMddHHmmss
+  private String tradeTime; // 거래일시 yyMMdd
 
   @Column(name = "trade_unique_no", nullable = false, length = 30)
   private String tradeUniqueNo; // 거래 고유 번호
@@ -88,7 +88,7 @@ public class OrderPayment extends AggregateRootEntity<OrderPayment> {
   @Column(name = "supply_amount", nullable = false)
   private long supplyAmount; // 공급가액
 
-  @Column(name = "cash_receipt_no", nullable = true, length = 30)
+  @Column(name = "cash_receipt_no", nullable = false, length = 30)
   private String cashReceiptNo; // 현금 영수증 번호
 
   @Enumerated(EnumType.STRING)

src/main/java/com/everyonewaiter/domain/order/OrderPaymentApproveRequest.java

@@ -44,8 +44,9 @@ public record OrderPaymentApproveRequest(
     @NotNull(message = "카드사/포인트사 가맹점 번호이 누락되었습니다.")
     String merchantNo,
 
-    @Schema(description = "카드 거래일시 YYMMDDHHmmss", example = "250101120000", requiredMode = REQUIRED)
+    @Schema(description = "카드 거래일시 yyMMdd", example = "250101", requiredMode = REQUIRED)
     @NotNull(message = "카드 거래일시가 누락되었습니다.")
+    @Size(max = 6, message = "카드 거래일시는 최대 6자 이하로 입력해 주세요.")
     String tradeTime,
 
     @Schema(description = "카드 거래 고유 번호", example = "1234567890", requiredMode = REQUIRED)
@@ -71,15 +72,15 @@ public record OrderPaymentApproveRequest(
     CashReceiptType cashReceiptType
 ) {
 
-  public boolean isCard() {
+  private boolean isCard() {
     return method == OrderPaymentMethod.CARD;
   }
 
-  public boolean isCash() {
+  private boolean isCash() {
     return method == OrderPaymentMethod.CASH;
   }
 
-  public boolean isPureCash() {
+  private boolean isPureCash() {
     return isCash() && cashReceiptType == CashReceiptType.NONE;
   }
 
@@ -115,7 +116,7 @@ public String merchantNo() {
 
   @Override
   public String tradeTime() {
-    return isPureCash() ? DateFormatter.formatCurrentKstTime() : tradeTime;
+    return isPureCash() ? DateFormatter.getSimpleKstDate() : tradeTime;
   }
 
   @Override

src/main/java/com/everyonewaiter/domain/order/OrderPaymentCancelRequest.java

@@ -5,15 +5,17 @@
 import com.everyonewaiter.domain.support.DateFormatter;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 
 @Schema(name = "OrderPaymentCancelRequest")
 public record OrderPaymentCancelRequest(
     @Schema(description = "카드 결제 승인 번호", example = "1234567890", requiredMode = REQUIRED)
     @NotNull(message = "카드 결제 승인 번호가 누락되었습니다.")
     String approvalNo,
 
-    @Schema(description = "카드 거래일시 YYMMDDHHmmss", example = "250101120000", requiredMode = REQUIRED)
+    @Schema(description = "카드 거래일시 yyMMdd", example = "250101", requiredMode = REQUIRED)
     @NotNull(message = "카드 거래일시가 누락되었습니다.")
+    @Size(max = 6, message = "카드 거래일시는 최대 6자 이하로 입력해 주세요.")
     String tradeTime,
 
     @Schema(description = "카드 거래 고유 번호", example = "1234567890", requiredMode = REQUIRED)
@@ -26,7 +28,7 @@ public String approvalNo(boolean isPureCash) {
   }
 
   public String tradeTime(boolean isPureCash) {
-    return isPureCash ? DateFormatter.formatCurrentKstTime() : tradeTime;
+    return isPureCash ? DateFormatter.getSimpleKstDate() : tradeTime;
   }
 
   public String tradeUniqueNo(boolean isPureCash) {

src/main/java/com/everyonewaiter/domain/support/DateFormatter.java

@@ -11,15 +11,15 @@ public final class DateFormatter {
 
   public static final DateTimeFormatter SERIALIZE =
       DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+  public static final DateTimeFormatter SIMPLE_YEAR_MONTH_DAY =
+      DateTimeFormatter.ofPattern("yyMMdd");
   public static final DateTimeFormatter YEAR_MONTH = DateTimeFormatter.ofPattern("yyyyMM");
   public static final DateTimeFormatter YEAR_MONTH_DAY = DateTimeFormatter.ofPattern("yyyyMMdd");
-  public static final DateTimeFormatter YEAR_MONTH_DAY_HOUR_MINUTE_SECOND =
-      DateTimeFormatter.ofPattern("yyMMddHHmmss");
 
-  public static String formatCurrentKstTime() {
+  public static String getSimpleKstDate() {
     LocalDateTime now = LocalDateTime.now(TimeZone.ASIA_SEOUL.zoneId());
 
-    return now.format(YEAR_MONTH_DAY_HOUR_MINUTE_SECOND);
+    return now.format(SIMPLE_YEAR_MONTH_DAY);
   }
 
 }