Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Slice;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
Expand Down Expand Up @@ -44,7 +45,7 @@ public class AdminAmateurShowController {
)
}
)
public ApiResponse<SliceResponse<AdminAmateurShowListResponseDTO>> showList(
public ApiResponse<Page<AdminAmateurShowListResponseDTO>> showList(
@Parameter(description = "페이지 번호(0부터)", example = "0")
@RequestParam(defaultValue = "0") int page,

Expand All @@ -54,8 +55,8 @@ public ApiResponse<SliceResponse<AdminAmateurShowListResponseDTO>> showList(
@Parameter(description = "검색 키워드, 공연면", example = "실종")
@RequestParam(required = false) String keyword
) {
Slice<AdminAmateurShowListResponseDTO> slice = adminAmateurShowService.getShowList(page, size, keyword);
return ApiResponse.onSuccess(SliceResponse.of(slice)); }

return ApiResponse.onSuccess(adminAmateurShowService.getShowList(page, size, keyword)); }

@GetMapping("/{showId}")
@Operation(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Slice;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
Expand All @@ -31,7 +32,7 @@ public class AdminApprovalController {
summary = "소극장 공연 관리 - 등록 요청 관리",
description = "등록 요청 관리 첫페이지, 리스트 조회입니다."
)
public ApiResponse<SliceResponse<AdminApprovalListResponseDTO>> getApprovalList(
public ApiResponse<Page<AdminApprovalListResponseDTO>> getApprovalList(
@Parameter(description = "페이지 번호(0부터 시작)", example = "0")
@RequestParam(defaultValue = "0") int page,

Expand All @@ -41,8 +42,8 @@ public ApiResponse<SliceResponse<AdminApprovalListResponseDTO>> getApprovalList(
@Parameter(description = "검색 키워드, 공연 명으로 검색", example = "실종")
@RequestParam(required = false) String keyword
){
Slice<AdminApprovalListResponseDTO> slice = adminApprovalService.getApprovalList(page, size, keyword);
return ApiResponse.onSuccess(SliceResponse.of(slice));

return ApiResponse.onSuccess(adminApprovalService.getApprovalList(page, size, keyword));
}

@PatchMapping("/{showId}/approve")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public class AdminAmateurShowService {
private final AmateurShowRepository amateurShowRepository;
private final ApplicationEventPublisher eventPublisher;

public Slice<AdminAmateurShowListResponseDTO> getShowList(int page, int size, String keyword){
public Page<AdminAmateurShowListResponseDTO> getShowList(int page, int size, String keyword){
Pageable pageable = PageRequest.of(page, size, Sort.by("id").ascending());

Page<AmateurShow> pageResult;
Expand All @@ -42,11 +42,7 @@ public Slice<AdminAmateurShowListResponseDTO> getShowList(int page, int size, St
pageResult = amateurShowRepository.findAll(pageable);
}

List<AdminAmateurShowListResponseDTO> rows = pageResult.getContent().stream()
.map(this::toListDto)
.toList();

return new SliceImpl<>(rows, pageable, pageResult.hasNext());
return pageResult.map(this::toListDto);
}

private AdminAmateurShowListResponseDTO toListDto(AmateurShow show){
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public AdminAmateurShowSummaryResponseDTO rejectShow(Long showId, AdminAmateurSh
return AdminAmateurShowSummaryResponseDTO.from(show);
}

public Slice<AdminApprovalListResponseDTO> getApprovalList(int page, int size, String keyword) {
public Page<AdminApprovalListResponseDTO> getApprovalList(int page, int size, String keyword) {
Pageable pageable = PageRequest.of(page, size, Sort.by("id").ascending());

Page<AmateurShow> pageResult =
Expand All @@ -64,7 +64,7 @@ public Slice<AdminApprovalListResponseDTO> getApprovalList(int page, int size, S
.map(this::toApprovalDto)
.toList();

return new SliceImpl<>(content, pageable, pageResult.hasNext());
return new PageImpl<>(content, pageable, pageResult.getTotalElements());
}

private AdminApprovalListResponseDTO toApprovalDto(AmateurShow show) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Slice;
import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
Expand Down Expand Up @@ -83,16 +84,16 @@ public ResponseEntity<Void> deleteTarget(
)
})
@GetMapping
public cc.backend.apiPayLoad.ApiResponse<SliceResponse<AdminBoardListResponse>> getAllBoardsForAdmin(
public cc.backend.apiPayLoad.ApiResponse<Page<AdminBoardListResponse>> getAllBoardsForAdmin(
@Parameter(description = "페이지 번호 (0부터 시작)", example = "0")
@RequestParam(defaultValue = "0") int page,
@Parameter(description = "페이지 크기", example = "20")
@RequestParam(defaultValue = "20") int size,
@Parameter(description = "검색 키워드, 게시글 제목", example = "예매 방법 꿀팁")
@RequestParam(required = false) String keyword) {

Slice<AdminBoardListResponse> slice = adminBoardService.getAllBoardsForAdmin(page, size, keyword);
return cc.backend.apiPayLoad.ApiResponse.onSuccess(SliceResponse.of(slice));
;
return cc.backend.apiPayLoad.ApiResponse.onSuccess(adminBoardService.getAllBoardsForAdmin(page, size, keyword));
}

@Operation(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,7 @@
import cc.backend.image.entity.Image;
import cc.backend.image.repository.ImageRepository;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Slice;
import org.springframework.data.domain.Sort;
import org.springframework.data.domain.*;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

Expand All @@ -39,14 +36,18 @@ public class AdminBoardService {

//게시글 목록 조회
@Transactional(readOnly = true)
public Slice<AdminBoardListResponse> getAllBoardsForAdmin(int page, int size, String keyword) {
public Page<AdminBoardListResponse> getAllBoardsForAdmin(int page, int size, String keyword) {
// 관리자는 삭제된 게시글도 볼 수 있도록 @SQLDelete 우회
Pageable pageable = PageRequest.of(page, size, Sort.by("id").descending());
Slice<Board> boards = (keyword != null && !keyword.isBlank())

Page<Board> boards = (keyword != null && !keyword.isBlank())
? boardRepository.searchBoardsIncludingDeletedByTitle(keyword, pageable)
: boardRepository.findAllBoardsIncludingDeleted(pageable);

return boards.map(AdminBoardListResponse::from);
List<AdminBoardListResponse> content = boards.getContent().stream()
.map(AdminBoardListResponse::from)
.toList();
return new PageImpl<>(content, pageable, boards.getTotalElements());
}

//게시글 상세조회
Expand Down
13 changes: 3 additions & 10 deletions src/main/java/cc/backend/admin/inquiry/AdminInquiryController.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,7 @@
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Slice;
import org.springframework.data.domain.Sort;
import org.springframework.data.domain.*;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

Expand Down Expand Up @@ -42,7 +39,7 @@ public ApiResponse<AdminInquiryResponseDTO.AdminInquiryDetailResponseDTO> replyI
@Operation(summary = "관리자 문의 리스트/검색 API",
description = "관리자가 문의 리스트를 합니다. keyword로 제목/내용 검색을 합니다.")
@GetMapping("")
public ApiResponse<SliceResponse<AdminInquiryResponseDTO.AdminInquirySummaryResponseDTO>> getInquiryList(
public ApiResponse<Page<AdminInquiryResponseDTO.AdminInquirySummaryResponseDTO>> getInquiryList(
@Parameter(description = "검색 키워드(제목/내용)")
@RequestParam(required = false) String keyword,
@Parameter(description = "페이지 번호(0부터 시작)", example = "0")
Expand All @@ -51,11 +48,7 @@ public ApiResponse<SliceResponse<AdminInquiryResponseDTO.AdminInquirySummaryResp
@RequestParam(defaultValue = "20") int size
) {
Pageable pageable = PageRequest.of(page, size, Sort.by(Sort.Direction.DESC, "createdAt"));

Slice<AdminInquiryResponseDTO.AdminInquirySummaryResponseDTO> slice =
adminInquiryService.getInquiryList(keyword, pageable);

return ApiResponse.onSuccess(SliceResponse.of(slice));
return ApiResponse.onSuccess(adminInquiryService.getInquiryList(keyword, pageable));
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,7 @@
import cc.backend.inquiry.entity.Inquiry;
import cc.backend.inquiry.repository.InquiryRepository;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Slice;
import org.springframework.data.domain.SliceImpl;
import org.springframework.data.domain.*;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
Expand All @@ -36,7 +33,7 @@ public AdminInquiryResponseDTO.AdminInquiryDetailResponseDTO replyInquiry(Long i
return AdminInquiryResponseConverter.toInquiryDetailDTO(inquiry);
}

public Slice<AdminInquiryResponseDTO.AdminInquirySummaryResponseDTO> getInquiryList(String keyword,
public Page<AdminInquiryResponseDTO.AdminInquirySummaryResponseDTO> getInquiryList(String keyword,
Pageable pageable) {
Page<Inquiry> inquiryPage;
if (StringUtils.hasText(keyword)) {
Expand All @@ -50,6 +47,6 @@ public Slice<AdminInquiryResponseDTO.AdminInquirySummaryResponseDTO> getInquiryL
List<AdminInquiryResponseDTO.AdminInquirySummaryResponseDTO> content = inquiryPage.getContent().stream()
.map(AdminInquiryResponseConverter::toSummaryDTO)
.toList();
return new SliceImpl<>(content, pageable, inquiryPage.hasNext());
return new PageImpl<>(content, pageable, inquiryPage.getTotalElements());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.*;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Slice;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.security.core.parameters.P;
Expand All @@ -24,7 +25,7 @@ public class AdminMemberController {

@Operation(summary = "사용자 관리 리스트 조회", description = "모든 사용자를 id순으로 리스트로 조회합니다.")
@GetMapping("/list")
public ApiResponse<SliceResponse<AdminMemberListResponseDTO>> getAllMember(
public ApiResponse<Page<AdminMemberListResponseDTO>> getAllMember(
@Parameter(description = "페이지 번호(0부터 시작)", example = "0")
@RequestParam(defaultValue = "0") int page,

Expand All @@ -34,8 +35,7 @@ public ApiResponse<SliceResponse<AdminMemberListResponseDTO>> getAllMember(
@Parameter(description = "검색할 사용자 아이디(username)", example = "jihee")
@RequestParam(required = false) String keyword
) {
Slice<AdminMemberListResponseDTO> slice = adminMemberService.getMemberList(page, size, keyword);
return ApiResponse.onSuccess(SliceResponse.of(slice));
return ApiResponse.onSuccess(adminMemberService.getMemberList(page, size, keyword));
}

@Operation(summary = "사용자 관리-상세", description = "모든 사용자를 id순으로 리스트로 조회합니다.")
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/cc/backend/admin/member/AdminMemberService.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public class AdminMemberService {

private final MemberRepository memberRepository;

public Slice<AdminMemberListResponseDTO> getMemberList(int page, int size, String keyword) {
public Page<AdminMemberListResponseDTO> getMemberList(int page, int size, String keyword) {
Pageable pageable = PageRequest.of(page, size, Sort.by("id").ascending());

Page<Member> pageResult;
Expand All @@ -37,7 +37,7 @@ public Slice<AdminMemberListResponseDTO> getMemberList(int page, int size, Strin
.map(this::toDto)
.toList();

return new SliceImpl<>(content, pageable, pageResult.hasNext());
return new PageImpl<>(content, pageable, pageResult.getTotalElements());
}

private AdminMemberListResponseDTO toDto(Member m) {
Expand Down
25 changes: 13 additions & 12 deletions src/main/java/cc/backend/admin/ticket/AdminTicketController.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,12 @@
import cc.backend.admin.ticket.dto.ReservationDetailResponseDTO;
import cc.backend.admin.ticket.dto.TicketDetailResponseDTO;
import cc.backend.apiPayLoad.ApiResponse;
import cc.backend.apiPayLoad.SliceResponse;
import com.google.protobuf.Api;

import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.*;
import org.springframework.data.domain.Slice;
import org.springframework.data.domain.Page;
import org.springframework.web.bind.annotation.*;

@RestController
Expand All @@ -24,7 +23,7 @@ public class AdminTicketController {

@GetMapping("/history")
@Operation(summary = "관리자 소극장 티켓 관리 - 표")
public ApiResponse<SliceResponse<TicketDetailResponseDTO>> getTicketHistory(
public ApiResponse<Page<TicketDetailResponseDTO>> getTicketHistory(
@Parameter(description = "페이지 번호(0부터)", example = "0")
@RequestParam(defaultValue = "0") int page,

Expand All @@ -34,8 +33,9 @@ public ApiResponse<SliceResponse<TicketDetailResponseDTO>> getTicketHistory(
@Parameter(description = "검색 키워드, 공연 명으로 검색", example = "실종")
@RequestParam(required = false) String keyword
){
Slice<TicketDetailResponseDTO> slice = adminTicketService.getTicketList(page, size, keyword);
return ApiResponse.onSuccess(SliceResponse.of(slice)); }
;
return ApiResponse.onSuccess(adminTicketService.getTicketList(page, size, keyword));
}

@GetMapping("/{realTicketId}")
@Operation(summary = "관리자 소극장 티켓 관리 상세조회")
Expand All @@ -48,7 +48,7 @@ public ApiResponse<TicketDetailResponseDTO> getTicketDetail(

@GetMapping("/reservation/history")
@Operation(summary = "관리자 예약 내역 관리 - 표", description = "예매 내역을 리스트 형태로 조회합니다.")
public ApiResponse<SliceResponse<ReservationDetailResponseDTO>> getReservationHistory(
public ApiResponse<Page<ReservationDetailResponseDTO>> getReservationHistory(
@Parameter(description = "페이지 번호(0부터)", example = "0")
@RequestParam(defaultValue = "0") int page,

Expand All @@ -58,8 +58,8 @@ public ApiResponse<SliceResponse<ReservationDetailResponseDTO>> getReservationHi
@Parameter(description = "검색 키워드, 공연 명으로 검색", example = "실종")
@RequestParam(required = false) String keyword
) {
Slice<ReservationDetailResponseDTO> slice = adminTicketService.getReservationList(page, size, keyword);
return ApiResponse.onSuccess(SliceResponse.of(slice)); }
return ApiResponse.onSuccess(adminTicketService.getReservationList(page, size, keyword));
}

@GetMapping("/reservation/{realTicketId}")
@Operation(summary = "관리자 예약 내역 관리 상세조회")
Expand All @@ -72,7 +72,7 @@ public ApiResponse<ReservationDetailResponseDTO> getReservationDetail(

@GetMapping("/refund/history")
@Operation(summary = "관리자 환불 내역 관리 - 표", description = "환불 내역을 리스트 형태로 조회합니다.")
public ApiResponse<SliceResponse<RefundListResponseDTO>> getRefundHistory(
public ApiResponse<Page<RefundListResponseDTO>> getRefundHistory(
@Parameter(description = "페이지 번호(0부터)", example = "0")
@RequestParam(defaultValue = "0") int page,

Expand All @@ -82,8 +82,9 @@ public ApiResponse<SliceResponse<RefundListResponseDTO>> getRefundHistory(
@Parameter(description = "검색 키워드, 공연 명으로 검색", example = "실종")
@RequestParam(required = false) String keyword
) {
Slice<RefundListResponseDTO> slice = adminTicketService.getRefundList(page, size, keyword);
return ApiResponse.onSuccess(SliceResponse.of(slice)); }

return ApiResponse.onSuccess(adminTicketService.getRefundList(page, size, keyword));
}

@GetMapping("/refund/{realTicketId}")
@Operation(summary = "관리자 환불 내역 관리 상세조회")
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/cc/backend/admin/ticket/AdminTicketService.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public class AdminTicketService {
private final RealTicketRepository realTicketRepository;

// == 소극장 티켓 관리 == //
public Slice<TicketDetailResponseDTO> getTicketList(int page, int size, String keyword) {
public Page<TicketDetailResponseDTO> getTicketList(int page, int size, String keyword) {
Sort sort = Sort.by(
Sort.Order.desc("id")
);
Expand All @@ -39,7 +39,7 @@ public Slice<TicketDetailResponseDTO> getTicketList(int page, int size, String k
.map(this::toTicketDTO)
.toList();

return new SliceImpl<>(content, pageable, result.hasNext());
return new PageImpl<>(content, pageable, result.getTotalElements());
}

private TicketDetailResponseDTO toTicketDTO(RealTicket t) {
Expand All @@ -64,7 +64,7 @@ public TicketDetailResponseDTO getTicketDetail(Long realTicketId) {
}

// == 예약 내역 관리 == //
public Slice<ReservationDetailResponseDTO> getReservationList(
public Page<ReservationDetailResponseDTO> getReservationList(
int page, int size, String keyword
) {
Sort sort = Sort.by(
Expand All @@ -82,7 +82,7 @@ public Slice<ReservationDetailResponseDTO> getReservationList(
.map(this::toReservationDTO)
.toList();

return new SliceImpl<>(content, pageable, result.hasNext());
return new PageImpl<>(content, pageable, result.getTotalElements());
}

private ReservationDetailResponseDTO toReservationDTO(RealTicket t) {
Expand Down Expand Up @@ -114,7 +114,7 @@ public ReservationDetailResponseDTO getReservationDetail(Long realTicketId) {
.build();
}

public Slice<RefundListResponseDTO> getRefundList(int page, int size, String keyword) {
public Page<RefundListResponseDTO> getRefundList(int page, int size, String keyword) {
Pageable pageable = PageRequest.of(
page,
size,
Expand All @@ -132,7 +132,7 @@ public Slice<RefundListResponseDTO> getRefundList(int page, int size, String key
.map(this::toRefundDTO)
.toList();

return new SliceImpl<>(content, pageable, result.hasNext());
return new PageImpl<>(content, pageable, result.getTotalElements());
}

private RefundListResponseDTO toRefundDTO(RealTicket t) {
Expand Down
Loading