chore: 기념일 정렬

Fiurinee-Tave · Jul 3, 2024 · 6cd9e64 · 6cd9e64
1 parent 17fdeda
commit 6cd9e64
Showing 1 changed file with 15 additions and 7 deletions.
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
@@ -32,13 +32,21 @@ public static MemberResponseDTO of(Member member) {
                 .profileImage(member.getProfileImage())
                 .alarm(member.isAlarm())
                 .anniversaries(member.getAnniversaries().stream()
-                        .map(anniversary -> Map.<String, Object>of(
-                                "id", anniversary.getId(),
-                                "name", anniversary.getName(),
-                                "anniversaryDate", anniversary.getAnniversaryDate().toString().substring(0,10),
-                                "type", anniversary.getType().name(),
-                                "dDays", anniversaryService.calculateDDay(anniversary)
-                        ))
+                        .map(anniversary -> {
+                            List<Map<String, Integer>> dDays = anniversaryService.calculateDDay(anniversary);
+                            return Map.of(
+                                    "id", anniversary.getId(),
+                                    "name", anniversary.getName(),
+                                    "anniversaryDate", anniversary.getAnniversaryDate().toString().substring(0, 10),
+                                    "type", anniversary.getType().name(),
+                                    "dDays", dDays
+                            );
+                        })
+                        .sorted((a1, a2) -> {
+                            Integer dDay1 = (Integer) ((Map.Entry) ((Map<String, Integer>) a1.get("dDays").get(0)).entrySet().iterator().next()).getValue();
+                            Integer dDay2 = (Integer) ((Map.Entry) ((Map<String, Integer>) a2.get("dDays").get(0)).entrySet().iterator().next()).getValue();
+                            return dDay1.compareTo(dDay2);
+                        })
                         .collect(Collectors.toList()))
                 .build();
     }