Merge pull request #157 from MUIT-UMC/develop

[merge] 250221 / 43th deploy

Author: sweatbuckets

src/main/java/muit/backend/controller/EventController.java

@@ -28,12 +28,12 @@ public class EventController {
     private final MemberService memberService;
 
     @GetMapping("")
-    @Operation(summary = "현재 진행중인 뮤지컬 이벤트 조회 API", description = "시작 날짜가 오늘 날짜 이후인 이벤트를 하나라도 갖고 있는 모든 뮤지컬의 이벤트 목록을 조회하는 API, 한 페이지에 뮤지컬 6개씩")
+    @Operation(summary = "현재 진행중인 뮤지컬 이벤트 조회 API", description = "종료 날짜가 오늘 날짜 이후인 이벤트를 하나라도 갖고 있는 모든 뮤지컬의 이벤트 목록을 조회하는 API, 한 페이지에 뮤지컬 6개씩")
     public ApiResponse<Page<EventResponseDTO.EventResultListDTO>> getEventListSortedByEvFrom(@RequestHeader("Authorization") String accessToken,
                                                                                              @RequestParam(defaultValue = "0", name = "page") Integer page){
         LocalDate today = LocalDate.now();
         Member member = memberService.getMemberByToken(accessToken);
-        return ApiResponse.onSuccess(eventService.getEventListOrderByEvFrom(today, member, page));
+        return ApiResponse.onSuccess(eventService.getEventListOrderByEvTo(today, member, page));
     }
 
     @GetMapping("/{musicalId}")

src/main/java/muit/backend/repository/EventRepository.java

@@ -15,5 +15,5 @@ public interface EventRepository extends JpaRepository<Event, Long> {
 
     List<Event> findByMusicalIdOrderByEvFromAsc(long musicalId);
 
-    List<Event> findAllByEvFromIsNotNullOrderByEvFromAsc();
+    List<Event> findAllByEvFromIsNotNullOrderByEvToAsc();
 }

src/main/java/muit/backend/service/EventService.java

@@ -17,7 +17,7 @@
 public interface EventService {
     public EventResponseDTO.EventResultListDTO getEvent (Long musicalId, Member member);
 
-    public Page<EventResponseDTO.EventResultListDTO> getEventListOrderByEvFrom (LocalDate today, Member member, Integer page);
+    public Page<EventResponseDTO.EventResultListDTO> getEventListOrderByEvTo (LocalDate today, Member member, Integer page);
 
     public EventResponseDTO.EventResultDTO createEvent(Long musicalId, EventRequestDTO.EventCreateDTO eventCreateDTO);
 

src/main/java/muit/backend/service/EventServiceImpl.java

@@ -53,15 +53,15 @@ public EventResponseDTO.EventResultListDTO getEvent(Long musicalId, Member membe
 
 
     @Override
-    public Page<EventResponseDTO.EventResultListDTO> getEventListOrderByEvFrom(LocalDate today, Member member, Integer page) {
+    public Page<EventResponseDTO.EventResultListDTO> getEventListOrderByEvTo(LocalDate today, Member member, Integer page) {
         //Event 를 EvFrom 기준 오름차순으로 정렬
-        List<Event> eventList = eventRepository.findAllByEvFromIsNotNullOrderByEvFromAsc();
+        List<Event> eventList = eventRepository.findAllByEvFromIsNotNullOrderByEvToAsc();
 
         List<EventResponseDTO.EventResultListDTO> eventResultListDTOs = eventList.stream()
                 .collect(Collectors.groupingBy(event -> event.getMusical().getId()))
                 .values().stream()
                 .filter(group -> group.stream()                                     // List<Event>로 변환된 스트림을 다시 스트림으로 변환
-                        .anyMatch(event -> !event.getEvFrom().isBefore(today)))
+                        .anyMatch(event -> !event.getEvTo().isBefore(today)))
                 .map(group-> {
                     return EventConverter.toEventResultListDTO(group.get(0).getMusical(),
                             (likesRepository.findByMemberIdAndMusicalId(member.getId(), group.get(0).getMusical().getId())!=null), group);})