refactor: 노트 API에서 유저레슨 조회 시 파라미터 semester->attendedSemester로 변경 (#95) (

#96) (#97)
UMC-5th-Notation · Feb 15, 2024 · e1e88cf · e1e88cf
1 parent 5684966
commit e1e88cf
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 23 deletions.
diff --git a/src/main/java/UMC/campusNote/note/controller/NoteController.java b/src/main/java/UMC/campusNote/note/controller/NoteController.java
@@ -55,8 +55,8 @@ public ApiResponse<NoteResponseDTO.NoteGetDTO> getUserNote(@AuthenticationPrinci
             @Parameter(name = "lessonId", description = "레슨의 아이디, path variable 입니다"),
             @Parameter(name = "semester", description = "학기, query string 입니다")
     })
-    public ApiResponse<Slice<NoteResponseDTO.NoteGetDTO>> getUserNotes(@AuthenticationPrincipal User user, @PathVariable("lessonId") Long lessonId, @RequestParam("semester") String semester, Pageable pageable) {
-        return ApiResponse.of(NOTE_GET_ALL, noteService.getUserNotes(user, lessonId, semester, pageable));
+    public ApiResponse<Slice<NoteResponseDTO.NoteGetDTO>> getUserNotes(@AuthenticationPrincipal User user, @PathVariable("lessonId") Long lessonId, @RequestParam("attendedSemester") String attendedSemester, Pageable pageable) {
+        return ApiResponse.of(NOTE_GET_ALL, noteService.getUserNotes(user, lessonId, attendedSemester, pageable));
     }
 
     @PostMapping("/{lessonId}")

diff --git a/src/main/java/UMC/campusNote/note/dto/NoteRequestDTO.java b/src/main/java/UMC/campusNote/note/dto/NoteRequestDTO.java
@@ -28,9 +28,9 @@ public static class NoteGetDTO{
     @Builder
     public static class NoteCreateDTO{
 
-        @Schema(description = "현재 학기", example = "2024-1")
+        @Schema(description = "현재 학기", example = "3-1")
         @NotNull
-        String semester;
+        String attendedSemester;
 
         @Schema(description = "노트이름", example = "노트이름")
         @NotNull

diff --git a/src/main/java/UMC/campusNote/note/service/NoteService.java b/src/main/java/UMC/campusNote/note/service/NoteService.java
@@ -9,7 +9,7 @@
 public interface NoteService {
 
     NoteResponseDTO.NoteGetDTO getUserNote(User user, Long noteId);
-    Slice<NoteResponseDTO.NoteGetDTO> getUserNotes(User user, Long lessonId, String semester, Pageable pageable);
+    Slice<NoteResponseDTO.NoteGetDTO> getUserNotes(User user, Long lessonId, String attendedSemester, Pageable pageable);
     NoteResponseDTO.NoteCreateDTO createUserNote(User user, Long lessonId, NoteRequestDTO.NoteCreateDTO request);
     NoteResponseDTO.NoteUpdateDTO updateUserNote(User user, Long noteId, NoteRequestDTO.NoteUpdateDTO request);
     NoteResponseDTO.NoteDeleteDTO deleteUserNote(User user, Long noteId);

diff --git a/src/main/java/UMC/campusNote/note/service/NoteServiceImpl.java b/src/main/java/UMC/campusNote/note/service/NoteServiceImpl.java
@@ -45,8 +45,8 @@ public NoteResponseDTO.NoteGetDTO getUserNote(User user, Long noteId) {
     }
 
     @Override
-    public Slice<NoteResponseDTO.NoteGetDTO> getUserNotes(User user, Long lessonId, String semester, Pageable pageable) {
-        UserLesson userLesson = getUserLesson(user, lessonId, semester);
+    public Slice<NoteResponseDTO.NoteGetDTO> getUserNotes(User user, Long lessonId, String attendedSemester, Pageable pageable) {
+        UserLesson userLesson = getUserLesson(user, lessonId, attendedSemester);
         Page<UserLessonNote> userLessonNotePage = userLessonNoteRepository.findByUserLessonId(userLesson.getId(), pageable);
         List<NoteResponseDTO.NoteGetDTO> noteGetDTOS = userLessonNotePage.getContent().stream().map(NoteConverter::toNoteGetDTO).toList();
         return new SliceImpl<>(noteGetDTOS, pageable, userLessonNotePage.hasNext());
@@ -55,7 +55,7 @@ public Slice<NoteResponseDTO.NoteGetDTO> getUserNotes(User user, Long lessonId,
     @Override
     @Transactional
     public NoteResponseDTO.NoteCreateDTO createUserNote(User user, Long lessonId, NoteRequestDTO.NoteCreateDTO request) {
-        return NoteConverter.toNoteCreateDTO(createNote(request.getNoteName(), getUserLesson(user, lessonId, request.getSemester())));
+        return NoteConverter.toNoteCreateDTO(createNote(request.getNoteName(), getUserLesson(user, lessonId, request.getAttendedSemester())));
     }
 
     @Override
@@ -75,10 +75,10 @@ public NoteResponseDTO.NoteDeleteDTO deleteUserNote(User user, Long noteId) {
     }
 
 
-    private UserLesson getUserLesson(User user, Long lessonId, String semester) {
+    private UserLesson getUserLesson(User user, Long lessonId, String attendedSemester) {
         Lesson lesson = lessonRepository.findById(lessonId).orElseThrow(
                 () -> new GeneralException(LESSON_NOT_FOUND));
-        return userLessonRepository.findByUserAndAttendedSemesterAndLesson(user, semester, lesson)
+        return userLessonRepository.findByUserAndAttendedSemesterAndLesson(user, attendedSemester, lesson)
                 .orElseThrow(() -> new GeneralException(USER_LESSON_NOT_FOUND));
     }
 

diff --git a/src/test/java/UMC/campusNote/note/service/NoteServiceImplTest.java b/src/test/java/UMC/campusNote/note/service/NoteServiceImplTest.java
@@ -60,7 +60,7 @@ void setUp() {
         UserLesson userLesson = UserLesson.builder()
                 .user(user)
                 .lesson(lesson)
-                .attendedSemester("2023년 2학기")
+                .attendedSemester("3-1")
                 .build();
 
         userRepository.save(user);
@@ -74,8 +74,8 @@ void setUp() {
     void getAllUserNote() {
         User user = userRepository.findByClientId("test").get();
         Lesson lesson = lessonRepository.findByLessonName("객체지향프로그래밍 2").get();
-        UserLesson findUsesrLesson = userLessonRepository.findByUserAndAttendedSemesterAndLesson(user, "2023년 2학기", lesson).get();
-        NoteRequestDTO.NoteCreateDTO request = new NoteRequestDTO.NoteCreateDTO("2023년 2학기", "노트제목");
+        UserLesson findUsesrLesson = userLessonRepository.findByUserAndAttendedSemesterAndLesson(user, "3-1", lesson).get();
+        NoteRequestDTO.NoteCreateDTO request = new NoteRequestDTO.NoteCreateDTO("3-1", "노트제목");
         NoteResponseDTO.NoteCreateDTO noteCreateDTO = noteService.createUserNote(user, findUsesrLesson.getId(), request);
         // when
         Note note = noteRepository.findByNoteName("노트제목").get();
@@ -90,10 +90,10 @@ void getAllUserNote() {
     void getAllUserNotes() {
         User user = userRepository.findByClientId("test").get();
         Lesson lesson = lessonRepository.findByLessonName("객체지향프로그래밍 2").get();
-        UserLesson findUsesrLesson = userLessonRepository.findByUserAndAttendedSemesterAndLesson(user, "2023년 2학기", lesson).get();
-        NoteRequestDTO.NoteCreateDTO request2 = new NoteRequestDTO.NoteCreateDTO("2023년 2학기", "노트제목");
+        UserLesson findUsesrLesson = userLessonRepository.findByUserAndAttendedSemesterAndLesson(user, "3-1", lesson).get();
+        NoteRequestDTO.NoteCreateDTO request2 = new NoteRequestDTO.NoteCreateDTO("3-1", "노트제목");
         noteService.createUserNote(user, findUsesrLesson.getId(), request2);
-        Slice<NoteResponseDTO.NoteGetDTO> userNotes = noteService.getUserNotes(user, findUsesrLesson.getId(), "2023년 2학기", Pageable.ofSize(10));
+        Slice<NoteResponseDTO.NoteGetDTO> userNotes = noteService.getUserNotes(user, findUsesrLesson.getId(), "3-1", Pageable.ofSize(10));
         // then
         assert userNotes.getContent().size() == 1;
     }
@@ -104,8 +104,8 @@ void getAllUserNotes() {
     void createUserNote() {
         User user = userRepository.findByClientId("test").get();
         Lesson lesson = lessonRepository.findByLessonName("객체지향프로그래밍 2").get();
-        UserLesson findUsesrLesson = userLessonRepository.findByUserAndAttendedSemesterAndLesson(user, "2023년 2학기", lesson).get();
-        NoteRequestDTO.NoteCreateDTO request = new NoteRequestDTO.NoteCreateDTO("2023년 2학기", "노트제목");
+        UserLesson findUsesrLesson = userLessonRepository.findByUserAndAttendedSemesterAndLesson(user, "3-1", lesson).get();
+        NoteRequestDTO.NoteCreateDTO request = new NoteRequestDTO.NoteCreateDTO("3-1", "노트제목");
 
         // when
         NoteResponseDTO.NoteCreateDTO noteCreateDTO = noteService.createUserNote(user, findUsesrLesson.getId(), request);
@@ -121,8 +121,8 @@ void createUserNote() {
     void updateNoteName() {
         User user = userRepository.findByClientId("test").get();
         Lesson lesson = lessonRepository.findByLessonName("객체지향프로그래밍 2").get();
-        UserLesson findUsesrLesson = userLessonRepository.findByUserAndAttendedSemesterAndLesson(user, "2023년 2학기", lesson).get();
-        NoteRequestDTO.NoteCreateDTO request = new NoteRequestDTO.NoteCreateDTO("2023년 2학기", "노트제목");
+        UserLesson findUsesrLesson = userLessonRepository.findByUserAndAttendedSemesterAndLesson(user, "3-1", lesson).get();
+        NoteRequestDTO.NoteCreateDTO request = new NoteRequestDTO.NoteCreateDTO("3-1", "노트제목");
         NoteResponseDTO.NoteCreateDTO noteCreateDTO = noteService.createUserNote(user, findUsesrLesson.getId(), request);
         Note note = noteRepository.findByNoteName("노트제목").get();
         // when
@@ -142,9 +142,9 @@ void updateNoteName() {
     void deleteNote() {
         User user = userRepository.findByClientId("test").get();
         Lesson lesson = lessonRepository.findByLessonName("객체지향프로그래밍 2").get();
-        UserLesson findUsesrLesson = userLessonRepository.findByUserAndAttendedSemesterAndLesson(user, "2023년 2학기", lesson).get();
-        NoteRequestDTO.NoteCreateDTO request = new NoteRequestDTO.NoteCreateDTO("2023년 2학기", "노트제목");
-        NoteResponseDTO.NoteCreateDTO noteCreateDTO = noteService.createUserNote(user, findUsesrLesson.getId(), request);
+        UserLesson findUsesrLesson = userLessonRepository.findByUserAndAttendedSemesterAndLesson(user, "3-1", lesson).get();
+        NoteRequestDTO.NoteCreateDTO request = new NoteRequestDTO.NoteCreateDTO("3-1", "노트제목");
+        noteService.createUserNote(user, findUsesrLesson.getId(), request);
         Note note = noteRepository.findByNoteName("노트제목").get();
         // when
         NoteResponseDTO.NoteDeleteDTO noteDeleteDTO = noteService.deleteUserNote(user, note.getId());