Merge remote-tracking branch 'origin/develop'

mash-up-kr · Aug 23, 2024 · 8e41ab5 · 8e41ab5
2 parents 6e68633 + 47955f0
commit 8e41ab5
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/mashup-member/src/main/java/kr/mashup/branding/facade/birthday/BirthdayFacadeService.java b/mashup-member/src/main/java/kr/mashup/branding/facade/birthday/BirthdayFacadeService.java
@@ -20,6 +20,7 @@
 import java.time.MonthDay;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 @Service
@@ -57,7 +58,7 @@ private Map<MonthDay, List<MemberBirthdayDto>> calculateUpcomingBirthdays(Member
         MonthDay endDay = MonthDay.from(LocalDate.now().plusDays(days));
         return memberProfileService.findByBirthDateBetween(today, endDay, generation)
             .stream()
-            .filter(birthdayDto -> birthdayDto.getMemberId() != member.getId())
+            .filter(birthdayDto -> !Objects.equals(birthdayDto.getMemberId(), member.getId()))
             .collect(Collectors.groupingBy(MemberBirthdayDto::getBirthDate));
     }