Skip to content

[HOTFIX] 월 별 일정 조회 버그 수정 #433

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
msk226 merged 2 commits into from
Jul 3, 2025
Merged

[HOTFIX] 월 별 일정 조회 버그 수정 #433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
374a635
[SPOT-294][FIX] 월별 일정 조회 버그 수정
dvlp-sy Jul 1, 2025
603f7f6
[SPOT-294][MERGE] 월별 일정 조회 버그 수정
dvlp-sy Jul 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions src/main/java/com/example/spot/repository/querydsl/impl/StudyRepositoryCustomImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package com.example.spot.repository.querydsl.impl;

import com.example.spot.domain.Member;
import com.example.spot.domain.Region;
import com.example.spot.domain.enums.ApplicationStatus;
import com.example.spot.domain.enums.Gender;
import com.example.spot.domain.enums.Status;
import com.example.spot.domain.enums.StudySortBy;
Expand All @@ -23,8 +21,6 @@
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;

import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.Pageable;

import static com.example.spot.domain.enums.StudyState.RECRUITING;
Expand Down
18 changes: 15 additions & 3 deletions src/main/java/com/example/spot/service/memberstudy/MemberStudyQueryServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import org.springframework.transaction.annotation.Transactional;

import java.time.*;
import java.time.temporal.ValueRange;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
Expand Down Expand Up @@ -421,7 +422,6 @@ public ScheduleResponseDTO.MonthlyScheduleDTO getSchedule(Long studyId, Long sch

/**
* 월별 일정 리스트에 주기가 정해져 있지 않은 일정을 추가하기 위한 메서드입니다.
* 일정의 시작일이 기준 연월과 일치하는 경우 월별 일정 리스트에 추가합니다.
* getMonthlySchedules API에서 호출되는 내부 메서드입니다.
* @param schedule 리스트에 추가할 일정 정보를 입력 받습니다.
* @param year 기준 연도를 입력 받습니다.
Expand All @@ -430,8 +430,20 @@ public ScheduleResponseDTO.MonthlyScheduleDTO getSchedule(Long studyId, Long sch
* @param isStudyMember 스터디 회원 여부를 입력 받습니다.
*/
private void addSchedule(Schedule schedule, int year, int month, List<ScheduleResponseDTO.MonthlyScheduleDTO> monthlyScheduleDTOS, boolean isStudyMember) {
if (schedule.getStartedAt().getYear() == year && schedule.getStartedAt().getMonthValue() == month) {
monthlyScheduleDTOS.add(ScheduleResponseDTO.MonthlyScheduleDTO.toDTO(schedule, isStudyMember));

// 탐색 연월
LocalDate searchDate = LocalDate.of(year, month, 1);

// 기준 연월
LocalDate standardDate = schedule.getStartedAt().toLocalDate().withDayOfMonth(1);
LocalDate finishDate = schedule.getFinishedAt().toLocalDate().withDayOfMonth(1);

// 기준 연월이 일정 진행기간 사이에 존재하는 경우 월별 일정 리스트에 추가
while (standardDate.isBefore(finishDate) || standardDate.isEqual(finishDate)) {
if (searchDate.equals(standardDate)) {
monthlyScheduleDTOS.add(ScheduleResponseDTO.MonthlyScheduleDTO.toDTO(schedule, isStudyMember));
}
standardDate = standardDate.plusDays(1);
}
}

Expand Down
Loading