Skip to content

Commit 11c45ac

Browse files
committed
Refactor(#56): Schedule 패키지 분리
기존에 Calendar에 있던 내용을 Schedule패키지를 새로 만들어서 분리
1 parent 4473d25 commit 11c45ac

33 files changed

+54
-52
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
import com.wypl.googleoauthclient.domain.AuthMember;
1111
import com.wypl.jpacalendardomain.calendar.domain.Calendar;
1212
import com.wypl.jpacalendardomain.calendar.domain.MemberCalendar;
13-
import com.wypl.jpacalendardomain.calendar.domain.Schedule;
14-
import com.wypl.jpacalendardomain.calendar.repository.ScheduleRepository;
13+
import com.wypl.jpacalendardomain.schedule.domain.Schedule;
14+
import com.wypl.jpacalendardomain.schedule.reopository.ScheduleRepository;
1515
import com.wypl.jpamemberdomain.member.domain.Member;
1616
import com.wypl.wyplcore.calendar.data.DateSearchCondition;
1717
import com.wypl.wyplcore.calendar.data.request.CalendarFindRequest;

application/wypl-core/src/main/java/com/wypl/wyplcore/review/data/response/ReviewDetailResponse.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import java.util.Map;
55

66
import com.fasterxml.jackson.annotation.JsonProperty;
7-
import com.wypl.jpacalendardomain.calendar.domain.Schedule;
7+
import com.wypl.jpacalendardomain.schedule.domain.Schedule;
88
import com.wypl.jpamongoreviewdomain.review.domain.Review;
99
import com.wypl.jpamongoreviewdomain.reviewcontents.domain.ReviewContent;
1010

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import org.springframework.stereotype.Service;
1111
import org.springframework.transaction.annotation.Transactional;
1212

13-
import com.wypl.jpacalendardomain.calendar.domain.Schedule;
13+
import com.wypl.jpacalendardomain.schedule.domain.Schedule;
1414
import com.wypl.jpamemberdomain.member.domain.Member;
1515
import com.wypl.jpamongoreviewdomain.review.domain.Review;
1616
import com.wypl.jpamongoreviewdomain.review.repository.ReviewRepository;

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import java.time.LocalDateTime;
55

66
import com.fasterxml.jackson.annotation.JsonProperty;
7-
import com.wypl.jpacalendardomain.calendar.data.ConvertibleSchedule;
8-
import com.wypl.jpacalendardomain.calendar.data.RepetitionCycle;
7+
import com.wypl.jpacalendardomain.schedule.data.ConvertibleSchedule;
8+
import com.wypl.jpacalendardomain.schedule.data.RepetitionCycle;
99

1010
import lombok.Builder;
1111

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import java.time.LocalDateTime;
55

66
import com.fasterxml.jackson.annotation.JsonProperty;
7-
import com.wypl.jpacalendardomain.calendar.domain.Schedule;
7+
import com.wypl.jpacalendardomain.schedule.domain.Schedule;
88

99
public record ScheduleFindResponse(
1010

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55

66
import com.wypl.googleoauthclient.domain.AuthMember;
77
import com.wypl.jpacalendardomain.calendar.domain.Calendar;
8-
import com.wypl.jpacalendardomain.calendar.domain.Schedule;
9-
import com.wypl.jpacalendardomain.calendar.domain.ScheduleInfo;
10-
import com.wypl.jpacalendardomain.calendar.mapper.ScheduleInfoMapper;
11-
import com.wypl.jpacalendardomain.calendar.mapper.ScheduleMapper;
12-
import com.wypl.jpacalendardomain.calendar.repository.ScheduleInfoRepository;
13-
import com.wypl.jpacalendardomain.calendar.repository.ScheduleRepository;
8+
import com.wypl.jpacalendardomain.schedule.domain.Schedule;
9+
import com.wypl.jpacalendardomain.schedule.domain.ScheduleInfo;
10+
import com.wypl.jpacalendardomain.schedule.mapper.ScheduleInfoMapper;
11+
import com.wypl.jpacalendardomain.schedule.mapper.ScheduleMapper;
12+
import com.wypl.jpacalendardomain.schedule.reopository.ScheduleInfoRepository;
13+
import com.wypl.jpacalendardomain.schedule.reopository.ScheduleRepository;
1414
import com.wypl.jpamemberdomain.member.domain.Member;
1515
import com.wypl.wyplcore.schedule.data.request.ScheduleCreateRequest;
1616
import com.wypl.wyplcore.schedule.data.response.ScheduleInfoCreateResponse;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import java.time.LocalDate;
44
import java.util.List;
55

6-
import com.wypl.jpacalendardomain.calendar.domain.Schedule;
6+
import com.wypl.jpacalendardomain.schedule.domain.Schedule;
77
import com.wypl.wyplcore.schedule.data.response.ScheduleFindResponse;
88
import com.wypl.wyplcore.schedule.service.repetition.strategy.RepetitionStrategy;
99

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import java.util.HashMap;
44
import java.util.Map;
55

6-
import com.wypl.jpacalendardomain.calendar.data.RepetitionCycle;
6+
import com.wypl.jpacalendardomain.schedule.data.RepetitionCycle;
77
import com.wypl.wyplcore.schedule.service.repetition.strategy.DayRepetitionStrategy;
88
import com.wypl.wyplcore.schedule.service.repetition.strategy.MonthRepetitionStrategy;
99
import com.wypl.wyplcore.schedule.service.repetition.strategy.RepetitionStrategy;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import java.util.List;
88
import java.util.stream.Collectors;
99

10-
import com.wypl.jpacalendardomain.calendar.domain.Schedule;
10+
import com.wypl.jpacalendardomain.schedule.domain.Schedule;
1111
import com.wypl.wyplcore.schedule.data.response.ScheduleFindResponse;
1212

1313
public class DayRepetitionStrategy implements RepetitionStrategy {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import java.time.Period;
99
import java.util.List;
1010

11-
import com.wypl.jpacalendardomain.calendar.domain.Schedule;
11+
import com.wypl.jpacalendardomain.schedule.domain.Schedule;
1212
import com.wypl.wyplcore.schedule.data.response.ScheduleFindResponse;
1313

1414
public class MonthRepetitionStrategy implements RepetitionStrategy {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import java.time.LocalDate;
44
import java.util.List;
55

6-
import com.wypl.jpacalendardomain.calendar.domain.Schedule;
6+
import com.wypl.jpacalendardomain.schedule.domain.Schedule;
77
import com.wypl.wyplcore.schedule.data.response.ScheduleFindResponse;
88

99
public interface RepetitionStrategy {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import java.util.Comparator;
1212
import java.util.List;
1313

14-
import com.wypl.jpacalendardomain.calendar.domain.Schedule;
14+
import com.wypl.jpacalendardomain.schedule.domain.Schedule;
1515
import com.wypl.wyplcore.schedule.data.response.ScheduleFindResponse;
1616

1717
public class WeekRepetitionStrategy implements RepetitionStrategy {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
import org.springframework.stereotype.Service;
1313

14-
import com.wypl.jpacalendardomain.calendar.domain.Schedule;
14+
import com.wypl.jpacalendardomain.schedule.domain.Schedule;
1515
import com.wypl.wyplcore.schedule.data.response.ScheduleFindResponse;
1616

1717
@Service

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import java.time.LocalDate;
44
import java.time.LocalDateTime;
55

6-
import com.wypl.jpacalendardomain.calendar.data.RepetitionCycle;
7-
import com.wypl.jpacalendardomain.calendar.domain.Schedule;
8-
import com.wypl.jpacalendardomain.calendar.domain.ScheduleInfo;
6+
import com.wypl.jpacalendardomain.schedule.data.RepetitionCycle;
7+
import com.wypl.jpacalendardomain.schedule.domain.Schedule;
8+
import com.wypl.jpacalendardomain.schedule.domain.ScheduleInfo;
99

1010
public enum ScheduleFixture {
1111
DAILY_SCHEDULE(

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.wypl.wyplcore;
22

33
import com.wypl.jpacalendardomain.calendar.domain.Calendar;
4-
import com.wypl.jpacalendardomain.calendar.domain.ScheduleInfo;
4+
import com.wypl.jpacalendardomain.schedule.domain.ScheduleInfo;
55

66
import lombok.Getter;
77

application/wypl-core/src/test/java/com/wypl/wyplcore/schedule/service/repetition/DayRepetitionStrategyTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import org.junit.jupiter.api.Test;
1313
import org.springframework.boot.test.context.SpringBootTest;
1414

15-
import com.wypl.jpacalendardomain.calendar.domain.Schedule;
15+
import com.wypl.jpacalendardomain.schedule.domain.Schedule;
1616
import com.wypl.wyplcore.ScheduleFixture;
1717
import com.wypl.wyplcore.schedule.data.response.ScheduleFindResponse;
1818

application/wypl-core/src/test/java/com/wypl/wyplcore/schedule/service/repetition/MonthRepetitionStrategyTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import org.slf4j.LoggerFactory;
1313
import org.springframework.boot.test.context.SpringBootTest;
1414

15-
import com.wypl.jpacalendardomain.calendar.domain.Schedule;
15+
import com.wypl.jpacalendardomain.schedule.domain.Schedule;
1616
import com.wypl.wyplcore.ScheduleFixture;
1717
import com.wypl.wyplcore.schedule.data.response.ScheduleFindResponse;
1818

application/wypl-core/src/test/java/com/wypl/wyplcore/schedule/service/repetition/WeekRepetitionStrategyTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import org.slf4j.LoggerFactory;
1818
import org.springframework.boot.test.context.SpringBootTest;
1919

20-
import com.wypl.jpacalendardomain.calendar.domain.Schedule;
20+
import com.wypl.jpacalendardomain.schedule.domain.Schedule;
2121
import com.wypl.wyplcore.ScheduleFixture;
2222
import com.wypl.wyplcore.schedule.data.response.ScheduleFindResponse;
2323

application/wypl-core/src/test/java/com/wypl/wyplcore/schedule/service/repetition/YearRepetitionStrategyTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import org.slf4j.LoggerFactory;
1414
import org.springframework.boot.test.context.SpringBootTest;
1515

16-
import com.wypl.jpacalendardomain.calendar.domain.Schedule;
16+
import com.wypl.jpacalendardomain.schedule.domain.Schedule;
1717
import com.wypl.wyplcore.schedule.data.response.ScheduleFindResponse;
1818
import com.wypl.wyplcore.schedule.service.repetition.strategy.YearRepetitionStrategy;
1919

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

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
import org.hibernate.annotations.SQLRestriction;
66

7+
import com.wypl.jpacalendardomain.schedule.domain.ScheduleInfo;
78
import com.wypl.jpacommon.JpaBaseEntity;
89

910
import jakarta.persistence.Column;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.wypl.jpacalendardomain.calendar.data;
1+
package com.wypl.jpacalendardomain.schedule.data;
22

33
import java.time.LocalDate;
44
import java.time.LocalDateTime;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.wypl.jpacalendardomain.calendar.data;
1+
package com.wypl.jpacalendardomain.schedule.data;
22

33
public interface ConvertibleScheduleInfo {
44

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.wypl.jpacalendardomain.calendar.data;
1+
package com.wypl.jpacalendardomain.schedule.data;
22

33
public enum RepetitionCycle {
44
DAY,

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package com.wypl.jpacalendardomain.calendar.domain;
1+
package com.wypl.jpacalendardomain.schedule.domain;
22

33
import java.time.Duration;
44
import java.time.LocalDate;
55
import java.time.LocalDateTime;
66

77
import org.hibernate.annotations.SQLRestriction;
88

9-
import com.wypl.jpacalendardomain.calendar.data.RepetitionCycle;
9+
import com.wypl.jpacalendardomain.schedule.data.RepetitionCycle;
1010
import com.wypl.jpacommon.JpaBaseEntity;
1111

1212
import jakarta.persistence.Column;

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
package com.wypl.jpacalendardomain.calendar.domain;
1+
package com.wypl.jpacalendardomain.schedule.domain;
22

33
import java.util.List;
44

55
import org.hibernate.annotations.SQLRestriction;
66

7+
import com.wypl.jpacalendardomain.calendar.domain.Calendar;
78
import com.wypl.jpacommon.JpaBaseEntity;
89

910
import jakarta.persistence.Column;

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package com.wypl.jpacalendardomain.calendar.mapper;
1+
package com.wypl.jpacalendardomain.schedule.mapper;
22

3-
import com.wypl.jpacalendardomain.calendar.data.ConvertibleScheduleInfo;
3+
import com.wypl.jpacalendardomain.schedule.data.ConvertibleScheduleInfo;
44
import com.wypl.jpacalendardomain.calendar.domain.Calendar;
5-
import com.wypl.jpacalendardomain.calendar.domain.ScheduleInfo;
5+
import com.wypl.jpacalendardomain.schedule.domain.ScheduleInfo;
66

77
public class ScheduleInfoMapper {
88

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package com.wypl.jpacalendardomain.calendar.mapper;
1+
package com.wypl.jpacalendardomain.schedule.mapper;
22

3-
import com.wypl.jpacalendardomain.calendar.data.ConvertibleSchedule;
4-
import com.wypl.jpacalendardomain.calendar.domain.Schedule;
5-
import com.wypl.jpacalendardomain.calendar.domain.ScheduleInfo;
3+
import com.wypl.jpacalendardomain.schedule.data.ConvertibleSchedule;
4+
import com.wypl.jpacalendardomain.schedule.domain.Schedule;
5+
import com.wypl.jpacalendardomain.schedule.domain.ScheduleInfo;
66

77
public class ScheduleMapper {
88

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package com.wypl.jpacalendardomain.calendar.repository;
1+
package com.wypl.jpacalendardomain.schedule.reopository;
22

33
import org.springframework.data.jpa.repository.JpaRepository;
44

5-
import com.wypl.jpacalendardomain.calendar.domain.ScheduleInfo;
5+
import com.wypl.jpacalendardomain.schedule.domain.ScheduleInfo;
66

77
public interface ScheduleInfoRepository extends JpaRepository<ScheduleInfo, Long> {
88
}
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package com.wypl.jpacalendardomain.calendar.repository;
1+
package com.wypl.jpacalendardomain.schedule.reopository;
22

33
import org.springframework.data.jpa.repository.JpaRepository;
44

5-
import com.wypl.jpacalendardomain.calendar.domain.Schedule;
5+
import com.wypl.jpacalendardomain.schedule.domain.Schedule;
66

77
public interface ScheduleRepository extends JpaRepository<Schedule, Long>, ScheduleRepositoryCustom {
88
}

domain/jpa-calendar-domain/src/main/java/com/wypl/jpacalendardomain/calendar/repository/ScheduleRepositoryCustom.java domain/jpa-calendar-domain/src/main/java/com/wypl/jpacalendardomain/schedule/reopository/ScheduleRepositoryCustom.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package com.wypl.jpacalendardomain.calendar.repository;
1+
package com.wypl.jpacalendardomain.schedule.reopository;
22

33
import java.time.LocalDate;
44
import java.util.List;
55

6-
import com.wypl.jpacalendardomain.calendar.domain.Schedule;
6+
import com.wypl.jpacalendardomain.schedule.domain.Schedule;
77

88
public interface ScheduleRepositoryCustom {
99
List<Schedule> findByCalendarIdAndBetweenStartDateAndEndDate(long calendarId, LocalDate startDate,

domain/jpa-calendar-domain/src/main/java/com/wypl/jpacalendardomain/calendar/repository/ScheduleRepositoryCustomImpl.java domain/jpa-calendar-domain/src/main/java/com/wypl/jpacalendardomain/schedule/reopository/ScheduleRepositoryCustomImpl.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package com.wypl.jpacalendardomain.calendar.repository;
1+
package com.wypl.jpacalendardomain.schedule.reopository;
22

3-
import static com.wypl.jpacalendardomain.calendar.domain.QSchedule.*;
3+
import static com.wypl.jpacalendardomain.schedule.domain.QSchedule.*;
44

55
import java.time.LocalDate;
66
import java.util.List;
77

88
import com.querydsl.jpa.impl.JPAQueryFactory;
9-
import com.wypl.jpacalendardomain.calendar.domain.Schedule;
9+
import com.wypl.jpacalendardomain.schedule.domain.Schedule;
1010

1111
import lombok.RequiredArgsConstructor;
1212

domain/jpamongo-review-domain/src/main/java/com/wypl/jpamongoreviewdomain/review/domain/Review.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import org.hibernate.annotations.SQLRestriction;
44

5-
import com.wypl.jpacalendardomain.calendar.domain.Schedule;
5+
import com.wypl.jpacalendardomain.schedule.domain.Schedule;
66
import com.wypl.jpacommon.JpaBaseEntity;
77
import com.wypl.jpamemberdomain.member.domain.Member;
88

domain/jpamongo-review-domain/src/main/java/com/wypl/jpamongoreviewdomain/review/repository/ReviewRepository.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import org.springframework.data.jpa.repository.Query;
99
import org.springframework.data.repository.query.Param;
1010

11-
import com.wypl.jpacalendardomain.calendar.domain.Schedule;
11+
import com.wypl.jpacalendardomain.schedule.domain.Schedule;
1212
import com.wypl.jpamemberdomain.member.domain.Member;
1313
import com.wypl.jpamongoreviewdomain.review.domain.Review;
1414

0 commit comments

Comments
 (0)