fix: 응답값에 회원번호 추가

mash-up-kr · Jul 8, 2024 · d430d55 · d430d55
1 parent 5994320
commit d430d55
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/mashup-domain/src/main/java/kr/mashup/branding/service/member/MemberService.java b/mashup-domain/src/main/java/kr/mashup/branding/service/member/MemberService.java
@@ -342,8 +342,8 @@ public void dropOut(final Generation generation, final List<Member> members) {
     public MemberGeneration getCurrentMemberGeneration(Member member) {
         return member.getMemberGenerations()
             .stream()
-            .filter(memberGeneration -> memberGeneration.getGeneration().isInProgress(LocalDate.now()))
             .max(Comparator.comparingInt(mg -> mg.getGeneration().getNumber()))
+            .filter(memberGeneration -> memberGeneration.getGeneration().isInProgress(LocalDate.now()))
             .orElseThrow(InactiveGenerationException::new);
     }
 

diff --git a/...up-member/src/main/java/kr/mashup/branding/ui/member/response/MemberBirthdayResponse.java b/...up-member/src/main/java/kr/mashup/branding/ui/member/response/MemberBirthdayResponse.java
@@ -16,6 +16,7 @@ public class MemberBirthdayResponse {
     @Getter
     @RequiredArgsConstructor
     public static class Member {
+        private final long id;
         private final String name;
         private final String platform;
         private final boolean congratulated;

diff --git a/...p-member/src/main/java/kr/mashup/branding/ui/member/response/MemberBirthdaysResponse.java b/...p-member/src/main/java/kr/mashup/branding/ui/member/response/MemberBirthdaysResponse.java
@@ -35,6 +35,7 @@ private static List<MemberBirthdayResponse> createResponses(Set<Long> sentMember
                 entry.getKey(),
                 entry.getValue().stream()
                     .map(dto -> new MemberBirthdayResponse.Member(
+                        dto.getMemberId(),
                         dto.getName(),
                         dto.getPlatform().getName(),
                         sentMemberIds.contains(dto.getMemberId())