Merge pull request #45 from AI-Tutor-2024/develop

EunbeenDev · web-flow · commit 2c33c7095268 · 2025-06-25T17:11:14.000+09:00
[DEPLOY]
diff --git a/src/main/java/com/example/ai_tutor/domain/folder/application/FolderService.java b/src/main/java/com/example/ai_tutor/domain/folder/application/FolderService.java
@@ -1,10 +1,8 @@
 package com.example.ai_tutor.domain.folder.application;
 import com.example.ai_tutor.domain.folder.domain.Folder;
 import com.example.ai_tutor.domain.folder.domain.repository.FolderRepository;
+import com.example.ai_tutor.domain.folder.dto.response.*;
 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;
@@ -20,6 +18,7 @@
 
 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 @Service
 @RequiredArgsConstructor
@@ -156,10 +155,57 @@ public ResponseEntity<?> deleteFolder(UserPrincipal userPrincipal, Long folderId
                 .build();
 
         return ResponseEntity.ok(apiResponse);
+
+    }
+
+
+    public FolderAndNoteListRes getFolderAndNoteList(UserPrincipal userPrincipal) {
+        validateUser(userPrincipal);
+        Professor professor = validateProfessor(userPrincipal);
+
+        List<Folder> folders = professor.getFolders();
+        List<FolderAndNoteDetailRes> folderNoteDetailList = mapToFolderAndNoteDetailResList(folders);
+
+        return FolderAndNoteListRes.builder()
+                .folderCount(folderNoteDetailList.size())
+                .folderNoteDetailList(folderNoteDetailList)
+                .build();
     }
 
+    private List<FolderAndNoteDetailRes> mapToFolderAndNoteDetailResList(List<Folder> folders) {
+        return folders.stream()
+                .map(folder -> {
+                    List<FolderAndNoteDetailRes.NotesInFolderRes> notes = folder.getNotes().stream()
+                            .map(note -> FolderAndNoteDetailRes.NotesInFolderRes.from(
+                                    note.getNoteId(),
+                                    note.getTitle()
+                            ))
+                            .collect(Collectors.toList());
+
+                    return FolderAndNoteDetailRes.from(
+                            folder.getFolderId(),
+                            folder.getFolderName(),
+                            notes
+                    );
+                })
+                .collect(Collectors.toList());
+    }
+
+
     private User getUser(UserPrincipal userPrincipal){
         return userRepository.findById(userPrincipal.getId()).orElseThrow(()
                 -> new IllegalArgumentException("사용자를 찾을 수 없습니다."));
     }
+
+    private User validateUser(UserPrincipal userPrincipal) {
+        return userRepository.findById(userPrincipal.getId())
+                .orElseThrow(() -> new IllegalArgumentException("사용자를 찾을 수 없습니다."));
+    }
+
+    private Professor validateProfessor(UserPrincipal userPrincipal) {
+        return professorRepository.findByUser(userRepository.findById(userPrincipal.getId())
+                        .orElseThrow(() -> new IllegalArgumentException("사용자를 찾을 수 없습니다.")))
+                .orElseThrow(() -> new IllegalArgumentException("교수를 찾을 수 없습니다."));
+    }
+
 }
