Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

판매 가능한 예약 조회 로직 수정 #151

Merged
merged 2 commits into from
Jan 23, 2024
Merged

판매 가능한 예약 조회 로직 수정 #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7bcac1
refactor: 객실 취소 정책에 수수료 발생 기간 추가
Hwang-Kyu-Cheol Jan 23, 2024
b863f78
refactor: 판매 가능한 예약 조회 로직 수정
Hwang-Kyu-Cheol Jan 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion ...in/java/kr/co/fastcampus/yanabada/domain/accommodation/entity/enums/RoomCancelPolicy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
package kr.co.fastcampus.yanabada.domain.accommodation.entity.enums;

import lombok.AccessLevel;
import lombok.Getter;
import lombok.RequiredArgsConstructor;

@RequiredArgsConstructor(access = AccessLevel.PRIVATE)
@Getter
public enum RoomCancelPolicy {
YNBD_1, YNBD_2, YNBD_3
YNBD_1(7L),
YNBD_2(6L),
YNBD_3(Long.MAX_VALUE),
;

private final long feeOccurrenceDuration;
}
35 changes: 33 additions & 2 deletions ...ain/java/kr/co/fastcampus/yanabada/domain/order/repository/OrderRepositoryCustomImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

import static kr.co.fastcampus.yanabada.domain.accommodation.entity.QAccommodation.accommodation;
import static kr.co.fastcampus.yanabada.domain.accommodation.entity.QRoom.room;
import static kr.co.fastcampus.yanabada.domain.accommodation.entity.enums.RoomCancelPolicy.YNBD_1;
import static kr.co.fastcampus.yanabada.domain.accommodation.entity.enums.RoomCancelPolicy.YNBD_2;
import static kr.co.fastcampus.yanabada.domain.order.entity.QOrder.order;
import static kr.co.fastcampus.yanabada.domain.order.entity.enums.OrderStatus.RESERVED;
import static kr.co.fastcampus.yanabada.domain.product.entity.QProduct.product;
Expand All @@ -10,6 +12,8 @@

import com.querydsl.core.BooleanBuilder;
import com.querydsl.core.types.dsl.BooleanExpression;
import com.querydsl.core.types.dsl.CaseBuilder;
import com.querydsl.core.types.dsl.ComparableExpression;
import com.querydsl.core.types.dsl.NumberExpression;
import com.querydsl.jpa.impl.JPAQueryFactory;
import java.time.LocalDate;
Expand All @@ -34,12 +38,13 @@

return queryFactory
.selectFrom(order)
.leftJoin(product).on(product.order.eq(order).and(containStatuses(ON_SALE, BOOKING)))
.leftJoin(product).on(product.order.eq(order), containStatuses(ON_SALE, BOOKING))
.join(order.room, room).fetchJoin()
.join(room.accommodation, accommodation).fetchJoin()
.where(
equalMember(member),
equalStatus(RESERVED)
equalStatus(RESERVED),
hasRoomCancelFee()
)
.groupBy(order)
.having(count.eq(ZERO_COUNT))
Expand Down Expand Up @@ -99,4 +104,30 @@

return order.checkInDate.lt(date);
}

private BooleanExpression hasRoomCancelFee() {
return new CaseBuilder()
.when(room.cancelPolicy.eq(YNBD_1)).then(hasRoomCancelFeeInYNBD_1())
.when(room.cancelPolicy.eq(YNBD_2)).then(hasRoomCancelFeeInYNBD_2())
.otherwise(true)
.eq(true);
}

private ComparableExpression<Boolean> hasRoomCancelFeeInYNBD_1() {

Check warning on line 116 in src/main/java/kr/co/fastcampus/yanabada/domain/order/repository/OrderRepositoryCustomImpl.java

View workflow job for this annotation

GitHub Actions / Checkstyle job 

[testtool] reported by reviewdog 🐶
Abbreviation in name 'hasRoomCancelFeeInYNBD_1' must contain no more than '1' consecutive capital letters.

Raw Output:
/github/workspace/./src/main/java/kr/co/fastcampus/yanabada/domain/order/repository/OrderRepositoryCustomImpl.java:116:43: warning: Abbreviation in name 'hasRoomCancelFeeInYNBD_1' must contain no more than '1' consecutive capital letters. (com.puppycrawl.tools.checkstyle.checks.naming.AbbreviationAsWordInNameCheck)
return new CaseBuilder()
.when(
order.checkInDate.loe(LocalDate.now().plusDays(YNBD_1.getFeeOccurrenceDuration()))
)
.then(true)
.otherwise(false);
}

private ComparableExpression<Boolean> hasRoomCancelFeeInYNBD_2() {

Check warning on line 125 in src/main/java/kr/co/fastcampus/yanabada/domain/order/repository/OrderRepositoryCustomImpl.java

View workflow job for this annotation

GitHub Actions / Checkstyle job 

[testtool] reported by reviewdog 🐶
Abbreviation in name 'hasRoomCancelFeeInYNBD_2' must contain no more than '1' consecutive capital letters.

Raw Output:
/github/workspace/./src/main/java/kr/co/fastcampus/yanabada/domain/order/repository/OrderRepositoryCustomImpl.java:125:43: warning: Abbreviation in name 'hasRoomCancelFeeInYNBD_2' must contain no more than '1' consecutive capital letters. (com.puppycrawl.tools.checkstyle.checks.naming.AbbreviationAsWordInNameCheck)
return new CaseBuilder()
.when(
order.checkInDate.loe(LocalDate.now().plusDays(YNBD_2.getFeeOccurrenceDuration()))
)
.then(true)
.otherwise(false);
}
}
Loading