[WTH-83] 출석 관리 페이지에서 이번주차 반환

src/main/java/leets/weeth/domain/attendance/presentation/AttendanceAdminController.java

@@ -34,8 +34,8 @@ public CommonResponse<Void> close(@RequestParam LocalDate now, @RequestParam Int
 
     @GetMapping("/meetings")
     @Operation(summary = "정기모임 조회")
-    public CommonResponse<List<MeetingDTO.Info>> getMeetings(@RequestParam(required = false) Integer cardinal) {
-        List<MeetingDTO.Info> response = meetingUseCase.find(cardinal);
+    public CommonResponse<MeetingDTO.Infos> getMeetings(@RequestParam(required = false) Integer cardinal) {
+        MeetingDTO.Infos response = meetingUseCase.find(cardinal);
 
         return CommonResponse.createSuccess(MEETING_FIND_SUCCESS.getMessage(), response);
     }

src/main/java/leets/weeth/domain/schedule/application/dto/MeetingDTO.java

@@ -4,6 +4,7 @@
 import leets.weeth.domain.schedule.domain.entity.enums.Type;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 public class MeetingDTO {
 
@@ -31,4 +32,10 @@ public record Info(
             LocalDateTime start
     ) {}
 
+    public record Infos(
+        Info thisWeek,
+        List<Info> meetings
+    ) {}
+
+
 }

src/main/java/leets/weeth/domain/schedule/application/usecase/MeetingUseCase.java

@@ -1,5 +1,6 @@
 package leets.weeth.domain.schedule.application.usecase;
 
+import leets.weeth.domain.schedule.application.dto.MeetingDTO;
 import leets.weeth.domain.schedule.application.dto.ScheduleDTO;
 
 import java.util.List;
@@ -11,7 +12,7 @@ public interface MeetingUseCase {
 
     Response find(Long userId, Long eventId);
 
-    List<Info> find(Integer cardinal);
+    MeetingDTO.Infos find(Integer cardinal);
 
     void save(ScheduleDTO.Save dto, Long userId);
 

src/main/java/leets/weeth/domain/schedule/application/usecase/MeetingUseCaseImpl.java

@@ -7,6 +7,7 @@
 import leets.weeth.domain.attendance.domain.service.AttendanceGetService;
 import leets.weeth.domain.attendance.domain.service.AttendanceSaveService;
 import leets.weeth.domain.attendance.domain.service.AttendanceUpdateService;
+import leets.weeth.domain.schedule.application.dto.MeetingDTO;
 import leets.weeth.domain.schedule.application.dto.ScheduleDTO;
 import leets.weeth.domain.schedule.application.mapper.MeetingMapper;
 import leets.weeth.domain.schedule.domain.entity.Meeting;
@@ -24,6 +25,10 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.DayOfWeek;
+import java.time.LocalDate;
+import java.time.temporal.TemporalAdjusters;
+import java.util.Comparator;
 import java.util.List;
 
 import static leets.weeth.domain.schedule.application.dto.MeetingDTO.Info;
@@ -62,20 +67,21 @@ public Response find(Long userId, Long meetingId) {
     }
 
     @Override
-    public List<Info> find(Integer cardinal) {
+    public MeetingDTO.Infos find(Integer cardinal) {
         List<Meeting> meetings;
 
         if (cardinal == null) {
             meetings = meetingGetService.findAll();
-
         } else {
             meetings = meetingGetService.findMeetingByCardinal(cardinal);
-
         }
 
-        return meetings.stream()
-                .map(mapper::toInfo)
-                .toList();
+        Meeting thisWeek = findThisWeek(meetings);
+        List<Meeting> sorted = sortMeetings(meetings);
+
+        return new MeetingDTO.Infos(
+            thisWeek != null ? mapper.toInfo(thisWeek) : null,
+            sorted.stream().map(mapper::toInfo).toList());
     }
 
     @Override
@@ -114,4 +120,26 @@ public void delete(Long meetingId) {
         attendanceDeleteService.deleteAll(meeting);
         meetingDeleteService.delete(meeting);
     }
+
+    private List<Meeting> sortMeetings(List<Meeting> meetings) {
+        return meetings.stream()
+            .sorted(Comparator.comparing(Meeting::getStart).reversed())
+            .toList();
+    }
+
+
+    private Meeting findThisWeek(List<Meeting> meetings) {
+        LocalDate today = LocalDate.now();
+        LocalDate startOfWeek = today.with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY));
+        LocalDate endOfWeek   = today.with(TemporalAdjusters.nextOrSame(DayOfWeek.SUNDAY));
+
+        return meetings.stream()
+            .filter(m -> {
+                LocalDate d = m.getStart().toLocalDate();
+                return !d.isBefore(startOfWeek) && !d.isAfter(endOfWeek);
+            })
+            .findFirst()
+            .orElse(null);
+    }
+
 }