Merge remote-tracking branch 'origin/main' into deployment

Author: leeseojun34

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/event/entity/Event.java

@@ -82,8 +82,8 @@ private static void validateTitle(String title) {
         if (title == null || title.trim().isEmpty()) {
             throw new IllegalArgumentException("이벤트 제목은 필수입니다.");
         }
-        if (title.length() > 10) {
-            throw new IllegalArgumentException("이벤트 제목은 10자를 초과할 수 없습니다.");
+        if (title.length() > 20) {
+            throw new IllegalArgumentException("이벤트 제목은 20자를 초과할 수 없습니다.");
         }
     }
 

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/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/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) {
@@ -448,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로 받으면 더 좋을 것 같음
@@ -465,13 +468,16 @@ 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);
 
+
         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 +493,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

@@ -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();
@@ -69,16 +69,18 @@ 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);
         }
 
         throw new NotScheduleMemberException(ScheduleErrorCode.NOT_SCHEDULE_MEMBER);
     }
 
+    @Transactional(readOnly = true)
     public ShowSuggestedLocationsResponse showSuggestedLocation(Long scheduleId) {
         List<MetroInfoDto> infoDto = getMetroInfoDtos(scheduleId);
         int scheduleMemberNumber = scheduleMemberQueryRepository.findByScheduleId(scheduleId).size();
@@ -113,6 +115,7 @@ private int getDepartLocationCount(Long scheduleId) {
         return departLocationCount;
     }
 
+    @Transactional(readOnly = true)
     public ShowVoteMembersResponse findVoteMembers(Long scheduleId) {
 
         List<VoteMemberDto> voteMemberList = getVoteMemberDtos(scheduleId);
@@ -137,29 +140,34 @@ private List<VoteMemberDto> getVoteMemberDtos(Long scheduleId) {
         return voteMemberList;
     }
 
+    @Transactional(readOnly = true)
     public Schedule findScheduleById(Long scheduleId) {
         return scheduleQueryRepository.findById(scheduleId)
             .orElseThrow(() -> new ScheduleNotFoundException(
                 GroupErrorCode.SCHEDULE_NOT_FOUND));
     }
 
+    @Transactional(readOnly = true)
     public Event findEventById(Long eventId) {
         return eventRepository.findById(eventId).orElseThrow(() -> new EventNotFoundException(
             EventErrorCode.EVENT_NOT_FOUND));
     }
 
+    @Transactional(readOnly = true)
     public Location findLocationById(Long locationId) {
         return locationQueryRepository.findById(locationId)
             .orElseThrow(() -> new LocationNotFoundException(
                 ScheduleErrorCode.LOCATION_NOT_FOUND));
     }
 
+    @Transactional(readOnly = true)
     public ScheduleMember findScheduleMemberById(Long scheduleMemberId) {
         return scheduleMemberQueryRepository.findById(scheduleMemberId)
             .orElseThrow(() -> new ScheduleMemberNotFoundException(
                 ScheduleErrorCode.LOCATION_NOT_FOUND));
     }
 
+    @Transactional(readOnly = true)
     public Workspace findWorkspaceById(Long workspaceId) {
         return workspaceQueryRepository.findById(workspaceId).orElseThrow(
             () -> new WorkSpaceNotFoundException(ScheduleErrorCode.WORKSPACE_NOT_FOUND));