달력 조회 API를 작성

application/wypl-core/src/main/java/com/wypl/wyplcore/calendar/data/DateSearchCondition.java

@@ -0,0 +1,6 @@
+package com.wypl.wyplcore.calendar.data;
+
+import java.time.LocalDate;
+
+public record DateSearchCondition(LocalDate startDate, LocalDate endDate) {
+}

application/wypl-core/src/main/java/com/wypl/wyplcore/calendar/data/request/CalendarFindRequest.java

@@ -0,0 +1,16 @@
+package com.wypl.wyplcore.calendar.data.request;
+
+import java.time.LocalDate;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.wypl.wyplcore.schedule.data.CalendarType;
+
+public record CalendarFindRequest(
+
+	@JsonProperty("calendar_type")
+	CalendarType calendarType,
+
+	@JsonProperty("start_date")
+	LocalDate today
+) {
+}

application/wypl-core/src/main/java/com/wypl/wyplcore/calendar/data/response/CalendarSchedulesResponse.java

@@ -0,0 +1,16 @@
+package com.wypl.wyplcore.calendar.data.response;
+
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.wypl.wyplcore.schedule.data.response.ScheduleFindResponse;
+
+public record CalendarSchedulesResponse(
+
+	@JsonProperty("schedule_count")
+	int scheduleCount,
+
+	@JsonProperty("schedules")
+	List<ScheduleFindResponse> schedules
+) {
+}

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

@@ -0,0 +1,84 @@
+package com.wypl.wyplcore.calendar.service;
+
+import java.time.LocalDate;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.wypl.googleoauthclient.domain.AuthMember;
+import com.wypl.jpacalendardomain.calendar.domain.Calendar;
+import com.wypl.jpacalendardomain.calendar.domain.MemberCalendar;
+import com.wypl.jpacalendardomain.calendar.domain.Schedule;
+import com.wypl.jpacalendardomain.calendar.repository.ScheduleRepository;
+import com.wypl.jpamemberdomain.member.domain.Member;
+import com.wypl.wyplcore.calendar.data.DateSearchCondition;
+import com.wypl.wyplcore.calendar.data.request.CalendarFindRequest;
+import com.wypl.wyplcore.calendar.data.response.CalendarSchedulesResponse;
+import com.wypl.wyplcore.calendar.service.strategy.CalendarStrategy;
+import com.wypl.wyplcore.schedule.data.CalendarType;
+import com.wypl.wyplcore.schedule.data.response.ScheduleFindResponse;
+import com.wypl.wyplcore.schedule.service.repetition.RepetitionService;
+
+import lombok.RequiredArgsConstructor;
+
+@Service
+@RequiredArgsConstructor
+public class CalendarService {
+
+	private final ScheduleRepository scheduleRepository;
+
+	private final Map<CalendarType, CalendarStrategy> calendarStrategyMap;
+
+	/**
+	 * 캘린더의 일정을 조회한다.
+	 * @param authMember : 인증된 사용자 정보
+	 * @param calendarId : 조회할 캘린더 ID
+	 * @param calendarFindRequest : 캘린더 조회 조건
+	 * @return FindCalendarResponse
+	 */
+	@Transactional(readOnly = true)
+	public CalendarSchedulesResponse findCalendar(AuthMember authMember, long calendarId,
+		CalendarFindRequest calendarFindRequest) {
+
+		Calendar foundCalendar = null;  // FIXME: calendarId로 foundCalendar 엔티티 검증 필요.
+		MemberCalendar foundMemberCalendar = null; // FIXME: memberCalendar 엔티티 검증 필요.
+		Member foundMember = null; // FIXME: member 엔티티 검증 필요.
+
+		DateSearchCondition dateSearchCondition = getDateSearchCondition(calendarFindRequest.today(),
+			calendarFindRequest.calendarType());
+
+		List<Schedule> schedules = scheduleRepository.findByCalendarIdAndBetweenStartDateAndEndDate(calendarId,
+			dateSearchCondition.startDate(), dateSearchCondition.endDate());
+
+		List<ScheduleFindResponse> responses = schedules.stream()
+			.flatMap(schedule -> getScheduleResponsesWithRepetition(schedule, dateSearchCondition.startDate(),
+				dateSearchCondition.endDate()).stream())
+			.toList();
+
+		return new CalendarSchedulesResponse(responses.size(), responses);
+	}
+
+	/**
+	 * RepetitionService를 통해 반복 일정을 가공하여 조회한다.
+	 * @param schedule : 일정 정보
+	 * @param startDate : 조회 시작일
+	 * @param endDate : 조회 종료일
+	 * @return List<ScheduleFindResponse> : 일정 반복 정보를 통해 리스트 형태로 가공하여 반환된다.
+	 */
+	private List<ScheduleFindResponse> getScheduleResponsesWithRepetition(Schedule schedule, LocalDate startDate,
+		LocalDate endDate) {
+		return RepetitionService.getScheduleResponses(schedule, startDate, endDate);
+	}
+
+	/**
+	 * CalendarType에 따라 DateSearchCondition을 반환한다.
+	 * @param today : 조회 기준일
+	 * @param calendarType : 조회할 캘린더 타입
+	 * @return DateSearchCondition : DateSearchCondition 객체를 반환한다.
+	 */
+	private DateSearchCondition getDateSearchCondition(LocalDate today, CalendarType calendarType) {
+		return calendarStrategyMap.get(calendarType).getDateSearchCondition(today);
+	}
+}

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

