Feat(#56): Schedule 반복 일정 도메인 분리

Author: KIMSEI1124

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

@@ -5,7 +5,7 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.wypl.jpacalendardomain.schedule.data.ConvertibleSchedule;
-import com.wypl.jpacalendardomain.schedule.data.RepetitionCycle;
+import com.wypl.jpacalendardomain.schedule.domain.embedded.RepetitionCycle;
 
 import lombok.Builder;
 

application/wypl-core/src/main/java/com/wypl/wyplcore/schedule/service/repetition/RepetitionStrategyFactory.java

@@ -3,7 +3,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import com.wypl.jpacalendardomain.schedule.data.RepetitionCycle;
+import com.wypl.jpacalendardomain.schedule.domain.embedded.RepetitionCycle;
 import com.wypl.wyplcore.schedule.service.repetition.strategy.DayRepetitionStrategy;
 import com.wypl.wyplcore.schedule.service.repetition.strategy.MonthRepetitionStrategy;
 import com.wypl.wyplcore.schedule.service.repetition.strategy.RepetitionStrategy;

application/wypl-core/src/main/java/com/wypl/wyplcore/schedule/service/repetition/strategy/WeekRepetitionStrategy.java

@@ -18,40 +18,40 @@ public class WeekRepetitionStrategy implements RepetitionStrategy {
 
 	/**
 	 * RepetitionCycle = Week 인 경우, Schedule 반복 일정을 조회한다.
-	 * @param schedule Target Schedule
+	 *
+	 * @param schedule        Target Schedule
 	 * @param searchStartDate 검색 시작일자
-	 * @param searchEndDate 검색 종료일자
+	 * @param searchEndDate   검색 종료일자
 	 * @return {List<ScheduleFindResponse>}
 	 */
 	@Override
 	public List<ScheduleFindResponse> getScheduleResponses(Schedule schedule, LocalDate searchStartDate,
-		LocalDate searchEndDate) {
+			LocalDate searchEndDate) {
 
 		searchStartDate = getMaxDate(searchStartDate, schedule.getRepetitionStartDate()); // 검색 범위의 시작일
 		searchEndDate = getMinDate(searchEndDate, schedule.getRepetitionEndDate());
 
 		List<ScheduleFindResponse> responses = new ArrayList<>();
 
 		if (!schedule.existsDayOfWeek()) { // 반복 요일을 설정하지 않았을 경우
-
-			LocalDate firstScheduleStartDate = getFirstScheduleStartDate(searchStartDate, schedule); // 검색 조건에 부합하는 첫 번째 일정의 시작일
+			LocalDate firstScheduleStartDate = getFirstScheduleStartDate(searchStartDate,
+					schedule); // 검색 조건에 부합하는 첫 번째 일정의 시작일
 
 			for (LocalDate date = firstScheduleStartDate; date.isBefore(searchEndDate); date = date.plusWeeks(
-				schedule.getWeekInterval())) {
+					schedule.getWeekInterval())) {
 				LocalDateTime startDateTime = LocalDateTime.of(date, schedule.getStartDateTime().toLocalTime());
 				LocalDateTime endDateTime = startDateTime.plus(schedule.getDuration());
 				responses.add(ScheduleFindResponse.of(schedule, startDateTime, endDateTime));
 			}
 			return responses;
-
 		} else { // 반복 요일을 설정했을 경우
-
 			int repetitionDayOfWeek = schedule.getDayOfWeek();
 
 			for (int dayOfWeek = 1; dayOfWeek <= 7; dayOfWeek++) { // 요일마다 처리
 				if (isSelectedDayOfWeek(repetitionDayOfWeek, dayOfWeek)) {
 					LocalDate nearestDate = findNextOrSameByDayOfWeek(searchStartDate, DayOfWeek.of(dayOfWeek));
-					for (LocalDate date = nearestDate; date.isBefore(searchEndDate.plusDays(1)); date = date.plusWeeks(schedule.getWeekInterval())) {
+					for (LocalDate date = nearestDate; date.isBefore(searchEndDate.plusDays(1)); date = date.plusWeeks(
+							schedule.getWeekInterval())) {
 
 						responses.add(ScheduleFindResponse.of(schedule, date, date));
 					}
@@ -64,11 +64,12 @@ public List<ScheduleFindResponse> getScheduleResponses(Schedule schedule, LocalD
 
 	/**
 	 * searchStartDate 이후 주의 반복 주기를 고려한 첫 번째 일정의 시작일을 찾는다.
+	 *
 	 * @param searchStartDate 검색 시작 날짜
-	 * @param schedule 일정
+	 * @param schedule        일정
 	 * @return 검색된 첫 번째 일정의 시작일
 	 */
-	private LocalDate getFirstScheduleStartDate(LocalDate searchStartDate, Schedule schedule){
+	private LocalDate getFirstScheduleStartDate(LocalDate searchStartDate, Schedule schedule) {
 
 		LocalDate scheduleStartDate = schedule.getStartDateTime().toLocalDate();
 		LocalDate unadjustedStartDate = findNearestStartDate(searchStartDate, schedule); // WeekInterval 반영되지 않은 상태
@@ -89,8 +90,9 @@ private LocalDate getFirstScheduleStartDate(LocalDate searchStartDate, Schedule
 
 	/**
 	 * 검색시작일자(searchStartDate)에 부합하는 가장 가까운 일정시작요일(dayOfWeek of startDateTime of schedule)을 검색한다.
+	 *
 	 * @param searchStartDate 검색시작일자
-	 * @param schedule 일정
+	 * @param schedule        일정
 	 * @return LocalDateTime 검색 조건과 일정의 시작 및 끝나는 요일에 부합하는 가장 가까운 시작일시
 	 */
 	private LocalDate findNearestStartDate(LocalDate searchStartDate, Schedule schedule) {
@@ -105,8 +107,9 @@ private LocalDate findNearestStartDate(LocalDate searchStartDate, Schedule sched
 
 	/**
 	 * dayOfWeek 가 repetitionDayOfWeek에 포함됐는지 확인한다.
+	 *
 	 * @param repetitionDayOfWeek 일정의 반복 요일을 비트마스킹한 값
-	 * @param dayOfWeek from 1 to 7 (1: 월요일, 2: 화요일, 3: 수요일, 4: 목요일, 5: 금요일, 6: 토요일, 7: 일요일)
+	 * @param dayOfWeek           from 1 to 7 (1: 월요일, 2: 화요일, 3: 수요일, 4: 목요일, 5: 금요일, 6: 토요일, 7: 일요일)
 	 * @return boolean
 	 */
 	private boolean isSelectedDayOfWeek(int repetitionDayOfWeek, int dayOfWeek) {

application/wypl-core/src/test/java/com/wypl/wyplcore/ScheduleFixture.java

@@ -3,7 +3,7 @@
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 
-import com.wypl.jpacalendardomain.schedule.data.RepetitionCycle;
+import com.wypl.jpacalendardomain.schedule.domain.embedded.RepetitionCycle;
 import com.wypl.jpacalendardomain.schedule.domain.Schedule;
 import com.wypl.jpacalendardomain.schedule.domain.ScheduleInfo;
 

domain/jpa-calendar-domain/src/main/java/com/wypl/jpacalendardomain/calendar/data/InviteStatus.java

@@ -1,6 +1,6 @@
 package com.wypl.jpacalendardomain.calendar.data;
 
 public enum InviteStatus {
-    PENDING,
-    ACCENTED
-}
+	PENDING,
+	ACCENTED
+}

domain/jpa-calendar-domain/src/main/java/com/wypl/jpacalendardomain/schedule/data/ConvertibleSchedule.java

@@ -3,6 +3,8 @@
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 
+import com.wypl.jpacalendardomain.schedule.domain.embedded.RepetitionCycle;
+
 public interface ConvertibleSchedule {
 
 	String getTitle();

domain/jpa-calendar-domain/src/main/java/com/wypl/jpacalendardomain/schedule/data/RepetitionCycle.java

@@ -6,13 +6,13 @@
 
 import org.hibernate.annotations.SQLRestriction;
 
-import com.wypl.jpacalendardomain.schedule.data.RepetitionCycle;
+import com.wypl.jpacalendardomain.schedule.domain.embedded.Repetition;
+import com.wypl.jpacalendardomain.schedule.domain.embedded.RepetitionCycle;
 import com.wypl.jpacommon.JpaBaseEntity;
 
 import jakarta.persistence.Column;
+import jakarta.persistence.Embedded;
 import jakarta.persistence.Entity;
-import jakarta.persistence.EnumType;
-import jakarta.persistence.Enumerated;
 import jakarta.persistence.FetchType;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
@@ -53,50 +53,66 @@ public class Schedule extends JpaBaseEntity {
 	@Column(name = "end_date_time", nullable = false)
 	private LocalDateTime endDateTime;
 
-	@Column(name = "repetition_start_date")
-	private LocalDate repetitionStartDate;
-
-	@Column(name = "repetition_end_date")
-	private LocalDate repetitionEndDate;
-
-	@Getter
-	@Enumerated(EnumType.STRING)
-	private RepetitionCycle repetitionCycle; // 반복 주기 (일, 주, 달, 년)
-
-	@Column(name = "day_of_week")
-	private Integer dayOfWeek; // 반복 요일: Bit Masking
-
-	@Column(name = "week_interval")
-	private Integer weekInterval; // 주 반복 (1~3)
+	@Embedded
+	private Repetition repetition;
 
 	// Todo: Review Mapping
 
 	@Builder
-	public Schedule(ScheduleInfo scheduleInfo, String title, String description, LocalDateTime startDateTime,
-		LocalDateTime endDateTime, LocalDate repetitionStartDate, LocalDate repetitionEndDate,
-		RepetitionCycle repetitionCycle, Integer dayOfWeek, Integer weekInterval) {
+	public Schedule(
+			ScheduleInfo scheduleInfo,
+			final String title,
+			final String description,
+			final LocalDateTime startDateTime,
+			final LocalDateTime endDateTime,
+			final LocalDate repetitionStartDate,
+			final LocalDate repetitionEndDate,
+			final RepetitionCycle repetitionCycle,
+			final Integer dayOfWeek,
+			final Integer weekInterval) {
 		this.scheduleInfo = scheduleInfo;
 		this.title = title;
 		this.description = description;
 		this.startDateTime = startDateTime;
 		this.endDateTime = endDateTime;
-		this.repetitionStartDate = repetitionStartDate;
-		this.repetitionEndDate = repetitionEndDate;
-		this.repetitionCycle = repetitionCycle;
-		this.dayOfWeek = dayOfWeek;
-		this.weekInterval = weekInterval;
+		this.repetition = Repetition.builder()
+				.startDate(repetitionStartDate)
+				.endDate(repetitionEndDate)
+				.repetitionCycle(repetitionCycle)
+				.dayOfWeek(dayOfWeek)
+				.weekInterval(weekInterval)
+				.build();
 	}
 
 	public boolean isRepetition() {
-		return repetitionCycle != null;
+		return repetition.getRepetitionCycle() != null;
 	}
 
 	public boolean existsDayOfWeek() {
-		return dayOfWeek != null;
+		return repetition.getDayOfWeek() != null;
 	}
 
-	public Duration getDuration(){
+	public Duration getDuration() {
 		return Duration.between(this.startDateTime, this.endDateTime);
 	}
 
-}
+	public LocalDate getRepetitionStartDate() {
+		return repetition.getStartDate();
+	}
+
+	public LocalDate getRepetitionEndDate() {
+		return repetition.getEndDate();
+	}
+
+	public RepetitionCycle getRepetitionCycle() {
+		return repetition.getRepetitionCycle();
+	}
+
+	public Integer getDayOfWeek() {
+		return repetition.getDayOfWeek();
+	}
+
+	public Integer getWeekInterval() {
+		return repetition.getWeekInterval();
+	}
+}

domain/jpa-calendar-domain/src/main/java/com/wypl/jpacalendardomain/schedule/domain/Schedule.java

@@ -0,0 +1,36 @@
+package com.wypl.jpacalendardomain.schedule.domain.embedded;
+
+import java.time.LocalDate;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@AllArgsConstructor
+@Builder
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Getter
+@Embeddable
+public class Repetition {
+	@Column(name = "repetition_start_date")
+	private LocalDate startDate;
+
+	@Column(name = "repetition_end_date")
+	private LocalDate endDate;
+
+	@Getter
+	@Enumerated(EnumType.STRING)
+	private RepetitionCycle repetitionCycle; // 반복 주기 (일, 주, 달, 년)
+
+	@Column(name = "day_of_week")
+	private Integer dayOfWeek; // 반복 요일: Bit Masking
+
+	@Column(name = "week_interval")
+	private Integer weekInterval; // 주 반복 (1~3)
+}

domain/jpa-calendar-domain/src/main/java/com/wypl/jpacalendardomain/schedule/domain/embedded/Repetition.java

@@ -0,0 +1,8 @@
+package com.wypl.jpacalendardomain.schedule.domain.embedded;
+
+public enum RepetitionCycle {
+	DAY,
+	WEEK,
+	MONTH,
+	YEAR
+}

domain/jpa-calendar-domain/src/main/java/com/wypl/jpacalendardomain/schedule/domain/embedded/RepetitionCycle.java

@@ -23,7 +23,8 @@ public List<Schedule> findByCalendarIdAndBetweenStartDateAndEndDate(
 	) {
 		return jpaQueryFactory.selectFrom(schedule)
 				.where(schedule.scheduleInfo.calendar.id.eq(calendarId)
-						.and(schedule.repetitionStartDate.loe(endDate).and(schedule.repetitionEndDate.goe(startDate))))
+						.and(schedule.repetition.startDate.loe(endDate)
+								.and(schedule.repetition.endDate.goe(startDate))))
 				.fetch();
 	}
-}
+}