From 1bf5cd78ebfa370ae9909c58271a3d16136b63a0 Mon Sep 17 00:00:00 2001 From: jihoo2002 Date: Thu, 21 Aug 2025 21:03:53 +0900 Subject: [PATCH 1/4] =?UTF-8?q?Refactor(#55)=20:=20=EC=8A=A4=EC=9B=A8?= =?UTF-8?q?=EA=B1=B0=20=EC=84=A4=EB=AA=85=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../savepay/domain/discount/controller/DiscountController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/savepay/savepay/domain/discount/controller/DiscountController.java b/src/main/java/savepay/savepay/domain/discount/controller/DiscountController.java index 5cf65da..29f2d85 100644 --- a/src/main/java/savepay/savepay/domain/discount/controller/DiscountController.java +++ b/src/main/java/savepay/savepay/domain/discount/controller/DiscountController.java @@ -30,7 +30,7 @@ public ApiResponse createDiscount(@RequestBody DiscountRequestDto.toDisc } @PostMapping("/discounts") - @Operation(summary = "유저 등록수단별 혜택 반환 API", description = "카드/페이/통신사별 혜택 리스트를 모두 반환하는 메서드") + @Operation(summary = "유저 검색어에 따른 등록수단별 혜택 반환 API", description = "카드/페이/통신사별 혜택 리스트를 모두 반환하는 메서드") public ApiResponse> getAllDiscounts(@UserInjection User user, @RequestBody DiscountRequestDto.toBrandNameDto request) { return ApiResponse.onSuccess(discountQueryService.getAllDiscounts(user, request)); From b110b9e74dcae9c59b6d8640ce9ea701ea0c231f Mon Sep 17 00:00:00 2001 From: jihoo2002 Date: Thu, 21 Aug 2025 21:04:10 +0900 Subject: [PATCH 2/4] =?UTF-8?q?Refactor(#55)=20:=20=EA=B2=B0=EC=A0=9C?= =?UTF-8?q?=EC=88=98=EB=8B=A8=20=ED=83=80=EC=9E=85=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../savepay/domain/discount/converter/DiscountConverter.java | 2 ++ .../savepay/domain/discount/dto/DiscountResponseDto.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/savepay/savepay/domain/discount/converter/DiscountConverter.java b/src/main/java/savepay/savepay/domain/discount/converter/DiscountConverter.java index 96e6533..0b632a2 100644 --- a/src/main/java/savepay/savepay/domain/discount/converter/DiscountConverter.java +++ b/src/main/java/savepay/savepay/domain/discount/converter/DiscountConverter.java @@ -1,3 +1,4 @@ + package savepay.savepay.domain.discount.converter; import savepay.savepay.domain.discount.dto.DiscountResponseDto; @@ -16,6 +17,7 @@ public static DiscountResponseDto.DiscountInfo toDiscountInfoDto(Discount discou .pointInfo(discount.getPointInfo()) .details(discount.getDetails()) .createdAt(discount.getCreatedAt()) + .source(DiscountInfoHelper.resolveSource(discount)) .build(); } } diff --git a/src/main/java/savepay/savepay/domain/discount/dto/DiscountResponseDto.java b/src/main/java/savepay/savepay/domain/discount/dto/DiscountResponseDto.java index ef7561b..a71239e 100644 --- a/src/main/java/savepay/savepay/domain/discount/dto/DiscountResponseDto.java +++ b/src/main/java/savepay/savepay/domain/discount/dto/DiscountResponseDto.java @@ -19,6 +19,6 @@ public static class DiscountInfo { String details; //혜택방법 상세 String pointInfo; // 포인트 정보 LocalDateTime createdAt; - + String source; } } From 8ef2e500399b5ea1a4fd37a9259f54bbfb5edf60 Mon Sep 17 00:00:00 2001 From: jihoo2002 Date: Thu, 21 Aug 2025 21:04:29 +0900 Subject: [PATCH 3/4] =?UTF-8?q?Refactor(#55)=20:=20=EA=B2=B0=EC=A0=9C?= =?UTF-8?q?=EC=88=98=EB=8B=A8=20=EB=B3=80=ED=99=98=ED=95=98=EB=8A=94=20Dis?= =?UTF-8?q?countInfoHelper=20=ED=81=B4=EB=9E=98=EC=8A=A4=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../discount/converter/DiscountInfoHelper.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 src/main/java/savepay/savepay/domain/discount/converter/DiscountInfoHelper.java diff --git a/src/main/java/savepay/savepay/domain/discount/converter/DiscountInfoHelper.java b/src/main/java/savepay/savepay/domain/discount/converter/DiscountInfoHelper.java new file mode 100644 index 0000000..8a87a39 --- /dev/null +++ b/src/main/java/savepay/savepay/domain/discount/converter/DiscountInfoHelper.java @@ -0,0 +1,14 @@ +package savepay.savepay.domain.discount.converter; + +import savepay.savepay.domain.discount.entity.Discount; +import savepay.savepay.domain.payment.entity.card.entity.Card; + +public class DiscountInfoHelper { + + public static String resolveSource(Discount discount) { + if (discount.getTelecom() != null) return "TELECOM"; + if (discount.getPayment() instanceof Card) return "CARD"; + if (discount.getPayment() != null) return "PAY"; + return "UNKNOWN"; + } +} From 9232058d4501a50f8bb840e5ed51a190a116998c Mon Sep 17 00:00:00 2001 From: jihoo2002 Date: Fri, 22 Aug 2025 09:24:34 +0900 Subject: [PATCH 4/4] =?UTF-8?q?Refactor(#55)=20:=20=EB=B3=80=ED=99=98=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EB=95=8C=EB=AC=B8=EC=97=90=20Hibernate.ge?= =?UTF-8?q?tClass()=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../discount/converter/DiscountInfoHelper.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/savepay/savepay/domain/discount/converter/DiscountInfoHelper.java b/src/main/java/savepay/savepay/domain/discount/converter/DiscountInfoHelper.java index 8a87a39..3782496 100644 --- a/src/main/java/savepay/savepay/domain/discount/converter/DiscountInfoHelper.java +++ b/src/main/java/savepay/savepay/domain/discount/converter/DiscountInfoHelper.java @@ -1,14 +1,22 @@ package savepay.savepay.domain.discount.converter; +import org.hibernate.Hibernate; import savepay.savepay.domain.discount.entity.Discount; +import savepay.savepay.domain.payment.entity.Payment; import savepay.savepay.domain.payment.entity.card.entity.Card; +import savepay.savepay.domain.payment.entity.pay.entity.Pay; public class DiscountInfoHelper { public static String resolveSource(Discount discount) { if (discount.getTelecom() != null) return "TELECOM"; - if (discount.getPayment() instanceof Card) return "CARD"; - if (discount.getPayment() != null) return "PAY"; + Payment payment = discount.getPayment(); + if (payment != null) { + Class actualClass = Hibernate.getClass(payment); + + if (Card.class.isAssignableFrom(actualClass)) return "CARD"; + if (Pay.class.isAssignableFrom(actualClass)) return "PAY"; + } return "UNKNOWN"; } }