Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -71,10 +73,10 @@ public ApiResponse<MeetingResponseDTO.createMeetingResponse> createMeeting(
public ApiResponse<List<MeetingResponseDTO.getMeetingResponse>> getMeetings(
@PathVariable("workspaceId") String workspaceId,
@Parameter(hidden = true) @AuthUser User user,
@Parameter(hidden = true) @AuthMeeting Meeting meeting
@Parameter(hidden = true) @AuthWorkspace Workspace workspace
) {

List<MeetingResponseDTO.getMeetingResponse> response = meetingQueryService.getMeetings(user, meeting);
List<MeetingResponseDTO.getMeetingResponse> response = meetingQueryService.getMeetings(user, workspace);

return ApiResponse.onSuccess(response);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<MeetingResponseDTO.getMeetingResponse> getMeetings(User user, Meeting meeting);
List<MeetingResponseDTO.getMeetingResponse> getMeetings(User user, Workspace workspace);

MeetingResponseDTO.getMeetingProceeding getMeetingProceeding(User user, Meeting meeting);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -29,9 +30,9 @@ public class MeetingQueryServiceImpl implements MeetingQueryService{
private final SpeechSegmentRepository speechSegmentRepository;

@Override
public List<MeetingResponseDTO.getMeetingResponse> getMeetings(User user, Meeting meeting) {
public List<MeetingResponseDTO.getMeetingResponse> getMeetings(User user, Workspace workspace) {

List<Meeting> foundMeetings = meetingRepository.findByWorkspaceOrderByUpdatedAtDesc(meeting.getWorkspace());
List<Meeting> foundMeetings = meetingRepository.findByWorkspaceOrderByUpdatedAtDesc(workspace);

return foundMeetings.stream()
.map(eachMeeting -> MeetingConverter.toGetMeetingResponse(eachMeeting, user.getId()))
Expand Down