deploy 3.11

src/main/java/com/haru/api/domain/lastOpened/converter/UserDocumentLastOpenedConverter.java

@@ -1,44 +1,22 @@
 package com.haru.api.domain.lastOpened.converter;
 
+import com.haru.api.domain.lastOpened.entity.Documentable;
 import com.haru.api.domain.lastOpened.entity.UserDocumentId;
 import com.haru.api.domain.lastOpened.entity.UserDocumentLastOpened;
-import com.haru.api.domain.lastOpened.entity.enums.DocumentType;
-import com.haru.api.domain.meeting.entity.Meeting;
-import com.haru.api.domain.moodTracker.entity.MoodTracker;
-import com.haru.api.domain.snsEvent.entity.SnsEvent;
 import com.haru.api.domain.user.entity.User;
 
 public class UserDocumentLastOpenedConverter {
-    public static UserDocumentLastOpened toUserDocumentLastOpened(Meeting meeting, User user) {
+    public static UserDocumentLastOpened toUserDocumentLastOpened(Documentable document, User user) {
 
-        UserDocumentId userDocumentId = new UserDocumentId(user.getId(), meeting.getId(), DocumentType.AI_MEETING_MANAGER);
-
-        return UserDocumentLastOpened.builder()
-                .id(userDocumentId)
-                .user(user)
-                .lastOpened(null)
-                .build();
-    }
-
-    public static UserDocumentLastOpened toUserDocumentLastOpened(SnsEvent snsEvent, User user) {
-
-        UserDocumentId userDocumentId = new UserDocumentId(user.getId(), snsEvent.getId(), DocumentType.SNS_EVENT_ASSISTANT);
-
-        return UserDocumentLastOpened.builder()
-                .id(userDocumentId)
-                .user(user)
-                .lastOpened(null)
-                .build();
-    }
-
-    public static UserDocumentLastOpened toUserDocumentLastOpened(MoodTracker moodTracker, User user) {
-
-        UserDocumentId userDocumentId = new UserDocumentId(user.getId(), moodTracker.getId(), DocumentType.TEAM_MOOD_TRACKER);
+        UserDocumentId userDocumentId = new UserDocumentId(user.getId(), document.getId(), document.getDocumentType());
 
         return UserDocumentLastOpened.builder()
                 .id(userDocumentId)
                 .user(user)
+                .workspaceId(document.getWorkspaceId())
                 .lastOpened(null)
+                .thumbnailKeyName(document.getThumbnailKeyName())
+                .title(document.getTitle())
                 .build();
     }
 }

src/main/java/com/haru/api/domain/lastOpened/service/UserDocumentLastOpenedService.java

@@ -1,18 +1,21 @@
 package com.haru.api.domain.lastOpened.service;
 
 import com.haru.api.domain.lastOpened.entity.Documentable;
-import com.haru.api.domain.lastOpened.entity.enums.DocumentType;
+import com.haru.api.domain.lastOpened.entity.UserDocumentId;
 import com.haru.api.domain.user.entity.User;
+import com.haru.api.global.common.entity.TitleHolder;
 
 import java.util.List;
 
 public interface UserDocumentLastOpenedService {
 
-    void updateLastOpened(Long userId, DocumentType documentType, Long documentId, Long workspaceId, String title);
+    void updateLastOpened(UserDocumentId userDocumentId, Long workspaceId, String title);
 
     void createInitialRecordsForWorkspaceUsers(List<User> usersInWorkspace, Documentable document);
 
     void deleteRecordsForWorkspaceUsers(Documentable document);
 
     void updateRecordsForWorkspaceUsers(Documentable document);
+
+    void updateRecordsForWorkspaceUsers(Documentable document, TitleHolder titleHolder);
 }

src/main/java/com/haru/api/domain/lastOpened/service/UserDocumentLastOpenedServiceImpl.java

@@ -3,12 +3,12 @@
 import com.haru.api.domain.lastOpened.entity.Documentable;
 import com.haru.api.domain.lastOpened.entity.UserDocumentId;
 import com.haru.api.domain.lastOpened.entity.UserDocumentLastOpened;
-import com.haru.api.domain.lastOpened.entity.enums.DocumentType;
 import com.haru.api.domain.lastOpened.repository.UserDocumentLastOpenedRepository;
 import com.haru.api.domain.user.entity.User;
 import com.haru.api.domain.user.repository.UserRepository;
 import com.haru.api.global.apiPayload.code.status.ErrorStatus;
 import com.haru.api.global.apiPayload.exception.handler.MemberHandler;
+import com.haru.api.global.common.entity.TitleHolder;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -28,15 +28,14 @@ public class UserDocumentLastOpenedServiceImpl implements UserDocumentLastOpened
 
     @Override
     @Transactional
-    public void updateLastOpened(Long userId, DocumentType documentType, Long documentId, Long workspaceId, String title) {
-        UserDocumentId id = new UserDocumentId(userId, documentId, documentType);
+    public void updateLastOpened(UserDocumentId userDocumentId, Long workspaceId, String title) {
 
-        UserDocumentLastOpened record = userDocumentLastOpenedRepository.findById(id)
+        UserDocumentLastOpened record = userDocumentLastOpenedRepository.findById(userDocumentId)
                 .orElseGet(() -> {
-                    User foundUser = userRepository.findById(userId)
+                    User foundUser = userRepository.findById(userDocumentId.getUserId())
                             .orElseThrow(() -> new MemberHandler(ErrorStatus.MEMBER_NOT_FOUND));
                     return UserDocumentLastOpened.builder()
-                            .id(id)
+                            .id(userDocumentId)
                             .user(foundUser)
                             .workspaceId(workspaceId)
                             .title(title)
@@ -50,6 +49,7 @@ public void updateLastOpened(Long userId, DocumentType documentType, Long docume
     }
 
     @Override
+    @Transactional
     public void createInitialRecordsForWorkspaceUsers(List<User> usersInWorkspace, Documentable document) {
 
         // 저장할 엔티티 리스트 생성
@@ -86,6 +86,20 @@ public void updateRecordsForWorkspaceUsers(Documentable documentable) {
         }
     }
 
+    @Override
+    @Transactional
+    public void updateRecordsForWorkspaceUsers(Documentable documentable, TitleHolder titleHolder) {
+
+        // 해당 문서 id, 문서 타입에 해당하는 last opened 튜플 검색
+        List<UserDocumentLastOpened> recordsToUpdate = userDocumentLastOpenedRepository.findByDocumentIdAndDocumentType(documentable.getId(), documentable.getDocumentType());
+
+        if (!recordsToUpdate.isEmpty()) {
+            for (UserDocumentLastOpened record : recordsToUpdate) {
+                record.updateTitle(titleHolder.getTitle());
+            }
+        }
+    }
+
     private List<UserDocumentLastOpened> recordsToProcess(List<User> usersInWorkspace, Documentable document) {
         // 처리할 엔티티들을 담을 리스트 생성
         List<UserDocumentLastOpened> recordsToProcess = new ArrayList<>();

src/main/java/com/haru/api/domain/meeting/controller/MeetingController.java

@@ -2,13 +2,17 @@
 
 import com.haru.api.domain.meeting.dto.MeetingRequestDTO;
 import com.haru.api.domain.meeting.dto.MeetingResponseDTO;
+import com.haru.api.domain.meeting.entity.Meeting;
 import com.haru.api.domain.meeting.service.MeetingCommandService;
 import com.haru.api.domain.meeting.service.MeetingQueryService;
-import com.haru.api.domain.user.security.jwt.SecurityUtil;
+import com.haru.api.domain.user.entity.User;
+import com.haru.api.global.annotation.AuthMeeting;
+import com.haru.api.global.annotation.AuthUser;
 import com.haru.api.global.apiPayload.ApiResponse;
 import com.haru.api.global.apiPayload.code.status.ErrorStatus;
 import com.haru.api.global.apiPayload.exception.GeneralException;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Encoding;
 import lombok.RequiredArgsConstructor;
@@ -45,15 +49,16 @@ public class MeetingController {
     )
     public ApiResponse<MeetingResponseDTO.createMeetingResponse> createMeeting(
             @RequestPart("agendaFile") MultipartFile agendaFile,
-            @RequestPart("request") MeetingRequestDTO.createMeetingRequest request) {
+            @RequestPart("request") MeetingRequestDTO.createMeetingRequest request,
+            @Parameter(hidden = true) @AuthUser User user
+    ) {
 
         // file업로드가 되지 않는 경우 controller단에서 요청 처리
         if (agendaFile == null || agendaFile.isEmpty()) {
             throw new GeneralException(ErrorStatus.MEETING_AGENDAFILE_NOT_FOUND);
         }
-        Long userId = SecurityUtil.getCurrentUserId();
 
-        MeetingResponseDTO.createMeetingResponse response = meetingCommandService.createMeeting(userId, agendaFile, request);
+        MeetingResponseDTO.createMeetingResponse response = meetingCommandService.createMeeting(user, agendaFile, request);
 
         return ApiResponse.onSuccess(response);
     }
@@ -64,11 +69,12 @@ public ApiResponse<MeetingResponseDTO.createMeetingResponse> createMeeting(
     )
     @GetMapping("/workspaces/{workspaceId}")
     public ApiResponse<List<MeetingResponseDTO.getMeetingResponse>> getMeetings(
-            @PathVariable("workspaceId") String workspaceId){
-
-        Long userId = SecurityUtil.getCurrentUserId();
+            @PathVariable("workspaceId") String workspaceId,
+            @Parameter(hidden = true) @AuthUser User user,
+            @Parameter(hidden = true) @AuthMeeting Meeting meeting
+    ) {
 
-        List<MeetingResponseDTO.getMeetingResponse> response = meetingQueryService.getMeetings(userId, Long.parseLong(workspaceId));
+        List<MeetingResponseDTO.getMeetingResponse> response = meetingQueryService.getMeetings(user, meeting);
 
         return ApiResponse.onSuccess(response);
     }
@@ -79,11 +85,12 @@ public ApiResponse<List<MeetingResponseDTO.getMeetingResponse>> getMeetings(
     @PatchMapping("/{meetingId}/title")
     public ApiResponse<String> updateMeetingTitle(
             @PathVariable("meetingId")String meetingId,
-            @RequestBody MeetingRequestDTO.updateTitle request) {
-
-        Long userId = SecurityUtil.getCurrentUserId();
+            @RequestBody MeetingRequestDTO.updateTitle request,
+            @Parameter(hidden = true) @AuthUser User user,
+            @Parameter(hidden = true) @AuthMeeting Meeting meeting
+    ) {
 
-        meetingCommandService.updateMeetingTitle(userId, Long.parseLong(meetingId), request.getTitle());
+        meetingCommandService.updateMeetingTitle(user, meeting, request);
 
         return ApiResponse.onSuccess("제목수정이 완료되었습니다.");
     }
@@ -93,11 +100,12 @@ public ApiResponse<String> updateMeetingTitle(
     )
     @DeleteMapping("/{meetingId}")
     public ApiResponse<String> deleteMeeting(
-            @PathVariable("meetingId") String meetingId) {
-
-        Long userId = SecurityUtil.getCurrentUserId();
+            @PathVariable("meetingId") String meetingId,
+            @Parameter(hidden = true) @AuthUser User user,
+            @Parameter(hidden = true) @AuthMeeting Meeting meeting
+    ) {
 
-        meetingCommandService.deleteMeeting(userId, Long.parseLong(meetingId));
+        meetingCommandService.deleteMeeting(user, meeting);
 
         return ApiResponse.onSuccess("회의가 삭제되었습니다.");
     }
@@ -107,12 +115,15 @@ public ApiResponse<String> deleteMeeting(
     )
     @GetMapping("/{meetingId}/ai-proceeding")
     public ApiResponse<MeetingResponseDTO.getMeetingProceeding> getMeetingProceeding(
-        @PathVariable("meetingId")String meetingId) {
+        @PathVariable("meetingId")String meetingId,
+        @Parameter(hidden = true) @AuthUser User user,
+        @Parameter(hidden = true) @AuthMeeting Meeting meeting
+    ) {
 
-        Long userId = SecurityUtil.getCurrentUserId();
-        MeetingResponseDTO.getMeetingProceeding response = meetingQueryService.getMeetingProceeding(userId, Long.parseLong(meetingId));
+        MeetingResponseDTO.getMeetingProceeding response = meetingQueryService.getMeetingProceeding(user, meeting);
 
         return ApiResponse.onSuccess(response);
+
     }
 
 
@@ -122,13 +133,15 @@ public ApiResponse<MeetingResponseDTO.getMeetingProceeding> getMeetingProceeding
     @PatchMapping("/{meetingId}")
     public ApiResponse<String> adjustProceeding(
             @PathVariable("meetingId") String meetingId,
-            @RequestBody MeetingRequestDTO.meetingProceedingRequest request) {
-
-        Long userId = SecurityUtil.getCurrentUserId();
+            @RequestBody MeetingRequestDTO.meetingProceedingRequest request,
+            @Parameter(hidden = true) @AuthUser User user,
+            @Parameter(hidden = true) @AuthMeeting Meeting meeting
+    ) {
 
-        meetingCommandService.adjustProceeding(userId, Long.parseLong(meetingId), request);
+        meetingCommandService.adjustProceeding(user, meeting, request);
 
         return ApiResponse.onSuccess("회의가 수정되었습니다.");
+
     }
 
     @Operation(summary = "회의 종료", description =
@@ -137,13 +150,15 @@ public ApiResponse<String> adjustProceeding(
     )
     @PostMapping("/{meetingId}/end")
     public ApiResponse<String> endMeeting(
-            @PathVariable("meetindId") String meetingId
+            @PathVariable("meetingId") String meetingId,
+            @Parameter(hidden = true) @AuthUser User user,
+            @Parameter(hidden = true) @AuthMeeting Meeting meeting
     ) {
-        Long userId = SecurityUtil.getCurrentUserId();
 
-        meetingCommandService.endMeeting(userId, Long.parseLong(meetingId));
+        meetingCommandService.endMeeting(user, meeting);
 
         return ApiResponse.onSuccess("회의가 종료되었습니다");
+
     }
 
     @Operation(summary = "회의록 다운로드", description =
@@ -152,13 +167,15 @@ public ApiResponse<String> endMeeting(
     )
     @GetMapping("{meetingId}/ai-proceeding/download")
     public ApiResponse<MeetingResponseDTO.proceedingDownLoadLinkResponse> downloadMeeting(
-            @PathVariable("meetingId") String meetingId
+            @PathVariable("meetingId") String meetingId,
+            @Parameter(hidden = true) @AuthUser User user,
+            @Parameter(hidden = true) @AuthMeeting Meeting meeting
     ){
-        Long userId = SecurityUtil.getCurrentUserId();
 
-        MeetingResponseDTO.proceedingDownLoadLinkResponse response = meetingQueryService.downloadMeeting(userId, Long.parseLong(meetingId));
+        MeetingResponseDTO.proceedingDownLoadLinkResponse response = meetingQueryService.downloadMeeting(user, meeting);
 
         return ApiResponse.onSuccess(response);
+
     }
 
 
@@ -168,15 +185,16 @@ public ApiResponse<MeetingResponseDTO.proceedingDownLoadLinkResponse> downloadMe
     )
     @GetMapping("/{meetingId}/transcript")
     public ApiResponse<MeetingResponseDTO.TranscriptResponse> getMeetingTranscript(
-            @PathVariable("meetingId") String meetingId
+            @PathVariable("meetingId") String meetingId,
+            @Parameter(hidden = true) @AuthUser User user,
+            @Parameter(hidden = true) @AuthMeeting Meeting meeting
     ) {
-        Long userId = SecurityUtil.getCurrentUserId();
 
-        MeetingResponseDTO.TranscriptResponse transcriptResponse = meetingQueryService.getTranscript(userId, Long.parseLong(meetingId));
+        MeetingResponseDTO.TranscriptResponse transcriptResponse = meetingQueryService.getTranscript(user, meeting);
 
         return ApiResponse.onSuccess(transcriptResponse);
-    }
 
+    }
 
 
     @Operation(summary = "회의록 음성파일 조회API", description =
@@ -185,12 +203,14 @@ public ApiResponse<MeetingResponseDTO.TranscriptResponse> getMeetingTranscript(
     )
     @GetMapping("{meetingId}/ai-proceeding/voice")
     public ApiResponse<MeetingResponseDTO.proceedingVoiceLinkResponse> MeetingvoiceFile(
-            @PathVariable("meetingId") String meetingId
+            @PathVariable("meetingId") String meetingId,
+            @Parameter(hidden = true) @AuthUser User user,
+            @Parameter(hidden = true) @AuthMeeting Meeting meeting
     ){
-        Long userId = SecurityUtil.getCurrentUserId();
 
-        MeetingResponseDTO.proceedingVoiceLinkResponse response = meetingQueryService.MeetingVoiceFile(userId, Long.parseLong(meetingId));
+        MeetingResponseDTO.proceedingVoiceLinkResponse response = meetingQueryService.getMeetingVoiceFile(user, meeting);
 
         return ApiResponse.onSuccess(response);
+
     }
 }

src/main/java/com/haru/api/domain/meeting/dto/MeetingRequestDTO.java

@@ -1,6 +1,7 @@
 package com.haru.api.domain.meeting.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.haru.api.global.common.entity.TitleHolder;
 import com.haru.api.global.util.json.ToLongDeserializer;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
@@ -21,7 +22,7 @@ public static class createMeetingRequest{
         private String title;
     }
     @Getter
-    public static class updateTitle {
+    public static class updateTitle implements TitleHolder {
         private String title;
     }
 

src/main/java/com/haru/api/domain/meeting/entity/Meeting.java

@@ -36,7 +36,7 @@ public class Meeting extends BaseEntity implements Documentable {
     @Column(columnDefinition="TEXT")
     private String proceeding;
 
-    @ManyToOne(fetch = FetchType.LAZY)
+    @ManyToOne(fetch = FetchType.EAGER)
     @JoinColumn(name = "user_id")
     private User creator;
 
@@ -49,7 +49,7 @@ public class Meeting extends BaseEntity implements Documentable {
     private String proceedingKeyName;
 
     @Column(columnDefinition = "TEXT")
-    private String thumbnailKey;
+    private String thumbnailKeyName;
 
     @OneToMany(mappedBy = "meeting", cascade = CascadeType.ALL, orphanRemoval = true)
     private List<MeetingKeyword> meetingKeywords = new ArrayList<>();
@@ -61,9 +61,6 @@ public class Meeting extends BaseEntity implements Documentable {
     @Setter
     private String audioFileKey;
 
-    @Column(columnDefinition = "TEXT")
-    private String thumbnailKeyName;
-
     private Meeting(String title, String agendaResult, User user, Workspace workspace) {
         this.title = title;
         this.agendaResult = agendaResult;
@@ -80,8 +77,8 @@ public void updateTitle(String title) {
     public void updateProceeding(String proceeding) {
         this.proceeding = proceeding;
     }
-    public void initProceedingKeyName(String proceedingKeyName) {this.proceedingKeyName = proceedingKeyName;}
-    public void initThumbnailKey(String thumbnailKey) {this.thumbnailKey = thumbnailKey;}
+    public void initProceedingKeyName(String proceedingKeyName) { this.proceedingKeyName = proceedingKeyName; }
+    public void initThumbnailKeyName(String thumbnailKeyName) { this.thumbnailKeyName = thumbnailKeyName; }
     public void initStartTime(LocalDateTime startTime) {
         this.startTime = startTime;
     }