Merge pull request #23 from AI-Tutor-2024/note

[FIX] folder, note 관련 응답 오류 수정

Author: hyunbin1

src/main/java/com/example/ai_tutor/domain/folder/application/FolderService.java

@@ -4,6 +4,7 @@
 import com.example.ai_tutor.domain.folder.dto.request.FolderCreateReq;
 import com.example.ai_tutor.domain.folder.dto.response.FolderListRes;
 import com.example.ai_tutor.domain.folder.dto.response.FolderNameListRes;
+import com.example.ai_tutor.domain.folder.dto.response.FolderResponse;
 import com.example.ai_tutor.domain.note.dto.response.FolderInfoRes;
 import com.example.ai_tutor.domain.professor.domain.Professor;
 import com.example.ai_tutor.domain.professor.domain.repository.ProfessorRepository;
@@ -55,9 +56,9 @@ public ResponseEntity<?> createNewFolder( UserPrincipal userPrincipal, FolderCre
 
         folderRepository.save(folder);
 
-        ApiResponse apiResponse = ApiResponse.builder()
+        ApiResponse<Object> apiResponse = ApiResponse.builder()
                 .check(true)
-                .information("폴더 생성 성공")
+                .information(FolderResponse.from(folder))
                 .build();
 
         return ResponseEntity.ok(apiResponse);

src/main/java/com/example/ai_tutor/domain/folder/dto/response/FolderResponse.java

@@ -0,0 +1,21 @@
+package com.example.ai_tutor.domain.folder.dto.response;
+
+import com.example.ai_tutor.domain.folder.domain.Folder;
+import lombok.Builder;
+import lombok.Data;
+
+@Builder
+@Data
+public class FolderResponse {
+    private Long id;
+    private String folderName;
+    private String professorName;
+
+    public static FolderResponse from(Folder folder) {
+        return FolderResponse.builder()
+                .id(folder.getFolderId())
+                .folderName(folder.getFolderName())
+                .professorName(folder.getProfessorName()) // or folder.getProfessor().getProfessorName()
+                .build();
+    }
+}

src/main/java/com/example/ai_tutor/domain/folder/presentation/FolderController.java

@@ -24,7 +24,7 @@
 
 @RestController
 @RequiredArgsConstructor
-@RequestMapping("/api/v1/folder")
+@RequestMapping("/api/v1/folders")
 @Tag(name = "Folder", description = "폴더 관련 API입니다.")
 public class FolderController {
 

src/main/java/com/example/ai_tutor/domain/note/application/ProfessorNoteService.java

@@ -67,9 +67,9 @@ public ResponseEntity<?> createNewNote(UserPrincipal userPrincipal, Long folderI
                 .build();
 
         ApiResponse apiResponse = ApiResponse.builder()
-                     .check(true)
-                     .information(noteAccessRes)
-                     .build();
+                .check(true)
+                .information(noteAccessRes)
+                .build();
 
         return ResponseEntity.ok(apiResponse);
     }
@@ -312,8 +312,32 @@ public ResponseEntity<?> getNoteResult(UserPrincipal userPrincipal, Long noteId)
 
     }
 
+    // ProfessorNoteService.java
+    public ResponseEntity<?> getNote(UserPrincipal userPrincipal, Long noteId) {
+        User user = getUser(userPrincipal);
+        Note note = noteRepository.findById(noteId)
+                .orElseThrow(() -> new IllegalArgumentException("노트를 찾을 수 없습니다."));
+
+        // 접근 권한 체크
+        Folder folder = note.getFolder();
+        DefaultAssert.isTrue(folder.getProfessor().getUser().equals(user), "접근 권한이 없습니다.");
+
+        // DTO로 변환 (예시)
+        NoteDetailRes noteDetailRes = NoteDetailRes.from(note);
+
+        ApiResponse<Object> apiResponse = ApiResponse.builder()
+                .check(true)
+                .information(noteDetailRes)
+                .build();
+
+        return ResponseEntity.ok(apiResponse);
+    }
+
+
+
     private User getUser(UserPrincipal userPrincipal){
-        return userRepository.findById(1L).orElseThrow(()
+        String email = userPrincipal.getEmail();
+        return userRepository.findByEmail(email).orElseThrow(()
                 -> new IllegalArgumentException("사용자를 찾을 수 없습니다."));
     }
-}
+}

src/main/java/com/example/ai_tutor/domain/note/dto/response/NoteDetailRes.java

@@ -0,0 +1,30 @@
+package com.example.ai_tutor.domain.note.dto.response;
+
+import com.example.ai_tutor.domain.note.domain.Note;
+import com.example.ai_tutor.domain.summary.domain.Summary;
+import lombok.Builder;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+// NoteDetailRes.java
+@Builder
+@Data
+public class NoteDetailRes {
+    private Long noteId;
+    private String title;
+    private Summary summary;
+    private LocalDateTime createdAt;
+    private String sttText;
+    private String code;
+
+    public static NoteDetailRes from(Note note) {
+        return NoteDetailRes.builder()
+                .noteId(note.getNoteId())
+                .title(note.getTitle())
+                .summary(note.getSummary()) // null 가능성 있다면 조건 처리 가능
+                .createdAt(note.getCreatedAt())
+                .sttText(note.getSttText())
+                .code(note.getCode())
+                .build();
+    }
+}

src/main/java/com/example/ai_tutor/global/payload/ApiResponse.java

@@ -5,20 +5,19 @@
 import lombok.Data;
 
 @Data
-public class ApiResponse {
+public class ApiResponse<T> {
 
-    @Schema( type = "boolean", example = "true", description="올바르게 로직을 처리했으면 True, 아니면 False를 반환합니다.")
+    @Schema(type = "boolean", example = "true", description = "올바르게 로직을 처리했으면 true, 아니면 false를 반환합니다.")
     private boolean check;
 
-    @Schema( type = "object", example = "information", description="restful의 정보를 감싸 표현합니다. object형식으로 표현합니다.")
-    private Object information;
+    @Schema(description = "응답 데이터를 감싸는 객체입니다. 실제 응답 내용이 여기에 포함됩니다.")
+    private T information;
 
-    public ApiResponse(){};
+    public ApiResponse() {}
 
     @Builder
-    public ApiResponse(boolean check, Object information) {
+    public ApiResponse(boolean check, T information) {
         this.check = check;
         this.information = information;
     }
-
 }