@@ -0,0 +1,15 @@
+package com.wypl.wyplcore.calendar.service;
+
+import java.time.LocalDate;
+
+public class CalendarServiceUtil {
+
+	public static LocalDate getMaxDate(LocalDate date1, LocalDate date2) {
+		return date1.isBefore(date2) ? date2 : date1;
+	}
+
+	public static LocalDate getMinDate(LocalDate date1, LocalDate date2) {
+		return date1.isBefore(date2) ? date1 : date2;
+	}
+
+}

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

@@ -0,0 +1,13 @@
+package com.wypl.wyplcore.calendar.service.strategy;
+
+import java.time.LocalDate;
+
+import com.wypl.wyplcore.calendar.data.DateSearchCondition;
+import com.wypl.wyplcore.schedule.data.CalendarType;
+
+public interface CalendarStrategy {
+
+	CalendarType getCalendarType();
+
+	DateSearchCondition getDateSearchCondition(LocalDate today);
+}

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

@@ -0,0 +1,29 @@
+package com.wypl.wyplcore.calendar.service.strategy;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import com.wypl.wyplcore.schedule.data.CalendarType;
+
+@Configuration
+public class CalendarStrategyConfig {
+
+	private final Map<CalendarType, CalendarStrategy> calendarStrategyMap = new HashMap<>();
+
+	@Autowired
+	public CalendarStrategyConfig(List<CalendarStrategy> calendarStrategies) {
+		calendarStrategies.forEach(calendarStrategy -> {
+			calendarStrategyMap.put(calendarStrategy.getCalendarType(), calendarStrategy);
+		});
+	}
+
+	@Bean
+	public Map<CalendarType, CalendarStrategy> calendarStrategyMap() {
+		return calendarStrategyMap;
+	}
+}

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

@@ -0,0 +1,26 @@
+package com.wypl.wyplcore.calendar.service.strategy;
+
+import java.time.LocalDate;
+
+import org.springframework.stereotype.Component;
+
+import com.wypl.wyplcore.calendar.data.DateSearchCondition;
+import com.wypl.wyplcore.schedule.data.CalendarType;
+
+import lombok.RequiredArgsConstructor;
+
+@Component
+@RequiredArgsConstructor
+public class DayCalendarStrategy implements CalendarStrategy {
+
+	@Override
+	public CalendarType getCalendarType() {
+		return CalendarType.DAY;
+	}
+
+	@Override
+	public DateSearchCondition getDateSearchCondition(LocalDate today) {
+		return new DateSearchCondition(today, today);
+	}
+
+}

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

@@ -0,0 +1,28 @@
+package com.wypl.wyplcore.calendar.service.strategy;
+
+import java.time.LocalDate;
+import java.time.temporal.TemporalAdjusters;
+
+import org.springframework.stereotype.Component;
+
+import com.wypl.wyplcore.calendar.data.DateSearchCondition;
+import com.wypl.wyplcore.schedule.data.CalendarType;
+
+import lombok.RequiredArgsConstructor;
+
+@Component
+@RequiredArgsConstructor
+public class MonthCalendarStrategy implements CalendarStrategy {
+
+	@Override
+	public CalendarType getCalendarType() {
+		return CalendarType.MONTH;
+	}
+
+	@Override
+	public DateSearchCondition getDateSearchCondition(LocalDate today) {
+		LocalDate searchStartDate = today.withDayOfMonth(1);
+		LocalDate searchEndDate = today.with(TemporalAdjusters.lastDayOfMonth());
+		return new DateSearchCondition(searchStartDate, searchEndDate);
+	}
+}

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

@@ -0,0 +1,29 @@
+package com.wypl.wyplcore.calendar.service.strategy;
+
+import java.time.DayOfWeek;
+import java.time.LocalDate;
+import java.time.temporal.TemporalAdjusters;
+
+import org.springframework.stereotype.Component;
+
+import com.wypl.wyplcore.calendar.data.DateSearchCondition;
+import com.wypl.wyplcore.schedule.data.CalendarType;
+
+import lombok.RequiredArgsConstructor;
+
+@Component
+@RequiredArgsConstructor
+public class WeekCalendarStrategy implements CalendarStrategy {
+
+	@Override
+	public CalendarType getCalendarType() {
+		return CalendarType.WEEK;
+	}
+
+	@Override
+	public DateSearchCondition getDateSearchCondition(LocalDate today) {
+		LocalDate searchStartDate = today.with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY));
+		LocalDate searchEndDate = today.plusDays(6);
+		return new DateSearchCondition(searchStartDate, searchEndDate);
+	}
+}

