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

✏️ 쿠폰 QA 후 문제점 수정 #63

Merged
merged 2 commits into from
Jan 16, 2024
+6 −11
Merged

✏️ 쿠폰 QA 후 문제점 수정 #63

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
e3d0f0a
:pencil2: 유저의 쿠폰 조회시 불필요한 Join으로 이상한 값이 보이던 문제 해결
qwerty1434 Jan 16, 2024
e17037c
:pencil2: 쿠폰 일괄 다운로드 로직 수정
qwerty1434 Jan 16, 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
2 changes: 1 addition & 1 deletion src/main/java/kr/bb/store/domain/coupon/handler/CouponReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public List<CouponForOwnerDto> readCouponsForOwner(Long storeId, LocalDate now)
}

public List<Coupon> readStoresAllValidateCoupon(Long storeId, LocalDate now) {
return couponRepository.findAllDownloadableCouponsByStoreId(storeId, now);
return couponRepository.findAllValidateCouponsByStoreId(storeId, now);
}

public List<CouponWithIssueStatusDto> readStoreCouponsForUser(Long userId, Long storeId, LocalDate now) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/kr/bb/store/domain/coupon/repository/CouponRepositoryCustom.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

public interface CouponRepositoryCustom {
List<CouponForOwnerDto> findAllDtoByStoreId(Long storeId, LocalDate now);
List<Coupon> findAllDownloadableCouponsByStoreId(Long storeId, LocalDate now);
List<Coupon> findAllValidateCouponsByStoreId(Long storeId, LocalDate now);
List<CouponWithIssueStatusDto> findStoreCouponsForUser(Long userId, Long storeId, LocalDate now);
List<CouponWithAvailabilityDto> findAvailableCoupons(Long totalAmount, Long userId, Long storeId, LocalDate now);
List<CouponDto> findMyValidCoupons(Long userId, LocalDate now);
Expand Down
7 changes: 1 addition & 6 deletions src/main/java/kr/bb/store/domain/coupon/repository/CouponRepositoryCustomImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@ public List<CouponForOwnerDto> findAllDtoByStoreId(Long storeId, LocalDate now)
coupon.endDate
))
.from(coupon)
.leftJoin(issuedCoupon)
.on(coupon.id.eq(issuedCoupon.id.couponId))
.where(
coupon.store.id.eq(storeId),
coupon.isDeleted.isFalse(),
Expand All @@ -50,14 +48,11 @@ public List<CouponForOwnerDto> findAllDtoByStoreId(Long storeId, LocalDate now)
}

@Override
public List<Coupon> findAllDownloadableCouponsByStoreId(Long storeId, LocalDate now) {
public List<Coupon> findAllValidateCouponsByStoreId(Long storeId, LocalDate now) {
return queryFactory
.selectFrom(coupon)
.leftJoin(issuedCoupon)
.on(issuedCoupon.coupon.id.eq(coupon.id))
.where(
coupon.store.id.eq(storeId),
issuedCoupon.id.isNull(),
isCouponUnexpired(now),
coupon.isDeleted.isFalse()
)
Expand Down
6 changes: 3 additions & 3 deletions src/test/java/kr/bb/store/domain/coupon/handler/CouponReaderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ void readMyValidCouponCount() {
assertThat(result).isEqualTo(1);
}

@DisplayName("현재 다운받을 수 있는 쿠폰 목록을 반환한다")
@DisplayName("현재 가게의 유효한 쿠폰 목록을 반환한다")
@Test
void readStoresAllValidateCoupon() {
// given
Expand All @@ -359,8 +359,8 @@ void readStoresAllValidateCoupon() {
List<Coupon> result = couponReader.readStoresAllValidateCoupon(s1.getId(), now.plusDays(3));

// then
assertThat(result).hasSize(1)
.containsExactly(c1);
assertThat(result).hasSize(3)
.containsExactly(c1,c2,c3);


}
Expand Down
Loading