[feat] @hostid 검증 로직 추가 구현

PICK-PLE · Sep 17, 2024 · f2a5a08 · f2a5a08
2 parents 3b396d2 + 3781f27
commit f2a5a08
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 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
@@ -11,8 +11,6 @@
 import com.pickple.server.api.moim.repository.MoimRepository;
 import com.pickple.server.api.moimsubmission.repository.MoimSubmissionRepository;
 import com.pickple.server.api.submitter.repository.SubmitterRepository;
-import com.pickple.server.global.exception.BadRequestException;
-import com.pickple.server.global.response.enums.ErrorCode;
 import java.util.List;
 import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
@@ -33,8 +31,6 @@ public class HostQueryService {
     public HostGetResponse getHost(Long hostId, Long guestId) {
         Guest guest = guestRepository.findGuestByIdOrThrow(guestId);
 
-        isDuplicatedSubmission(guest);
-
         Host host = hostRepository.findHostByIdOrThrow(hostId);
 
         return HostGetResponse.builder()
@@ -87,10 +83,4 @@ private int moimCounter(Long hostId) {
         return moimRepository.CompletedMoimNumber(hostId);
     }
 
-    private void isDuplicatedSubmission(Guest guest) {
-        if (submitterRepository.existsByGuestAndSubmitterState(guest, "pending")) {
-            throw new BadRequestException(ErrorCode.DUPLICATION_SUBMITTER);
-        }
-    }
-
 }
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
@@ -147,7 +147,6 @@ private MoimSubmissionAllResponse mapToMoimSubmissionAllResponse(MoimSubmission
 
     private boolean isApprovable(Moim moim) {
         // 모임일
-        System.out.println(moim.getId());
         LocalDate date = moim.getDateList().getDate();
 
         // 마감일: 신청일 + 3일의 자정

diff --git a/src/main/java/com/pickple/server/global/common/annotation/resolver/HostIdResolver.java b/src/main/java/com/pickple/server/global/common/annotation/resolver/HostIdResolver.java
@@ -1,8 +1,12 @@
 package com.pickple.server.global.common.annotation.resolver;
 
+import com.pickple.server.api.guest.domain.Guest;
+import com.pickple.server.api.guest.repository.GuestRepository;
 import com.pickple.server.api.host.domain.Host;
 import com.pickple.server.api.host.repository.HostRepository;
+import com.pickple.server.api.submitter.repository.SubmitterRepository;
 import com.pickple.server.global.common.annotation.HostId;
+import com.pickple.server.global.exception.BadRequestException;
 import com.pickple.server.global.exception.CustomException;
 import com.pickple.server.global.response.enums.ErrorCode;
 import java.security.Principal;
@@ -19,6 +23,8 @@
 public class HostIdResolver implements HandlerMethodArgumentResolver {
 
     private final HostRepository hostRepository;
+    private final SubmitterRepository submitterRepository;
+    private final GuestRepository guestRepository;
 
     @Override
     public boolean supportsParameter(MethodParameter parameter) {
@@ -35,10 +41,21 @@ public Object resolveArgument(MethodParameter parameter,
         if (principal == null) {
             throw new CustomException(ErrorCode.EMPTY_PRINCIPAL);
         }
+
+        // 대기중인 호스트 신청이 있는지 검증
+        isDuplicatedSubmission(guestRepository.findGuestByUserId(Long.valueOf(principal.getName())));
+
         Host host = hostRepository.findHostByUserId(Long.valueOf(principal.getName()));
         if (host == null) {
             throw new CustomException(ErrorCode.HOST_NOT_FOUND);
         }
         return host.getId();
     }
+
+    private void isDuplicatedSubmission(Guest guest) {
+        if (submitterRepository.existsByGuestAndSubmitterState(guest, "pending")) {
+            throw new BadRequestException(ErrorCode.DUPLICATION_SUBMITTER);
+        }
+    }
+
 }