diff --git a/src/main/java/com/example/ai_tutor/domain/folder/dto/response/FolderAndNoteDetailRes.java b/src/main/java/com/example/ai_tutor/domain/folder/dto/response/FolderAndNoteDetailRes.java
@@ -0,0 +1,57 @@
+package com.example.ai_tutor.domain.folder.dto.response;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+@Getter
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class FolderAndNoteDetailRes {
+
+    @Schema(example = "1", description = "폴더의 id입니다.")
+    private Long folderId;
+
+    @Schema(example = "빅데이터기술특론", description = "폴더의 이름입니다.")
+    private String folderName;
+
+
+    @Schema(example = "2", description = "해당 폴더에 포함된 노트 개수입니다.")
+    private int noteCount;
+
+    @Schema(description = "노트 목록입니다.")
+    private List<NotesInFolderRes> notesInFolderRes;
+
+    public static FolderAndNoteDetailRes from(Long folderId, String folderName, List<NotesInFolderRes> notesInFolderRes) {
+        return FolderAndNoteDetailRes.builder()
+                .folderId(folderId)
+                .folderName(folderName)
+                .noteCount(notesInFolderRes != null ? notesInFolderRes.size() : 0)
+                .notesInFolderRes(notesInFolderRes)
+                .build();
+    }
+
+    @Getter
+    @Builder
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public static class NotesInFolderRes {
+
+        @Schema(example = "1", description = "노트의 id입니다.")
+        private Long noteId;
+
+        @Schema(example = "빅데이터기술특론 노트", description = "노트의 이름입니다.")
+        private String noteName;
+
+        public static NotesInFolderRes from(Long noteId, String noteName) {
+            return NotesInFolderRes.builder()
+                    .noteId(noteId)
+                    .noteName(noteName)
+                    .build();
+        }
+    }
+}
diff --git a/src/main/java/com/example/ai_tutor/domain/folder/dto/response/FolderAndNoteListRes.java b/src/main/java/com/example/ai_tutor/domain/folder/dto/response/FolderAndNoteListRes.java
@@ -0,0 +1,24 @@
+package com.example.ai_tutor.domain.folder.dto.response;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Getter
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class FolderAndNoteListRes {
+    @Schema(type = "Long", example = "3", description = "폴더의 개수입니다.")
+    private int folderCount;
+
+    @Schema(type = "List", description = "폴더 목록입니다.")
+    private List<FolderAndNoteDetailRes> folderNoteDetailList;
+
+}
+
+
diff --git a/src/main/java/com/example/ai_tutor/domain/folder/presentation/FolderController.java b/src/main/java/com/example/ai_tutor/domain/folder/presentation/FolderController.java
@@ -1,11 +1,11 @@
 package com.example.ai_tutor.domain.folder.presentation;
 
 import com.example.ai_tutor.domain.folder.application.FolderService;
+import com.example.ai_tutor.domain.folder.dto.response.FolderAndNoteListRes;
 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.note.dto.response.FolderInfoRes;
-import com.example.ai_tutor.global.config.security.token.CurrentUser;
 import com.example.ai_tutor.global.config.security.token.UserPrincipal;
 import com.example.ai_tutor.global.payload.ErrorResponse;
 import com.example.ai_tutor.global.payload.Message;
@@ -19,6 +19,7 @@
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -111,4 +112,29 @@ public ResponseEntity<?> deleteFolder(
         return folderService.deleteFolder(userPrincipal, folderId);
     }
 
+    // 폴더-노트 구조 조회
+    @PreAuthorize("isAuthenticated()")
+    @Operation(summary = "폴더-노트 구조 조회 API",
+            security = { @SecurityRequirement(name = "BearerAuth") },
+            description = "폴더와 그 안에 있는 노트들의 구조를 조회하는 API입니다.")
+    @ApiResponses(value = {
+            @ApiResponse(responseCode = "200", description = "폴더-노트 구조 조회 성공", content = { @Content(mediaType = "application/json", schema = @Schema(implementation = FolderAndNoteListRes.class) ) } ),
+            @ApiResponse(responseCode = "400", description = "폴더-노트 구조 조회 실패", content = { @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorResponse.class) ) } ),
+    })
+    @GetMapping("/notes")
+    public ResponseEntity<com.example.ai_tutor.global.payload.ApiResponse> getFolderAndNoteList(
+            @Parameter(description = "Access Token을 입력해주세요.", required = true) @AuthenticationPrincipal UserPrincipal userPrincipal
+    ) {
+        FolderAndNoteListRes result =  folderService.getFolderAndNoteList(userPrincipal);
+
+        com.example.ai_tutor.global.payload.ApiResponse<Object> apiResponse = com.example.ai_tutor.global.payload.ApiResponse.builder()
+                .check(true)
+                .information(result)
+                .build();
+
+        return ResponseEntity.ok(apiResponse);
+
+    }
+
+
 }
