Skip to content

Commit 4473d25

Browse files
committed
Chore(#56): QueryDSL 설정 수정
1 parent fea1590 commit 4473d25

File tree

6 files changed

+26
-24
lines changed

6 files changed

+26
-24
lines changed

domain/jpa-calendar-domain/build.gradle

+2-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ dependencies {
99
implementation project(':domain:jpa-common')
1010
implementation project(':domain:jpa-member-domain')
1111

12-
1312
/* QueryDSL */
1413
implementation('com.querydsl:querydsl-jpa:5.0.0:jakarta')
1514
annotationProcessor('com.querydsl:querydsl-apt:5.0.0:jakarta')
@@ -18,7 +17,7 @@ dependencies {
1817
}
1918

2019

21-
/ QueryDSL Start /
20+
/* QueryDSL Start */
2221
def generated = "src/main/generated"
2322

2423
tasks.withType(JavaCompile).configureEach {
@@ -32,4 +31,4 @@ sourceSets {
3231
clean {
3332
delete file(generated)
3433
}
35-
/ QueryDSL End */
34+
/* QueryDSL End */

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

+8-5
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,14 @@ public class ScheduleRepositoryCustomImpl implements ScheduleRepositoryCustom {
1616
private final JPAQueryFactory jpaQueryFactory;
1717

1818
@Override
19-
public List<Schedule> findByCalendarIdAndBetweenStartDateAndEndDate(long calendarId, LocalDate startDate,
20-
LocalDate endDate) {
19+
public List<Schedule> findByCalendarIdAndBetweenStartDateAndEndDate(
20+
final long calendarId,
21+
final LocalDate startDate,
22+
final LocalDate endDate
23+
) {
2124
return jpaQueryFactory.selectFrom(schedule)
22-
.where(schedule.scheduleInfo.calendar.id.eq(calendarId)
23-
.and(schedule.repetitionStartDate.loe(endDate).and(schedule.repetitionEndDate.goe(startDate))))
24-
.fetch();
25+
.where(schedule.scheduleInfo.calendar.id.eq(calendarId)
26+
.and(schedule.repetitionStartDate.loe(endDate).and(schedule.repetitionEndDate.goe(startDate))))
27+
.fetch();
2528
}
2629
}

domain/jpa-member-domain/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ dependencies {
1616
}
1717

1818

19-
/ QueryDSL Start /
19+
/* QueryDSL Start */
2020
def generated = "src/main/generated"
2121

2222
tasks.withType(JavaCompile).configureEach {
@@ -30,4 +30,4 @@ sourceSets {
3030
clean {
3131
delete file(generated)
3232
}
33-
/ QueryDSL End */
33+
/* QueryDSL End */

domain/jpa-member-domain/src/main/java/com/wypl/jpamemberdomain/member/domain/Member.java

+9-9
Original file line numberDiff line numberDiff line change
@@ -54,18 +54,18 @@ public class Member extends JpaBaseEntity {
5454
@Column(name = "timezone", length = 10, nullable = false)
5555
private TimeZone timeZone;
5656

57-
// @OneToMany(mappedBy = "member")
58-
// private List<MemberCalendar> memberCalendars;
57+
// @OneToMany(mappedBy = "member")
58+
// private List<MemberCalendar> memberCalendars;
5959

6060
public static Member of(MemberSaveDto memberSaveDto) {
6161
return Member.builder()
62-
.email(memberSaveDto.getEmail())
63-
.nickname(memberSaveDto.getNickname())
64-
.birthday(memberSaveDto.getBirthday())
65-
.profileImage(memberSaveDto.getProfileImage())
66-
.color(Color.labelBrown)
67-
.timeZone(TimeZone.KOREA)
68-
.build();
62+
.email(memberSaveDto.getEmail())
63+
.nickname(memberSaveDto.getNickname())
64+
.birthday(memberSaveDto.getBirthday())
65+
.profileImage(memberSaveDto.getProfileImage())
66+
.color(Color.labelBrown)
67+
.timeZone(TimeZone.KOREA)
68+
.build();
6969
}
7070

7171
}

domain/jpa-member-domain/src/main/java/com/wypl/jpamemberdomain/member/domain/SocialMember.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ public class SocialMember {
4444

4545
public static SocialMember of(Member member, SocialMemberSaveDto socialMemberSaveDto) {
4646
return SocialMember.builder()
47-
.member(member)
48-
.oauthProvider(socialMemberSaveDto.getOauthProvider())
49-
.oauthId(socialMemberSaveDto.getOauthId())
50-
.build();
47+
.member(member)
48+
.oauthProvider(socialMemberSaveDto.getOauthProvider())
49+
.oauthId(socialMemberSaveDto.getOauthId())
50+
.build();
5151
}
5252
}
5353

domain/jpamongo-review-domain/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ dependencies {
1010
implementation project(':domain:jpa-member-domain')
1111
implementation project(':domain:jpa-calendar-domain')
1212
implementation project(':domain:mongo-common')
13-
}
13+
}

0 commit comments

Comments
 (0)