Skip to content

Commit da441ef

Browse files
committed
feat(#69): 캘린더 조회 서비스 수정
Resolves: #69
1 parent 0c7874c commit da441ef

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

application/wypl-core/src/main/java/com/wypl/wyplcore/calendar/service/CalendarService.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import com.wypl.jpacalendardomain.schedule.reopository.ScheduleRepository;
1515
import com.wypl.jpamemberdomain.member.domain.Member;
1616
import com.wypl.wyplcore.calendar.data.DateSearchCondition;
17-
import com.wypl.wyplcore.calendar.data.request.CalendarFindRequest;
1817
import com.wypl.wyplcore.calendar.data.response.CalendarSchedulesResponse;
1918
import com.wypl.wyplcore.calendar.service.strategy.CalendarStrategy;
2019
import com.wypl.wyplcore.schedule.data.CalendarType;
@@ -35,19 +34,19 @@ public class CalendarService {
3534
* 캘린더의 일정을 조회한다.
3635
* @param authMember : 인증된 사용자 정보
3736
* @param calendarId : 조회할 캘린더 ID
38-
* @param calendarFindRequest : 캘린더 조회 조건
37+
* @param calendarType
38+
* @param today
3939
* @return FindCalendarResponse
4040
*/
4141
@Transactional(readOnly = true)
4242
public CalendarSchedulesResponse findCalendar(AuthMember authMember, long calendarId,
43-
CalendarFindRequest calendarFindRequest) {
43+
CalendarType calendarType, LocalDate today) {
4444

4545
Calendar foundCalendar = null; // FIXME: calendarId로 foundCalendar 엔티티 검증 필요.
4646
MemberCalendar foundMemberCalendar = null; // FIXME: memberCalendar 엔티티 검증 필요.
4747
Member foundMember = null; // FIXME: member 엔티티 검증 필요.
4848

49-
DateSearchCondition dateSearchCondition = getDateSearchCondition(calendarFindRequest.today(),
50-
calendarFindRequest.calendarType());
49+
DateSearchCondition dateSearchCondition = getDateSearchCondition(today, calendarType);
5150

5251
List<Schedule> schedules = scheduleRepository.findByCalendarIdAndBetweenStartDateAndEndDate(calendarId,
5352
dateSearchCondition.startDate(), dateSearchCondition.endDate());

0 commit comments

Comments
 (0)