Merge pull request #231 from prgrms-web-devcourse-final-project/lkh/schedule/refactor

Leeka99 · web-flow · commit d57e703f83d3 · 2025-07-29T23:52:15.000+09:00
🐛 fix: 일정 - 중간장소 투표 결과 WINNER 반영되지 않는 이슈 해결
diff --git a/src/main/java/com/grepp/spring/app/controller/api/schedule/ScheduleController.java b/src/main/java/com/grepp/spring/app/controller/api/schedule/ScheduleController.java
@@ -58,10 +58,10 @@ private Schedule validSchedule(Long scheduleId) {
     @Operation(summary = "일정 조회", description = "일정을 조회합니다.")
     @GetMapping("/show/{scheduleId}")
     public ResponseEntity<ApiResponse<ShowScheduleResponse>> showSchedules(
-        @PathVariable Long scheduleId) {
+        @PathVariable Long scheduleId, @CurrentUser String userId) {
 
         Schedule schedule = validSchedule(scheduleId);
-        ShowScheduleResponse response = scheduleQueryService.showSchedule(schedule);
+        ShowScheduleResponse response = scheduleQueryService.showSchedule(schedule, userId);
 
         return ResponseEntity.ok(ApiResponse.success(response));
     }
diff --git a/src/main/java/com/grepp/spring/app/model/schedule/repository/LocationQueryRepository.java b/src/main/java/com/grepp/spring/app/model/schedule/repository/LocationQueryRepository.java
@@ -6,6 +6,7 @@
 import java.util.Optional;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Lock;
+import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
@@ -17,4 +18,5 @@ public interface LocationQueryRepository extends JpaRepository<Location, Long> {
     @Lock(LockModeType.PESSIMISTIC_WRITE)
     @Query("select l from Location l where l.id = :id")
     Optional<Location> findByIdWithPessimisticLock(@Param("id") Long id);
+
 }
diff --git a/src/main/java/com/grepp/spring/app/model/schedule/service/ScheduleCommandService.java b/src/main/java/com/grepp/spring/app/model/schedule/service/ScheduleCommandService.java
@@ -52,6 +52,7 @@
 import com.grepp.spring.app.model.schedule.repository.WorkspaceCommandRepository;
 import com.grepp.spring.app.model.schedule.repository.WorkspaceQueryRepository;
 import com.grepp.spring.infra.error.exceptions.schedule.EventNotActivatedException;
+import com.grepp.spring.infra.error.exceptions.schedule.VoteAlreadyProgressException;
 import com.grepp.spring.infra.utils.RandomPicker;
 import com.grepp.spring.infra.error.exceptions.NotFoundException;
 import com.grepp.spring.infra.error.exceptions.group.UserNotFoundException;
@@ -452,30 +453,39 @@ public void voteMiddleLocation(Schedule schedule, ScheduleMember scheduleMember,
         // 파라미터를 id로 받으면 더 좋을 것 같음
         Location location = locationQueryRepository.findByIdWithPessimisticLock(lid.getId())
                 .orElseThrow(() -> new IllegalArgumentException("장소를 찾을 수 없습니다."));
+//        log.info("location = {}", location.toString());
+
 
         // 락 이후 voteCnt 증가시키기
         location.setVoteCount(location.getVoteCount() + 1);
 
         List<Location> locationList = locationQueryRepository.findByScheduleId(schedule.getId());
+//        log.info("locationList = {}", locationList.toString());
+
         int scheduleMemberNumber = scheduleMemberQueryRepository.findByScheduleId(schedule.getId()).size();
-        int voteCount = voteQueryRepository.findByScheduleId(schedule.getId()).size();
 
         // vote 저장 시점을 뒤로 미뤄서, Location 락과의 교착을 방지
         VoteMiddleLocationDto dto = VoteMiddleLocationDto.toDto(scheduleMember, lid, schedule);
         Vote vote = VoteMiddleLocationDto.fromDto(dto);
         voteCommandRepository.save(vote);
 
+        int voteCount = voteQueryRepository.findByScheduleId(schedule.getId()).size();
+        log.info("voteCount = {}", voteCount);
+
+
         if (scheduleMemberNumber - voteCount == 0) {
+            Long winnerLocationId = 0L;
             int winner = 0;
-            Long winnerLid = null;
             for (Location l : locationList) {
                 if (winner <= l.getVoteCount()) {
                     winner = l.getVoteCount();
-                    winnerLid = l.getId();
+                    winnerLocationId = l.getId();
+                    log.info("winnerLocationId: {}", winnerLocationId);
                 }
             }
 
-            Optional<Location> winnerLocation = locationQueryRepository.findById(winnerLid);
+            Optional<Location> winnerLocation = locationQueryRepository.findById(winnerLocationId);
+            log.info("winnerLocation: {}", winnerLocation);
             winnerLocation.get().setStatus(VoteStatus.WINNER);
         }
     }
@@ -555,7 +565,7 @@ public void WriteSuggestedLocation(Schedule schedule, WriteSuggestedLocationRequ
             }
         }
         else {
-            throw new RuntimeException("투표중입니다! 투표중에는 후보장소를 등록할 수 없습니다.");
+            throw new VoteAlreadyProgressException(ScheduleErrorCode.VOTE_ALREADY_PROGRESS);
         }
 
     }
