14
14
import com .wypl .jpacalendardomain .schedule .reopository .ScheduleRepository ;
15
15
import com .wypl .jpamemberdomain .member .domain .Member ;
16
16
import com .wypl .wyplcore .calendar .data .DateSearchCondition ;
17
- import com .wypl .wyplcore .calendar .data .request .CalendarFindRequest ;
18
17
import com .wypl .wyplcore .calendar .data .response .CalendarSchedulesResponse ;
19
18
import com .wypl .wyplcore .calendar .service .strategy .CalendarStrategy ;
20
19
import com .wypl .wyplcore .schedule .data .CalendarType ;
@@ -35,19 +34,19 @@ public class CalendarService {
35
34
* 캘린더의 일정을 조회한다.
36
35
* @param authMember : 인증된 사용자 정보
37
36
* @param calendarId : 조회할 캘린더 ID
38
- * @param calendarFindRequest : 캘린더 조회 조건
37
+ * @param calendarType
38
+ * @param today
39
39
* @return FindCalendarResponse
40
40
*/
41
41
@ Transactional (readOnly = true )
42
42
public CalendarSchedulesResponse findCalendar (AuthMember authMember , long calendarId ,
43
- CalendarFindRequest calendarFindRequest ) {
43
+ CalendarType calendarType , LocalDate today ) {
44
44
45
45
Calendar foundCalendar = null ; // FIXME: calendarId로 foundCalendar 엔티티 검증 필요.
46
46
MemberCalendar foundMemberCalendar = null ; // FIXME: memberCalendar 엔티티 검증 필요.
47
47
Member foundMember = null ; // FIXME: member 엔티티 검증 필요.
48
48
49
- DateSearchCondition dateSearchCondition = getDateSearchCondition (calendarFindRequest .today (),
50
- calendarFindRequest .calendarType ());
49
+ DateSearchCondition dateSearchCondition = getDateSearchCondition (today , calendarType );
51
50
52
51
List <Schedule > schedules = scheduleRepository .findByCalendarIdAndBetweenStartDateAndEndDate (calendarId ,
53
52
dateSearchCondition .startDate (), dateSearchCondition .endDate ());
0 commit comments