Merge pull request #150 from Team-Going/feature/138

[fix] 여행 나가기 API 오류 수정
Team-Going · Mar 9, 2024 · 39c2b7d · 39c2b7d
2 parents a80c6f7 + fd7a21b
commit 39c2b7d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/doorip-api/src/main/java/org/doorip/trip/service/TripDetailService.java b/doorip-api/src/main/java/org/doorip/trip/service/TripDetailService.java
@@ -68,7 +68,7 @@ public TripParticipantGetResponse getParticipants(Long userId, Long tripId) {
     public void leaveTrip(Long userId, Long tripId) {
         User findUser = getUser(userId);
         Trip findTrip = getTrip(tripId);
-        int size = calculateParticipantsCount(findTrip);
+        int size = participantRepository.countByTrip(findTrip);
         Participant findParticipant = getParticipant(findUser, findTrip);
         List<Todo> todos = todoRepository.findMyTodoByTripIdAndUserIdAndSecret(tripId, userId, Secret.MY);
         todoRepository.deleteAll(todos);
@@ -130,10 +130,6 @@ private User getUser(Long userId) {
                 .orElseThrow(() -> new EntityNotFoundException(ErrorMessage.USER_NOT_FOUND));
     }
 
-    private int calculateParticipantsCount(Trip findTrip) {
-        return findTrip.getParticipants().size();
-    }
-
     private Participant getParticipant(User findUser, Trip findTrip) {
         return participantRepository.findByUserAndTrip(findUser, findTrip)
                 .orElseThrow(() -> new EntityNotFoundException(ErrorMessage.PARTICIPANT_NOT_FOUND));
@@ -166,8 +162,7 @@ private boolean isEqualUserAndParticipantUser(User user, User participantUser) {
     private int getValidatedResult(User user) {
         if (user.getResult() == null) {
             return -1;
-        }
-        else {
+        } else {
             return user.getResult().getNumResult();
         }
     }

diff --git a/doorip-domain/src/main/java/org/doorip/trip/repository/ParticipantRepository.java b/doorip-domain/src/main/java/org/doorip/trip/repository/ParticipantRepository.java
@@ -11,4 +11,6 @@ public interface ParticipantRepository extends JpaRepository<Participant, Long>
     boolean existsByUserAndTrip(User user, Trip trip);
 
     Optional<Participant> findByUserAndTrip(User user, Trip trip);
+
+    int countByTrip(Trip trip);
 }
diff --git a/doorip-domain/src/main/java/org/doorip/trip/repository/TodoRepository.java b/doorip-domain/src/main/java/org/doorip/trip/repository/TodoRepository.java
@@ -25,8 +25,10 @@ public interface TodoRepository extends JpaRepository<Todo, Long> {
             "from Todo d " +
             "join Trip i " +
             "on d.trip = i " +
+            "join Allocator a " +
+            "on a.todo = d " +
             "join Participant p " +
-            "on p.trip = i " +
+            "on a.participant = p " +
             "join User u " +
             "on p.user = u " +
             "where i.id = :tripId " +