diff --git a/src/main/java/com/haru/api/domain/meeting/controller/MeetingController.java b/src/main/java/com/haru/api/domain/meeting/controller/MeetingController.java index 8e1bfb16..cb225ddd 100644 --- a/src/main/java/com/haru/api/domain/meeting/controller/MeetingController.java +++ b/src/main/java/com/haru/api/domain/meeting/controller/MeetingController.java @@ -6,8 +6,10 @@ import com.haru.api.domain.meeting.service.MeetingCommandService; import com.haru.api.domain.meeting.service.MeetingQueryService; import com.haru.api.domain.user.entity.User; +import com.haru.api.domain.workspace.entity.Workspace; import com.haru.api.global.annotation.AuthMeeting; import com.haru.api.global.annotation.AuthUser; +import com.haru.api.global.annotation.AuthWorkspace; import com.haru.api.global.apiPayload.ApiResponse; import com.haru.api.global.apiPayload.code.status.ErrorStatus; import com.haru.api.global.apiPayload.exception.GeneralException; @@ -71,10 +73,10 @@ public ApiResponse createMeeting( public ApiResponse> getMeetings( @PathVariable("workspaceId") String workspaceId, @Parameter(hidden = true) @AuthUser User user, - @Parameter(hidden = true) @AuthMeeting Meeting meeting + @Parameter(hidden = true) @AuthWorkspace Workspace workspace ) { - List response = meetingQueryService.getMeetings(user, meeting); + List response = meetingQueryService.getMeetings(user, workspace); return ApiResponse.onSuccess(response); } diff --git a/src/main/java/com/haru/api/domain/meeting/service/MeetingQueryService.java b/src/main/java/com/haru/api/domain/meeting/service/MeetingQueryService.java index 67ab47c0..7b07c5df 100644 --- a/src/main/java/com/haru/api/domain/meeting/service/MeetingQueryService.java +++ b/src/main/java/com/haru/api/domain/meeting/service/MeetingQueryService.java @@ -3,12 +3,13 @@ import com.haru.api.domain.meeting.dto.MeetingResponseDTO; import com.haru.api.domain.meeting.entity.Meeting; import com.haru.api.domain.user.entity.User; +import com.haru.api.domain.workspace.entity.Workspace; import java.util.List; public interface MeetingQueryService { - List getMeetings(User user, Meeting meeting); + List getMeetings(User user, Workspace workspace); MeetingResponseDTO.getMeetingProceeding getMeetingProceeding(User user, Meeting meeting); diff --git a/src/main/java/com/haru/api/domain/meeting/service/MeetingQueryServiceImpl.java b/src/main/java/com/haru/api/domain/meeting/service/MeetingQueryServiceImpl.java index e7fef13e..f70562e9 100644 --- a/src/main/java/com/haru/api/domain/meeting/service/MeetingQueryServiceImpl.java +++ b/src/main/java/com/haru/api/domain/meeting/service/MeetingQueryServiceImpl.java @@ -6,6 +6,7 @@ import com.haru.api.domain.meeting.entity.Meeting; import com.haru.api.domain.meeting.repository.MeetingRepository; import com.haru.api.domain.user.entity.User; +import com.haru.api.domain.workspace.entity.Workspace; import com.haru.api.global.annotation.TrackLastOpened; import com.haru.api.global.apiPayload.code.status.ErrorStatus; import com.haru.api.global.apiPayload.exception.handler.MeetingHandler; @@ -29,9 +30,9 @@ public class MeetingQueryServiceImpl implements MeetingQueryService{ private final SpeechSegmentRepository speechSegmentRepository; @Override - public List getMeetings(User user, Meeting meeting) { + public List getMeetings(User user, Workspace workspace) { - List foundMeetings = meetingRepository.findByWorkspaceOrderByUpdatedAtDesc(meeting.getWorkspace()); + List foundMeetings = meetingRepository.findByWorkspaceOrderByUpdatedAtDesc(workspace); return foundMeetings.stream() .map(eachMeeting -> MeetingConverter.toGetMeetingResponse(eachMeeting, user.getId()))