Merge pull request #237 from prgrms-web-devcourse-final-project/cdj/schedule/votehotfix

🐛 fix: 중간 장소 투표 DTO 수정(Schedule -> ScheduleId)

Author: qkqehenr7

src/main/java/com/grepp/spring/app/model/schedule/dto/VoteMiddleLocationDto.java

@@ -4,6 +4,7 @@
 import com.grepp.spring.app.model.schedule.entity.Schedule;
 import com.grepp.spring.app.model.schedule.entity.ScheduleMember;
 import com.grepp.spring.app.model.schedule.entity.Vote;
+import com.grepp.spring.app.model.schedule.repository.ScheduleMemberRepository;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
@@ -12,21 +13,27 @@
 @Setter
 @Builder
 public class VoteMiddleLocationDto {
-    private ScheduleMember scheduleMember;
+//    private ScheduleMember scheduleMember;
+    private Long scheduleMemberId;
     private Location location;
     private Schedule schedule;
 
-    public static VoteMiddleLocationDto toDto(ScheduleMember scheduleMember, Location location, Schedule schedule) {
+    public static VoteMiddleLocationDto toDto(Long scheduleMemberId, Location location, Schedule schedule) {
         return VoteMiddleLocationDto.builder()
-            .scheduleMember(scheduleMember)
+            .scheduleMemberId(scheduleMemberId)
             .location(location)
             .schedule(schedule)
             .build();
     }
 
-    public static Vote fromDto(VoteMiddleLocationDto dto) {
+    public static Vote fromDto(VoteMiddleLocationDto dto,
+        ScheduleMemberRepository scheduleMemberRepository) {
+
+        ScheduleMember scheduleMember = scheduleMemberRepository.findById(dto.getScheduleMemberId())
+            .orElseThrow(() -> new IllegalArgumentException("ScheduleMember not found with ID: " + dto.getScheduleMemberId()));
         return Vote.builder()
-            .scheduleMember(dto.getScheduleMember())
+//            .scheduleMember(dto.getScheduleMember())
+            .scheduleMember(scheduleMember)
             .location(dto.getLocation())
             .schedule(dto.getSchedule())
             .build();

src/main/java/com/grepp/spring/app/model/schedule/service/ScheduleCommandService.java

@@ -449,6 +449,8 @@ private List<JsonNode> findNearestStations(double latitude, double longitude)
     @Transactional
     public void voteMiddleLocation(Schedule schedule, ScheduleMember scheduleMember, Location lid) {
 
+        // 엔티티 객체 대신 ID를 사용하도록 변경
+        Long scheduleMemberId = scheduleMember.getId();
 //        Location location = getLocation(lid);
         // Location 엔티티에 비관적 락을 걸고 조회하기
         // 파라미터를 id로 받으면 더 좋을 것 같음
@@ -466,8 +468,8 @@ public void voteMiddleLocation(Schedule schedule, ScheduleMember scheduleMember,
         int scheduleMemberNumber = scheduleMemberQueryRepository.findByScheduleId(schedule.getId()).size();
 
         // vote 저장 시점을 뒤로 미뤄서, Location 락과의 교착을 방지
-        VoteMiddleLocationDto dto = VoteMiddleLocationDto.toDto(scheduleMember, lid, schedule);
-        Vote vote = VoteMiddleLocationDto.fromDto(dto);
+        VoteMiddleLocationDto dto = VoteMiddleLocationDto.toDto(scheduleMemberId, lid, schedule);
+        Vote vote = VoteMiddleLocationDto.fromDto(dto, scheduleMemberRepository);
         voteCommandRepository.save(vote);
 
 

src/main/java/com/grepp/spring/app/model/schedule/service/ScheduleQueryService.java

@@ -51,7 +51,7 @@ public class ScheduleQueryService {
     private final VoteQueryRepository voteQueryRepository;
     private final MetroTransferQueryRepository metroTransferQueryRepository;
 
-    @Transactional
+    @Transactional(readOnly = true)
     public ShowScheduleResponse showSchedule(Schedule schedule, String userId) {
 
         Long eventId = schedule.getEvent().getId();