application/wypl-core/src/main/java/com/wypl/wyplcore/review/exception/ReviewErrorCode.java

@@ -8,8 +8,7 @@
 public enum ReviewErrorCode implements ServerErrorCode {
 	EMPTY_CONTENTS(500, "REVIEW_001", "작성된 내용이 없습니다."),
 	INVALID_TITLE(500, "REVIEW_002", "제목의 길이가 올바르지 않습니다."),
-	NO_SUCH_REVIEW(500, "REVIEW_003", "존재하지 않는 회고입니다.")
-	;
+	NO_SUCH_REVIEW(500, "REVIEW_003", "존재하지 않는 회고입니다.");
 
 	private final int statusCode;
 	private final String errorCode;

application/wypl-core/src/main/java/com/wypl/wyplcore/review/service/ReviewServiceImpl.java

@@ -66,7 +66,7 @@ public ReviewIdResponse createReview(long memberId, ReviewCreateRequest reviewCr
 	public ReviewIdResponse updateReview(long memberId, long reviewId, ReviewUpdateRequest reviewUpdateRequest) {
 		validateReviewContents(reviewUpdateRequest.contents(), reviewUpdateRequest.title());
 
-		Member member = null;	// Todo : 조회
+		Member member = null;    // Todo : 조회
 
 		Review review = ReviewUtils.findByReviewIdAndMember(reviewRepository, reviewId, member);
 		review.updateTitle(reviewUpdateRequest.title());
@@ -82,7 +82,7 @@ public ReviewIdResponse updateReview(long memberId, long reviewId, ReviewUpdateR
 	@Override
 	@Transactional
 	public ReviewIdResponse deleteReview(long memberId, long reviewId) {
-		Member member = null;	// Todo : 조회
+		Member member = null;    // Todo : 조회
 		Review review = ReviewUtils.findByReviewIdAndMember(reviewRepository, reviewId, member);
 
 		ReviewContents reviewContents = reviewContentsRepository.findByReviewIdAndDeletedAtNull(review.getReviewId());
@@ -97,7 +97,7 @@ public ReviewIdResponse deleteReview(long memberId, long reviewId) {
 
 	@Override
 	public ReviewDetailResponse getDetailReview(long memberId, long reviewId) {
-		Member member = null;	// Todo : 조회
+		Member member = null;    // Todo : 조회
 		Review review = ReviewUtils.findByReviewIdAndMember(reviewRepository, reviewId, member);
 		Schedule schedule = review.getSchedule();
 
@@ -165,8 +165,8 @@ public ReviewListResponse getReviewsByScheduleId(long memberId, long scheduleId,
 		// MemberSchedule memberSchedule = memberScheduleService.getMemberScheduleByMemberAndSchedule(memberId,
 		// 	ScheduleServiceUtils.findById(scheduleRepository, scheduleId));
 
-		Member member = null;		// Todo : 조회
-		Schedule schedule = null;	// Todo : 조회
+		Member member = null;        // Todo : 조회
+		Schedule schedule = null;    // Todo : 조회
 
 		List<Review> reviews = switch (reviewType) {
 			case NEWEST -> {

application/wypl-core/src/main/java/com/wypl/wyplcore/schedule/controller/ScheduleController.java

@@ -19,11 +19,12 @@
 @RequestMapping("/schedule/v2/schedules")
 public class ScheduleController {
 
-    private final ScheduleService scheduleService;
+	private final ScheduleService scheduleService;
 
-    @PostMapping
-    public WyplResponseEntity<ScheduleInfoCreateResponse> addSchedule(@Authenticated AuthMember authMember, @RequestBody ScheduleCreateRequest scheduleCreateRequest) {
-        ScheduleInfoCreateResponse response = scheduleService.createSchedule(authMember, scheduleCreateRequest);
-        return WyplResponseEntity.created(response, "일정이 생성됐습니다.");
-    }
+	@PostMapping
+	public WyplResponseEntity<ScheduleInfoCreateResponse> addSchedule(@Authenticated AuthMember authMember,
+		@RequestBody ScheduleCreateRequest scheduleCreateRequest) {
+		ScheduleInfoCreateResponse response = scheduleService.createSchedule(authMember, scheduleCreateRequest);
+		return WyplResponseEntity.created(response, "일정이 생성됐습니다.");
+	}
 }

application/wypl-core/src/main/java/com/wypl/wyplcore/schedule/data/CalendarType.java

@@ -0,0 +1,5 @@
+package com.wypl.wyplcore.schedule.data;
+
+public enum CalendarType {
+	DAY, WEEK, MONTH
+}