diff --git a/src/main/java/com/grepp/spring/app/model/schedule/service/ScheduleQueryService.java b/src/main/java/com/grepp/spring/app/model/schedule/service/ScheduleQueryService.java
@@ -25,6 +25,7 @@
 import com.grepp.spring.infra.error.exceptions.event.EventNotFoundException;
 import com.grepp.spring.infra.error.exceptions.group.ScheduleNotFoundException;
 import com.grepp.spring.infra.error.exceptions.schedule.LocationNotFoundException;
+import com.grepp.spring.infra.error.exceptions.schedule.NotScheduleMemberException;
 import com.grepp.spring.infra.error.exceptions.schedule.ScheduleMemberNotFoundException;
 import com.grepp.spring.infra.error.exceptions.schedule.WorkSpaceNotFoundException;
 import com.grepp.spring.infra.response.EventErrorCode;
@@ -51,22 +52,31 @@ public class ScheduleQueryService {
     private final MetroTransferQueryRepository metroTransferQueryRepository;
 
     @Transactional
-    public ShowScheduleResponse showSchedule(Schedule schedule) {
+    public ShowScheduleResponse showSchedule(Schedule schedule, String userId) {
 
         Long eventId = schedule.getEvent().getId();
 
         List<ScheduleMember> scheduleMembers = scheduleMemberQueryRepository.findByScheduleId(
             schedule.getId());
+        Boolean bool = false;
+        for (ScheduleMember scheduleMember : scheduleMembers) {
+            if (scheduleMember.getMember().getId().equals(userId)) {
+                bool = true;
+            }
+        }
 
-        List<Workspace> workspaces = workspaceQueryRepository.findAllByScheduleId(schedule.getId());
+        if (bool) {
+            List<Workspace> workspaces = workspaceQueryRepository.findAllByScheduleId(schedule.getId());
 
-        MeetingType meetingType = eventRepository.findById(eventId).get().getMeetingType();
+            MeetingType meetingType = eventRepository.findById(eventId).get().getMeetingType();
 
+            ShowScheduleDto dto = ShowScheduleDto.fromEntity(meetingType, eventId, schedule,
+                scheduleMembers, workspaces);
 
-        ShowScheduleDto dto = ShowScheduleDto.fromEntity(meetingType, eventId, schedule,
-            scheduleMembers, workspaces);
+            return ShowScheduleDto.fromDto(dto);
+        }
 
-        return ShowScheduleDto.fromDto(dto);
+        throw new NotScheduleMemberException(ScheduleErrorCode.NOT_SCHEDULE_MEMBER);
     }
 
     public ShowSuggestedLocationsResponse showSuggestedLocation(Long scheduleId) {
diff --git a/src/main/java/com/grepp/spring/infra/error/RestApiExceptionAdvice.java b/src/main/java/com/grepp/spring/infra/error/RestApiExceptionAdvice.java
diff --git a/src/main/java/com/grepp/spring/infra/error/exceptions/schedule/NotScheduleMemberException.java b/src/main/java/com/grepp/spring/infra/error/exceptions/schedule/NotScheduleMemberException.java
@@ -0,0 +1,22 @@
+package com.grepp.spring.infra.error.exceptions.schedule;
+
+import com.grepp.spring.infra.response.ScheduleErrorCode;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class NotScheduleMemberException  extends RuntimeException {
+    private final ScheduleErrorCode code;
+
+    public NotScheduleMemberException(ScheduleErrorCode code) {
+        this.code = code;
+    }
+
+    public NotScheduleMemberException(ScheduleErrorCode code, Exception e) {
+        this.code = code;
+        log.error(e.getMessage(), e);
+    }
+
+    public ScheduleErrorCode code() {
+        return code;
+    }
+}
diff --git a/src/main/java/com/grepp/spring/infra/error/exceptions/schedule/VoteAlreadyProgressException.java b/src/main/java/com/grepp/spring/infra/error/exceptions/schedule/VoteAlreadyProgressException.java
@@ -0,0 +1,22 @@
+package com.grepp.spring.infra.error.exceptions.schedule;
+
+import com.grepp.spring.infra.response.ScheduleErrorCode;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class VoteAlreadyProgressException extends RuntimeException {
+    private final ScheduleErrorCode code;
+
+    public VoteAlreadyProgressException(ScheduleErrorCode code) {
+        this.code = code;
+    }
+
+    public VoteAlreadyProgressException(ScheduleErrorCode code, Exception e) {
+        this.code = code;
+        log.error(e.getMessage(), e);
+    }
+
+    public ScheduleErrorCode code() {
+        return code;
+    }
+}
diff --git a/src/main/java/com/grepp/spring/infra/error/scheduleAdvuce/ScheduleExceptionAdvice.java b/src/main/java/com/grepp/spring/infra/error/scheduleAdvuce/ScheduleExceptionAdvice.java
@@ -11,6 +11,7 @@
 import com.grepp.spring.infra.response.ScheduleErrorCode;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.annotation.Order;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
@@ -20,17 +21,33 @@
 @Order(1)
 public class ScheduleExceptionAdvice {
 
+    @ExceptionHandler(VoteAlreadyProgressException.class)
+    public ResponseEntity<ApiResponse<String>> notScheduleMemberExHandler(
+        VoteAlreadyProgressException ex) {
+
+        return ResponseEntity.status(HttpStatus.CONFLICT)
+            .body(ApiResponse.error(ScheduleErrorCode.VOTE_ALREADY_PROGRESS));
+    }
+
+    @ExceptionHandler(NotScheduleMemberException.class)
+    public ResponseEntity<ApiResponse<String>> notScheduleMemberExHandler(
+        NotScheduleMemberException ex) {
+
+        return ResponseEntity.status(HttpStatus.FORBIDDEN)
+            .body(ApiResponse.error(ScheduleErrorCode.NOT_SCHEDULE_MEMBER));
+    }
+
     @ExceptionHandler(WorkSpaceNotFoundException.class)
     public ResponseEntity<ApiResponse<String>> workspaceNotFoundExHandler(
-        UserNotFoundException ex) {
+        WorkSpaceNotFoundException ex) {
 
         return ResponseEntity.status(ResponseCode.NOT_FOUND.status())
             .body(ApiResponse.error(ScheduleErrorCode.SCHEDULE_MEMBER_NOT_FOUND));
     }
 
     @ExceptionHandler(ScheduleMemberNotFoundException.class)
     public ResponseEntity<ApiResponse<String>> scheduleMemberNotFoundExHandler(
-        UserNotFoundException ex) {
+        ScheduleMemberNotFoundException ex) {
 
         return ResponseEntity.status(ResponseCode.NOT_FOUND.status())
             .body(ApiResponse.error(ScheduleErrorCode.SCHEDULE_MEMBER_NOT_FOUND));
@@ -46,7 +63,7 @@ public ResponseEntity<ApiResponse<String>> userNotFoundExHandler(
 
     @ExceptionHandler(LocationNotFoundException.class)
     public ResponseEntity<ApiResponse<String>> locationNotFoundExHandler(
-        ScheduleNotFoundException ex) {
+        LocationNotFoundException ex) {
 
         return ResponseEntity.status(ResponseCode.NOT_FOUND.status())
             .body(ApiResponse.error(GroupErrorCode.SCHEDULE_NOT_FOUND));
diff --git a/src/main/java/com/grepp/spring/infra/response/ScheduleErrorCode.java b/src/main/java/com/grepp/spring/infra/response/ScheduleErrorCode.java
@@ -7,7 +7,9 @@ public enum ScheduleErrorCode {
     LOCATION_NOT_FOUND("404",HttpStatus.NOT_FOUND, "해당 투표리스트(장소)를 찾을 수 없습니다. locationId를 확인해주세요."),
     SCHEDULE_MEMBER_NOT_FOUND("404",HttpStatus.NOT_FOUND, "스케줄에서 회원을 찾을 수 없습니다."),
     WORKSPACE_NOT_FOUND("404",HttpStatus.NOT_FOUND,"워크스페이스를 찾을 수 없습니다."),
-    EVENT_NOT_ACTIVATED("409", HttpStatus.CONFLICT, "이미 일정이 생성된 이벤트입니다.");
+    EVENT_NOT_ACTIVATED("409", HttpStatus.CONFLICT, "이미 일정이 생성된 이벤트입니다."),
+    NOT_SCHEDULE_MEMBER("403",HttpStatus.FORBIDDEN,"일정에 포함된 멤버만 조회할 수 있습니다."),
+    VOTE_ALREADY_PROGRESS("409",HttpStatus.CONFLICT,"투표중입니다! 투표중에는 후보장소를 등록할 수 없습니다.");
 
     private final String code;
     private final HttpStatus status;
diff --git a/src/test/java/com/grepp/spring/app/model/schedule/ScheduleQueryServiceTest.java b/src/test/java/com/grepp/spring/app/model/schedule/ScheduleQueryServiceTest.java
@@ -257,7 +257,7 @@ void showScheduleTest() {
 
 
         // When
-        var response = scheduleQueryService.showSchedule(dummySchedule1);
+        var response = scheduleQueryService.showSchedule(dummySchedule1,"GOOGLE_123");
 
         // Then
         assertNotNull(response);
