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.

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

refactor: 발급 티켓 관련 DDD 적용 리팩토링 및 관리자 티켓 취소 API 작성 #247

Merged
merged 14 commits into from
Feb 1, 2023
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
refactor: DTO 및 QueryDsl 수정
sanbonai06 committed Jan 31, 2023
commit fdd55344e968ed93a89758967f68cbe42f13f97f
Original file line number Diff line number Diff line change
@@ -24,16 +24,10 @@ public class RetrieveIssuedTicketDetailResponse {
*/
private final EventInfoVo eventInfo;

/*
발급 유저 이름
*/
private final String userName;

public static RetrieveIssuedTicketDetailResponse of(IssuedTicket issuedTicket, Event event) {
return RetrieveIssuedTicketDetailResponse.builder()
.issuedTicketInfo(issuedTicket.toIssuedTicketInfoVo())
.eventInfo(event.toEventInfoVo())
.userName(issuedTicket.getUserInfo().getUserName())
.build();
}
}
Original file line number Diff line number Diff line change
@@ -29,20 +29,10 @@ public Page<IssuedTicket> searchToPage(IssuedTicketCondition condition, Pageable
List<IssuedTicket> issuedTickets =
queryFactory
.selectFrom(issuedTicket)
// .leftJoin(issuedTicket.eventId, event)
// .fetchJoin()
// .leftJoin(issuedTicket.user, user)
// .fetchJoin()
// .leftJoin(issuedTicket.ticketItem, ticketItem)
// .fetchJoin()
.where(
eventIdEq(condition.getEventId()),
userNameContains(condition.getUserName()),
phoneNumberContains(condition.getPhoneNumber()),
issuedTicket
.issuedTicketStatus
.eq(IssuedTicketStatus.CANCELED)
.not())
phoneNumberContains(condition.getPhoneNumber()))
.orderBy(issuedTicket.id.desc())
.offset(pageable.getOffset())
.limit(pageable.getPageSize())
@@ -65,12 +55,6 @@ public Optional<IssuedTicket> find(Long issuedTicketId) {
IssuedTicket findIssuedTicket =
queryFactory
.selectFrom(issuedTicket)
// .leftJoin(issuedTicket.event, event)
// .fetchJoin()
// .leftJoin(issuedTicket.user, user)
// .fetchJoin()
// .leftJoin(issuedTicket.ticketItem, ticketItem)
// .fetchJoin()
.leftJoin(issuedTicket.issuedTicketOptionAnswers, issuedTicketOptionAnswer)
.fetchJoin()
.where(