Merge pull request #151 from MUIT-UMC/develop

[merge] 250220 / 40th deploy
MUIT-UMC · Feb 20, 2025 · aa19095 · aa19095
2 parents 1d131bf + 4fdbf5d
commit aa19095
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/src/main/java/muit/backend/controller/InquiryController.java b/src/main/java/muit/backend/controller/InquiryController.java
@@ -39,12 +39,11 @@ public ApiResponse<InquiryResponseDTO.GeneralInquiryResultDTO> createInquiry(@Re
     @GetMapping("")
     @Operation(summary = "문의 리스트 조회 API", description = "일반 회원이 자신의 문의 리스트를 조회하는 API")
     public ApiResponse<InquiryResponseDTO.InquiryResultListDTO> getInquiryList(@RequestHeader("Authorization") String accessToken,
-                                                                               @RequestParam(name ="status", required = false) InquiryStatus status,
                                                                                @RequestParam(defaultValue = "0", name = "page") Integer page,
                                                                                @RequestParam(defaultValue = "20", name = "size")Integer size)
     {
         Member member = memberService.getMemberByToken(accessToken);
-        return ApiResponse.onSuccess(inquiryService.getList(member,status, page, size));
+        return ApiResponse.onSuccess(inquiryService.getList(member,page, size));
     }
 
     @GetMapping("/{inquiryId}")

diff --git a/src/main/java/muit/backend/repository/InquiryRepository.java b/src/main/java/muit/backend/repository/InquiryRepository.java
@@ -16,8 +16,6 @@
 @Repository
 public interface InquiryRepository extends JpaRepository<Inquiry, Long> {
 
-    Page<Inquiry> findAllByMember(Member member, Pageable pageable);
-
     // 전체 조회용 (member 함께 조회)
     @Query("SELECT i FROM Inquiry i JOIN FETCH i.member ORDER BY i.createdAt DESC")
     Page<Inquiry> findAllWithMember(Pageable pageable);
@@ -38,6 +36,6 @@ public interface InquiryRepository extends JpaRepository<Inquiry, Long> {
             "WHERE i.id = :inquiryId")
     Optional<Inquiry> findByIdWithMemberAndResponse(@Param("inquiryId") Long inquiryId);
 
-    @Query("SELECT i FROM Inquiry i JOIN FETCH i.member WHERE i.inquiryStatus = :status AND i.member = :member ORDER BY i.createdAt DESC")
-    Page<Inquiry> findAllByMemberAndStatus(Member member, InquiryStatus status, PageRequest of);
+    @Query("SELECT i FROM Inquiry i JOIN FETCH i.member WHERE i.member = :member ORDER BY i.createdAt DESC")
+    Page<Inquiry> findAllByMember(Member member, Pageable pageable);
 }
diff --git a/src/main/java/muit/backend/service/InquiryService.java b/src/main/java/muit/backend/service/InquiryService.java
@@ -11,7 +11,7 @@ public interface InquiryService {
     InquiryResponseDTO.GeneralInquiryResultDTO createInquiry(InquiryRequestDTO.InquiryCreateRequestDTO requestDTO, Member member);
 
     //문의 리스트 조회
-    InquiryResponseDTO.InquiryResultListDTO getList(Member member, InquiryStatus status, Integer page, Integer size);
+    InquiryResponseDTO.InquiryResultListDTO getList(Member member, Integer page, Integer size);
 
     InquiryResponseDTO.GeneralInquiryResultDTO getOne(Long inquiryId, Member member);
 

diff --git a/src/main/java/muit/backend/service/InquiryServiceImpl.java b/src/main/java/muit/backend/service/InquiryServiceImpl.java
@@ -41,8 +41,8 @@ public InquiryResponseDTO.GeneralInquiryResultDTO createInquiry(InquiryRequestDT
 
     //문의 리스트 조회
     @Override
-    public InquiryResponseDTO.InquiryResultListDTO getList(Member member, InquiryStatus status, Integer page, Integer size) {
-        Page<Inquiry> inquiryPage = inquiryRepository.findAllByMemberAndStatus(member, status, PageRequest.of(page,size));
+    public InquiryResponseDTO.InquiryResultListDTO getList(Member member, Integer page, Integer size) {
+        Page<Inquiry> inquiryPage = inquiryRepository.findAllByMember(member, PageRequest.of(page,size));
 
         return InquiryConverter.toInquiryListDTO(inquiryPage);
     }