Merge branch 'dev' of https://github.com/Tave-13th-Project-Team-4-Fiu…

…rinee/Server into feature/mail
Fiurinee-Tave · Jun 26, 2024 · 3ff273b · 3ff273b
2 parents 1f93868 + 7fb621e
commit 3ff273b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
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
@@ -15,13 +15,15 @@
 @Builder
 public class AnniversaryResponseDTO {
     private Long id;
+    private String name;
     private String anniversaryDate;
     private String type;
     private List<Map<String, Integer>> dDays;
 
     public static AnniversaryResponseDTO of(Anniversary anniversary, List<Map<String, Integer>> 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)

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
@@ -34,6 +34,7 @@ public static MemberResponseDTO of(Member member) {
                 .anniversaries(member.getAnniversaries().stream()
                         .map(anniversary -> Map.<String, Object>of(
                                 "id", anniversary.getId(),
+                                "name", anniversary.getName(),
                                 "anniversaryDate", anniversary.getAnniversaryDate().toString(),
                                 "type", anniversary.getType().name(),
                                 "d-day", anniversaryService.calculateDDay(anniversary)