Merge commit 'ca80e76'

mash-up-kr · Apr 6, 2024 · 813941d · 813941d
2 parents 66235ae + ca80e76
commit 813941d
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 22 deletions.
diff --git a/...domain/src/main/java/kr/mashup/branding/repository/member/MemberRepositoryCustomImpl.java b/...domain/src/main/java/kr/mashup/branding/repository/member/MemberRepositoryCustomImpl.java
@@ -129,8 +129,8 @@ public List<Member> findAllByCurrentGenerationAt(LocalDate at) {
         return queryFactory
             .selectFrom(member)
             .join(memberGeneration).on(memberGeneration.member.eq(member))
-            .where(memberGeneration.generation.startedAt.before(at)
-                .and(memberGeneration.generation.endedAt.after(at))
+            .where(memberGeneration.generation.startedAt.loe(at)
+                .and(memberGeneration.generation.endedAt.goe(at))
             )
             .fetch();
     }

diff --git a/...up-member/src/main/java/kr/mashup/branding/facade/attendance/AttendanceFacadeService.java b/...up-member/src/main/java/kr/mashup/branding/facade/attendance/AttendanceFacadeService.java
@@ -1,19 +1,5 @@
 package kr.mashup.branding.facade.attendance;
 
-import java.time.LocalDateTime;
-import java.time.temporal.ChronoUnit;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import kr.mashup.branding.domain.ResultCode;
 import kr.mashup.branding.domain.attendance.Attendance;
 import kr.mashup.branding.domain.attendance.AttendanceCode;
@@ -37,13 +23,17 @@
 import kr.mashup.branding.service.member.MemberService;
 import kr.mashup.branding.service.schedule.ScheduleService;
 import kr.mashup.branding.ui.attendance.request.AttendanceCheckRequest;
-import kr.mashup.branding.ui.attendance.response.AttendanceCheckResponse;
-import kr.mashup.branding.ui.attendance.response.AttendanceInfo;
-import kr.mashup.branding.ui.attendance.response.PersonalAttendanceResponse;
-import kr.mashup.branding.ui.attendance.response.PlatformAttendanceResponse;
-import kr.mashup.branding.ui.attendance.response.TotalAttendanceResponse;
+import kr.mashup.branding.ui.attendance.response.*;
 import kr.mashup.branding.util.DateUtil;
 import lombok.RequiredArgsConstructor;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
+import java.time.temporal.ChronoUnit;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 @RequiredArgsConstructor
@@ -363,7 +353,7 @@ private List<AttendanceInfo> getAttendanceInfoByMember(
         final LocalDateTime now = LocalDateTime.now();
         // 스케줄 시작 전에는 빈 리스트를 내려준다.
         if (now.isBefore(scheduleStartedAt)) {
-            return Collections.emptyList();
+            return Collections.nCopies(events.size(), AttendanceInfo.beforeSchedule());
         }
 
         return events.stream().map(event -> {

diff --git a/mashup-member/src/main/java/kr/mashup/branding/ui/attendance/response/AttendanceInfo.java b/mashup-member/src/main/java/kr/mashup/branding/ui/attendance/response/AttendanceInfo.java
@@ -14,4 +14,8 @@ public class AttendanceInfo {
     AttendanceStatus status;
     @ApiModelProperty(notes = "결석일 경우 null")
     LocalDateTime attendanceAt;
+
+    public static AttendanceInfo beforeSchedule() {
+        return new AttendanceInfo(AttendanceStatus.NOT_YET, null);
+    }
 }