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

일정 - 일정 조회 에러 수정

Author: qkqehenr7

src/main/java/com/grepp/spring/app/controller/api/event/payload/request/CreateEventRequest.java

@@ -22,11 +22,11 @@ public class CreateEventRequest {
 
     @Schema(description = "이벤트 제목", example = "스터디 모임")
     @NotBlank(message = "이벤트 제목은 필수입니다.")
-    @Size(max = 10, message = "이벤트 제목은 10자를 초과할 수 없습니다.")
+    @Size(max = 20, message = "이벤트 제목은 10자를 초과할 수 없습니다.")
     private String title;
 
     @Schema(description = "이벤트 설명", example = "매주 화요일 스터디 모임입니다.")
-    @Size(max = 500, message = "이벤트 설명은 500자를 초과할 수 없습니다.")
+    @Size(max = 50, message = "이벤트 설명은 50자를 초과할 수 없습니다.")
     private String description;
 
     @Schema(description = "미팅 타입", example = "ONLINE", allowableValues = {"ONLINE", "OFFLINE"})

src/main/java/com/grepp/spring/app/controller/api/schedule/payload/request/CreateSchedulesRequest.java

@@ -19,7 +19,7 @@ public class CreateSchedulesRequest {
     private LocalDateTime startTime;
     private LocalDateTime endTime;
 
-    @Size(max = 10, message = "일정 제목은 10자를 초과할 수 없습니다.")
+    @Size(max = 20, message = "일정 제목은 20자를 초과할 수 없습니다.")
     private String scheduleName;
 
     @Size(max = 50, message = "일정 설명은 50자를 초과할 수 없습니다.")

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

@@ -22,4 +22,7 @@ public class ScheduleMembersDto {
     private String departLocationName;
     private Double latitude;
     private Double longitude;
+
+    // 어떤 장소에 투표했는지
+    private Long VoteLocationId;
 }

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

@@ -68,7 +68,7 @@ public static ShowScheduleResponse fromDto(ShowScheduleDto dto) {
             .build();
     }
 
-    public static ShowScheduleDto fromEntity(MeetingType meetingType, Long event, Schedule schedule, List<ScheduleMember> scheduleMembers, List<Workspace> workspace) {
+    public static ShowScheduleDto fromEntity(MeetingType meetingType, Long event, Schedule schedule, List<ScheduleMember> scheduleMembers, List<Workspace> workspace, List<Long> voteLocationId) {
 
         ScheduleStatus scheduleStatus;
 
@@ -80,6 +80,8 @@ public static ShowScheduleDto fromEntity(MeetingType meetingType, Long event, Sc
             scheduleStatus = ScheduleStatus.FIXED;
         }
 
+
+
         List<ScheduleMembersDto> members = IntStream.range(0, scheduleMembers.size())
             .mapToObj(i-> new ScheduleMembersDto(
                 scheduleMembers.get(i).getMember().getId(),
@@ -88,7 +90,8 @@ public static ShowScheduleDto fromEntity(MeetingType meetingType, Long event, Sc
                 scheduleMembers.get(i).getRole(),
                 scheduleMembers.get(i).getDepartLocationName(),
                 scheduleMembers.get(i).getLatitude(),
-                scheduleMembers.get(i).getLongitude()
+                scheduleMembers.get(i).getLongitude(),
+                voteLocationId.size() > i ? voteLocationId.get(i) : null
             ))
             .collect(Collectors.toList());
 

src/main/java/com/grepp/spring/app/model/schedule/repository/VoteQueryRepository.java

@@ -13,4 +13,7 @@ public interface VoteQueryRepository extends JpaRepository<Vote, Long> {
 
     @Query("select v from Vote v where v.scheduleMember.id = :scheduleMemberId")
     Vote findByScheduleMemberId(@Param("scheduleMemberId") Long scheduleMemberId);
+
+    @Query("select v.location.id from Vote v where v.schedule.id = :id")
+    List<Long> findByScheduleIdAndMemberId(@Param("id") Long id);
 }

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

@@ -257,8 +257,9 @@ private void modifyScheduleEntity(Long scheduleId, ModifyScheduleDto dto) {
         if (dto.getMeetingPlatform() != null) {
             schedule.get().setMeetingPlatform(dto.getMeetingPlatform());
         }
-
-        schedule.get().setPlatformUrl(dto.getPlatformURL());
+        if (dto.getPlatformURL() != null) {
+            schedule.get().setPlatformUrl(dto.getPlatformURL());
+        }
     }
 
     private void modifyWorkspaceEntity(Long scheduleId, ModifyScheduleDto dto, Long workspaceId) {
@@ -469,9 +470,12 @@ public void voteMiddleLocation(Schedule schedule, ScheduleMember scheduleMember,
         Vote vote = VoteMiddleLocationDto.fromDto(dto);
         voteCommandRepository.save(vote);
 
+
         int voteCount = voteQueryRepository.findByScheduleId(schedule.getId()).size();
         log.info("voteCount = {}", voteCount);
 
+//        Optional<Schedule> schedule1 = scheduleQueryRepository.findById(schedule.getId());
+
 
         if (scheduleMemberNumber - voteCount == 0) {
             Long winnerLocationId = 0L;
@@ -487,6 +491,14 @@ public void voteMiddleLocation(Schedule schedule, ScheduleMember scheduleMember,
             Optional<Location> winnerLocation = locationQueryRepository.findById(winnerLocationId);
             log.info("winnerLocation: {}", winnerLocation);
             winnerLocation.get().setStatus(VoteStatus.WINNER);
+
+            final String name = winnerLocation.get().getName();
+
+            log.info("name={}", name);
+            schedule.setLocation(name);
+            scheduleCommandRepository.save(schedule);
+
+//            em.flush();
         }
     }
 

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

@@ -69,9 +69,10 @@ public ShowScheduleResponse showSchedule(Schedule schedule, String userId) {
             List<Workspace> workspaces = workspaceQueryRepository.findAllByScheduleId(schedule.getId());
 
             MeetingType meetingType = eventRepository.findById(eventId).get().getMeetingType();
+            List<Long> voteLocationId = voteQueryRepository.findByScheduleIdAndMemberId(schedule.getId());
 
             ShowScheduleDto dto = ShowScheduleDto.fromEntity(meetingType, eventId, schedule,
-                scheduleMembers, workspaces);
+                scheduleMembers, workspaces, voteLocationId);
 
             return ShowScheduleDto.fromDto(dto);
         }