From 5580118665c3d9b28991fd54866114d48f8f6004 Mon Sep 17 00:00:00 2001 From: Lee Haewon Date: Mon, 8 Apr 2024 17:57:52 +0900 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=EB=A7=88=EC=9D=B4=EC=9B=94?= =?UTF-8?q?=EB=A0=9B=20=EC=A1=B0=ED=9A=8C=20=EB=8B=89=EB=84=A4=EC=9E=84=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=20=20(#31)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ewha/lux/once/domain/card/dto/MyWalletResponseDto.java | 1 + .../java/ewha/lux/once/domain/card/service/CardService.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/ewha/lux/once/domain/card/dto/MyWalletResponseDto.java b/src/main/java/ewha/lux/once/domain/card/dto/MyWalletResponseDto.java index fd7a5e1..e4e851f 100644 --- a/src/main/java/ewha/lux/once/domain/card/dto/MyWalletResponseDto.java +++ b/src/main/java/ewha/lux/once/domain/card/dto/MyWalletResponseDto.java @@ -14,6 +14,7 @@ public class MyWalletResponseDto { @NoArgsConstructor @Builder public static class MyWalletProfileDto { + private String nickname; List ownedCardList; } diff --git a/src/main/java/ewha/lux/once/domain/card/service/CardService.java b/src/main/java/ewha/lux/once/domain/card/service/CardService.java index d2f2aca..63ef161 100644 --- a/src/main/java/ewha/lux/once/domain/card/service/CardService.java +++ b/src/main/java/ewha/lux/once/domain/card/service/CardService.java @@ -18,7 +18,6 @@ import lombok.extern.slf4j.Slf4j; import org.json.simple.JSONArray; import org.json.simple.JSONObject; -import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; import java.util.*; @@ -68,6 +67,7 @@ public MyWalletResponseDto.MyWalletProfileDto getMyWalletInfo(Users nowUser) thr .toList(); return MyWalletResponseDto.MyWalletProfileDto.builder() + .nickname(nowUser.getNickname()) .ownedCardList(ownedCardList) .build(); } @@ -119,6 +119,7 @@ public MontlyBenefitResponseDto.MontlyBenefitProfileDto getMontlyBenefitInfo(Use )) .collect(Collectors.toList()); + return MontlyBenefitResponseDto.MontlyBenefitProfileDto.builder() .month(month) .receivedSum(receivedSum) From 7694ab25b2459f0d156e18ce9c819b127b6418d5 Mon Sep 17 00:00:00 2001 From: Lee Haewon Date: Mon, 8 Apr 2024 21:28:10 +0900 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=EB=A7=88=EC=9D=B4=EC=9B=94?= =?UTF-8?q?=EB=A0=9B=20=EC=A1=B0=ED=9A=8C=20=EC=B9=B4=EB=93=9C=EC=82=AC=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=20=20(#31)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/ewha/lux/once/domain/card/dto/MyWalletResponseDto.java | 1 + src/main/java/ewha/lux/once/domain/card/service/CardService.java | 1 + 2 files changed, 2 insertions(+) diff --git a/src/main/java/ewha/lux/once/domain/card/dto/MyWalletResponseDto.java b/src/main/java/ewha/lux/once/domain/card/dto/MyWalletResponseDto.java index e4e851f..6eb4e09 100644 --- a/src/main/java/ewha/lux/once/domain/card/dto/MyWalletResponseDto.java +++ b/src/main/java/ewha/lux/once/domain/card/dto/MyWalletResponseDto.java @@ -25,6 +25,7 @@ public static class MyWalletProfileDto { public static class OwnedCardListDto { private Long ownedCardId; private String cardName; + private String cardCompany; private int cardType; private String cardImg; private boolean isMaincard; diff --git a/src/main/java/ewha/lux/once/domain/card/service/CardService.java b/src/main/java/ewha/lux/once/domain/card/service/CardService.java index 63ef161..25c297c 100644 --- a/src/main/java/ewha/lux/once/domain/card/service/CardService.java +++ b/src/main/java/ewha/lux/once/domain/card/service/CardService.java @@ -55,6 +55,7 @@ public MyWalletResponseDto.MyWalletProfileDto getMyWalletInfo(Users nowUser) thr return new MyWalletResponseDto.OwnedCardListDto( ownedCard.getId(), ownedCard.getCard().getName(), + ownedCard.getCard().getCardCompany().getName(), ownedCard.getCard().getType().ordinal(), ownedCard.getCard().getImgUrl(), ownedCard.isMain(),