[merge] 모임에 해당하는 신청자 전체 조회 api 및 에러 수정

[fix] 모임에 해당하는 신청자 전체 조회 api 및 에러 수정
PICK-PLE · Oct 6, 2024 · d122781 · d122781
2 parents 9a59152 + 8926e2d
commit d122781
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 13 deletions.
diff --git a/src/main/java/com/pickple/server/api/host/service/HostQueryService.java b/src/main/java/com/pickple/server/api/host/service/HostQueryService.java
@@ -71,7 +71,7 @@ private int attendeeCounter(Long hostId) {
                 .map(Moim::getId) // Moim 엔티티에서 id를 추출
                 .collect(Collectors.toList());
 
-        return moimSubmissionRepository.countApprovedSubmissionsByMoimIds(moimIds);
+        return moimSubmissionRepository.countCompletedSubmissionsByMoimIds(moimIds);
     }
 
     private boolean checkVeteran(Long hostId) {

diff --git a/src/main/java/com/pickple/server/api/moimsubmission/repository/MoimSubmissionRepository.java b/src/main/java/com/pickple/server/api/moimsubmission/repository/MoimSubmissionRepository.java
@@ -27,21 +27,19 @@ default MoimSubmission findMoimSubmissionByIdOrThrow(Long id) {
 
     MoimSubmission findByMoimIdAndGuestId(Long moimId, Long guestId);
 
-    List<MoimSubmission> findBymoimId(Long moimId);
+    List<MoimSubmission> findMoimSubmissionByMoimId(Long moimId);
 
-    List<MoimSubmission> findMoimListByMoimId(Long moimId);
-
-    @Query("SELECT ms FROM MoimSubmission ms WHERE ms.moim.id = :moimId AND ms.moimSubmissionState IN ('pendingApproval', 'approved', 'rejected')")
+    @Query("SELECT ms FROM MoimSubmission ms WHERE ms.moim.id = :moimId AND ms.moimSubmissionState IN ('pendingApproval', 'approved', 'rejected','completed')")
     List<MoimSubmission> findMoimListByMoimIdAndMoimSubmissionState(@Param("moimId") Long moimId);
 
     @Query("SELECT ms FROM MoimSubmission ms WHERE ms.guestId = :guestId AND ms.moimSubmissionState = 'completed'")
     List<MoimSubmission> findCompletedMoimSubmissionsByGuest(@Param("guestId") Long guestId);
 
-    @Query(value = "SELECT COUNT(*) FROM moim_submissions WHERE moim_id = :moimId AND moim_submission_state = 'approved'", nativeQuery = true)
+    @Query("SELECT COUNT(ms) FROM MoimSubmission ms WHERE ms.moim.id = :moimId AND ms.moimSubmissionState = 'approved'")
     long countApprovedMoimSubmissions(@Param("moimId") Long moimId);
 
-    @Query("SELECT COUNT(ms) FROM MoimSubmission ms WHERE ms.moim.id IN :moimIds AND ms.moimSubmissionState = 'approved'")
-    int countApprovedSubmissionsByMoimIds(@Param("moimIds") List<Long> moimIds);
+    @Query("SELECT COUNT(ms) FROM MoimSubmission ms WHERE ms.moim.id IN :moimIds AND ms.moimSubmissionState = 'completed'")
+    int countCompletedSubmissionsByMoimIds(@Param("moimIds") List<Long> moimIds);
 
     boolean existsByMoimIdAndGuestIdAndMoimSubmissionState(Long moimId, Long guestId, String MoimSubmissionState);
 

diff --git a/...main/java/com/pickple/server/api/moimsubmission/service/MoimSubmissionCommandService.java b/...main/java/com/pickple/server/api/moimsubmission/service/MoimSubmissionCommandService.java
@@ -42,7 +42,7 @@ private void isDuplicatedMoimSubmission(MoimSubmission moimSubmission) {
     }
 
     public void updateSubmissionState(Long moimId, List<Long> submitterIdList) {
-        List<MoimSubmission> moimSubmissionList = moimSubmissionRepository.findBymoimId(moimId);
+        List<MoimSubmission> moimSubmissionList = moimSubmissionRepository.findMoimSubmissionByMoimId(moimId);
 
         for (MoimSubmission moimSubmission : moimSubmissionList) {
             if (submitterIdList.contains(moimSubmission.getGuestId())) {

diff --git a/src/main/java/com/pickple/server/api/moimsubmission/service/MoimSubmissionQueryService.java b/src/main/java/com/pickple/server/api/moimsubmission/service/MoimSubmissionQueryService.java
@@ -97,8 +97,8 @@ public MoimSubmissionByMoimResponse getSubmitterListByMoim(Long moimId) {
         Moim moim = moimRepository.findMoimByIdOrThrow(moimId);
 
         // moimSubmissionList 가져오기
-        List<MoimSubmission> moimSubmissionList = moimSubmissionRepository.findMoimListByMoimIdAndMoimSubmissionState(
-                moimId);
+        List<MoimSubmission> moimSubmissionList = moimSubmissionRepository
+                .findMoimListByMoimIdAndMoimSubmissionState(moimId);
 
         // guestId를 이용하여 SubmitterInfo 객체 생성 후 리스트에 저장
         List<SubmitterInfo> submitterInfoList = moimSubmissionList.stream()
@@ -178,8 +178,7 @@ public SubmitterInfo getSubmitterInfo(Long guestId, Long moimId) {
     }
 
     public boolean isMoimSubmissonApproved(Long moimId) {
-        Moim moim = moimRepository.findMoimByIdOrThrow(moimId);
-        List<MoimSubmission> moimSubmissionList = moimSubmissionRepository.findMoimListByMoimId(moimId);
+        List<MoimSubmission> moimSubmissionList = moimSubmissionRepository.findMoimSubmissionByMoimId(moimId);
 
         //모임에 해당하는 신청 내역 중 approved or rejected가 있는 경우 true 리턴
         for (MoimSubmission moimSubmission : moimSubmissionList) {