From 9d5ae0485df889c3cafd834e423b8024807f02c0 Mon Sep 17 00:00:00 2001 From: jihyeon baek Date: Tue, 25 Jun 2024 21:34:24 +0900 Subject: [PATCH 1/2] =?UTF-8?q?chore:=20d-day=20=EA=B8=B0=EB=85=90?= =?UTF-8?q?=EC=9D=BC=20=EB=B0=98=ED=99=98=20=EC=8B=9C=20name=20=ED=95=84?= =?UTF-8?q?=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/anniversary/dto/AnniversaryResponseDTO.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/com/example/fiurinee/domain/anniversary/dto/AnniversaryResponseDTO.java b/src/main/java/com/example/fiurinee/domain/anniversary/dto/AnniversaryResponseDTO.java index 0eba0b7..e601055 100644 --- a/src/main/java/com/example/fiurinee/domain/anniversary/dto/AnniversaryResponseDTO.java +++ b/src/main/java/com/example/fiurinee/domain/anniversary/dto/AnniversaryResponseDTO.java @@ -15,6 +15,7 @@ @Builder public class AnniversaryResponseDTO { private Long id; + private String name; private String anniversaryDate; private String type; private List> dDays; @@ -22,6 +23,7 @@ public class AnniversaryResponseDTO { public static AnniversaryResponseDTO of(Anniversary anniversary, List> dDays) { return AnniversaryResponseDTO.builder() .id(anniversary.getId()) + .name(anniversary.getName()) .anniversaryDate(anniversary.getAnniversaryDate().toString()) .type(anniversary.getType().name()) .dDays(dDays) @@ -37,6 +39,7 @@ public static AnniversaryResponseDTO empty() { return AnniversaryResponseDTO.builder() .id(null) + .name(null) .anniversaryDate(null) .type(null) .dDays(dDays) From 830e02089cf9c1958c1f37c67eb3cb69d8a78e3d Mon Sep 17 00:00:00 2001 From: jihyeon baek Date: Tue, 25 Jun 2024 21:58:34 +0900 Subject: [PATCH 2/2] =?UTF-8?q?chore:=20d-day=20=EB=A9=A4=EB=B2=84=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20=EC=8B=9C=20name=20=ED=95=84=EB=93=9C=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/fiurinee/domain/member/dto/MemberResponseDTO.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/example/fiurinee/domain/member/dto/MemberResponseDTO.java b/src/main/java/com/example/fiurinee/domain/member/dto/MemberResponseDTO.java index ae25710..1a85b49 100644 --- a/src/main/java/com/example/fiurinee/domain/member/dto/MemberResponseDTO.java +++ b/src/main/java/com/example/fiurinee/domain/member/dto/MemberResponseDTO.java @@ -34,6 +34,7 @@ public static MemberResponseDTO of(Member member) { .anniversaries(member.getAnniversaries().stream() .map(anniversary -> Map.of( "id", anniversary.getId(), + "name", anniversary.getName(), "anniversaryDate", anniversary.getAnniversaryDate().toString(), "type", anniversary.getType().name(), "d-day", anniversaryService.calculateDDay(anniversary)