[#36]스터디 페이지 리펙토링

src/main/java/com/esquad/esquadbe/qnaboard/service/QuestionService.java

@@ -11,8 +11,8 @@
 import com.esquad.esquadbe.studypage.entity.Book;
 import com.esquad.esquadbe.studypage.repository.BookRepository;
 import com.esquad.esquadbe.team.entity.TeamSpace;
-import com.esquad.esquadbe.team.entity.repository.TeamSpaceRepository;
 import com.esquad.esquadbe.team.exception.TeamNotFoundException;
+import com.esquad.esquadbe.team.repository.TeamRepository;
 import com.esquad.esquadbe.user.entity.User;
 import com.esquad.esquadbe.user.exception.UserNotFoundException;
 import com.esquad.esquadbe.user.exception.UserUsernameException;
@@ -36,7 +36,7 @@ public class QuestionService {
     private final UserRepository userRepository;
     private final QuestionRepository questionRepository;
     private final BookRepository bookRepository;
-    private final TeamSpaceRepository teamSpaceRepository;
+    private final TeamRepository teamRepository;
     private final S3FileService s3FileService;
 
     private User getUser(String username) {
@@ -50,7 +50,7 @@ private Book getBook(Long bookId) {
     }
 
     private TeamSpace getTeamspace(Long teamSpaceId) {
-        return teamSpaceRepository.findById(teamSpaceId)
+        return teamRepository.findById(teamSpaceId)
                 .orElseThrow(TeamNotFoundException::new);
     }
 

src/main/java/com/esquad/esquadbe/studypage/controller/BookController.java

@@ -19,10 +19,8 @@ public class BookController {
 
     @GetMapping("/search")
     public ResponseEntity<List<BookSearchResultItemDto>> searchTitle(@RequestParam("query") String query) {
-        log.info("받은 입력 값: {}", query);
 
         List<BookSearchResultItemDto> bookList = bookService.resultList(query);
-
         return ResponseEntity.status(200).body(bookList);
     }
 }

src/main/java/com/esquad/esquadbe/studypage/controller/StudyPageController.java

@@ -8,7 +8,7 @@
 import com.esquad.esquadbe.studypage.service.StudyPageService;
 import com.esquad.esquadbe.studypage.service.StudyPageUserService;
 import com.esquad.esquadbe.studypage.service.StudyRemindService;
-import jakarta.persistence.EntityNotFoundException;
+import jakarta.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -19,7 +19,7 @@
 
 @Slf4j
 @RestController
-@RequestMapping("/api/{teamId}/study-pages")
+@RequestMapping("/api")
 public class StudyPageController {
 
     private final BookService bookService;
@@ -35,100 +35,50 @@ public StudyPageController(BookService bookService, StudyPageService studyPageSe
         this.studyPageUserService = studyPageUserService;
     }
 
-    // Create
-    @PostMapping("/")
-    public ResponseEntity<String> createStudyPage(
+    @PostMapping("/{teamId}/study-pages")
+    public ResponseEntity<Long> createStudyPage(
             @PathVariable("teamId") Long teamId,
-            @RequestBody StudyPageCreateDto dto) {
-
-        log.info("Creating a new study page for teamId: {}", teamId);
-
+            @RequestBody @Valid StudyPageCreateDto dto) {
         Long bookId = bookService.createBookInfo(dto.getBookDto());
         Long studyPageId = studyPageService.createStudyPage(teamId, bookId, dto.getStudyInfoDto());
 
         studyRemindService.createRemind(studyPageId, dto.getReminds());
-        studyPageUserService.createStudyPageUser(studyPageId, dto.getUserIds());
+        studyPageUserService.createStudyPageUser(teamId, studyPageId, dto.getUserIds());
 
-        return ResponseEntity.status(HttpStatus.CREATED).body("Study page created successfully.");
+        return ResponseEntity.status(HttpStatus.CREATED).body(studyPageId);
     }
 
-    // Read List
-    @GetMapping("/")
+    @GetMapping("/{teamId}/study-pages")
     public ResponseEntity<List<StudyPageReadDto>> getStudyPages(@PathVariable("teamId") Long teamId) {
-        log.info("Fetching study pages for teamId: {}", teamId);
+
         List<StudyPageReadDto> studyPages = studyPageService.readStudyPages(teamId);
-        return ResponseEntity.status(HttpStatus.OK).body(studyPages);
+        return ResponseEntity.ok(studyPages);
     }
 
-    @GetMapping("/{studyId}")
+    @GetMapping("/{teamId}/study-pages/{studyId}")
     public ResponseEntity<StudyInfoDto> getStudyPageInfo(
             @PathVariable("teamId") Long teamId,
             @PathVariable("studyId") Long studyId) {
-        log.info("Fetching study page info: teamId = {}, studyId = {}", teamId, studyId);
-
-        try {
-            StudyInfoDto studyInfoDto= studyPageService.readStudyPageInfo(studyId);
-            return ResponseEntity.ok(studyInfoDto);
-
-        } catch (EntityNotFoundException ex) {
-            log.error("Study page not found: studyId = {}, teamId = {}", studyId, teamId, ex);
-            return ResponseEntity.status(HttpStatus.NOT_FOUND)
-                    .body(null);
-
-        } catch (IllegalArgumentException ex) {
-            log.error("Invalid argument provided for teamId = {} or studyId = {}", teamId, studyId, ex);
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST)
-                    .body(null);
-
-        } catch (Exception ex) {
-            log.error("Unexpected error while fetching study page: studyId = {}, teamId = {}", studyId, teamId, ex);
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-                    .body(null);
-        }
+
+        StudyInfoDto studyInfoDto = studyPageService.readStudyPageInfo(studyId);
+        return ResponseEntity.ok(studyInfoDto);
     }
 
-    // Update
-    @PostMapping("/{studyId}")
-    public ResponseEntity<String> updateStudyPage(
+    @PostMapping("/{teamId}/study-pages/{studyId}")
+    public ResponseEntity<Long> updateStudyPage(
             @PathVariable("teamId") Long teamId,
             @PathVariable("studyId") Long studyId,
-            @RequestBody UpdateStudyPageRequestDto request) {
-
-        log.info("Updating study page with studyId: {}", studyId);
+            @RequestBody @Valid UpdateStudyPageRequestDto request) {
 
-        boolean isUpdated = studyPageService.updateStudyPage(studyId, request);
-
-        if (isUpdated) {
-            return ResponseEntity.status(HttpStatus.OK).body("Study page updated successfully.");
-        } else {
-            return ResponseEntity.status(HttpStatus.FORBIDDEN).body("You don't have authorization to update this study page.");
-        }
+        return ResponseEntity.ok(studyPageService.updateStudyPage(studyId, request));
     }
 
-    // Delete
-    @DeleteMapping("/{studyId}")
+    @DeleteMapping("/{teamId}/study-pages/{studyId}")
     public ResponseEntity<String> deleteStudyPage(
             @PathVariable("studyId") Long studyId,
             @RequestParam("name") String studyPageName) {
 
-        log.info("Attempting to delete study page with ID: {} and name: {}", studyId, studyPageName);
-
-        try {
-            log.info("Successfully deleted study page with ID: {}", studyId);
-            studyPageService.deleteStudyPage(studyId, studyPageName);
-            return ResponseEntity.status(HttpStatus.OK).body("Study page deleted successfully.");
-
-        } catch (EntityNotFoundException e) {
-            log.warn("Study page not found: {}", e.getMessage());
-            return ResponseEntity.status(HttpStatus.NOT_FOUND).body(e.getMessage());
-
-        } catch (IllegalArgumentException e) {
-            log.error("Invalid argument: {}", e.getMessage());
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(e.getMessage());
-
-        } catch (Exception e) {
-            log.error("Error occurred while deleting study page: {}", e.getMessage());
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("An error occurred while deleting the study page.");
-        }
+        studyPageService.deleteStudyPage(studyId, studyPageName);
+        return ResponseEntity.ok("Study page deleted successfully.");
     }
 }

src/main/java/com/esquad/esquadbe/studypage/dto/BookSearchResultItemDto.java

@@ -1,5 +1,7 @@
 package com.esquad.esquadbe.studypage.dto;
 
+import com.esquad.esquadbe.studypage.entity.Book;
+import jakarta.validation.constraints.*;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -10,13 +12,35 @@
 @AllArgsConstructor
 @Getter
 public class BookSearchResultItemDto {
+    @NotNull
     private String title;
+    @NotNull
     private String link;
+    @NotNull
     private String image;
+    @NotNull
     private String author;
+    @NotNull
     private String discount;
+    @NotNull
     private String publisher;
+    @NotNull
     private String isbn;
+    @NotNull
     private String description;
+    @NotNull
     private String pubdate;
-};
+
+    public Book to() {
+
+        return Book.builder()
+                .title(title)
+                .imgPath(image)
+                .author(author)
+                .publisher(publisher)
+                .isbn(isbn)
+                .description(description)
+                .pubDate(pubdate)
+                .build();
+    }
+}

src/main/java/com/esquad/esquadbe/studypage/dto/BookSearchResultListDto.java

@@ -1,5 +1,6 @@
 package com.esquad.esquadbe.studypage.dto;
 
+import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -12,9 +13,14 @@
 @AllArgsConstructor
 @Getter
 public class BookSearchResultListDto {
+    @NotNull
     private String lastBuildDate;
+    @NotNull
     private int total;
+    @NotNull
     private int start;
+    @NotNull
     private int display;
+    @NotNull
     private List<BookSearchResultItemDto> items;
 }

src/main/java/com/esquad/esquadbe/studypage/dto/StudyInfoDto.java

@@ -1,21 +1,47 @@
 package com.esquad.esquadbe.studypage.dto;
 
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
+import com.esquad.esquadbe.studypage.entity.Book;
+import com.esquad.esquadbe.studypage.entity.StudyPage;
+import com.esquad.esquadbe.team.entity.TeamSpace;
+import jakarta.validation.constraints.NotNull;
+import lombok.*;
 
 import java.time.LocalDate;
-import java.util.ArrayList;
-import java.util.List;
-
 @ToString
 @NoArgsConstructor
 @AllArgsConstructor
 @Getter
+@Builder
 public class StudyInfoDto {
+    @NotNull
     private String studyPageName;
+    @NotNull
     private LocalDate startDate;
+    @NotNull
     private LocalDate endDate;
+    @NotNull
     private String description;
+
+    //create
+    public StudyPage from(TeamSpace teamSpace, Book book) {
+        return StudyPage.builder()
+                .teamSpace(teamSpace)
+                .book(book)
+                .studyPageName(studyPageName)
+                .startDate(startDate)
+                .endDate(endDate)
+                .description(description)
+                .build();
+    }
+
+    //update
+    public static StudyInfoDto to(StudyPage studyPage) {
+        return StudyInfoDto.builder()
+                .studyPageName(studyPage.getStudyPageName())
+                .startDate(studyPage.getStartDate())
+                .endDate(studyPage.getEndDate())
+                .description(studyPage.getDescription())
+                .build();
+    }
+
 }

src/main/java/com/esquad/esquadbe/studypage/dto/StudyPageCreateDto.java

@@ -1,5 +1,7 @@
 package com.esquad.esquadbe.studypage.dto;
 
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -12,9 +14,13 @@
 @AllArgsConstructor
 @Getter
 public class StudyPageCreateDto {
+
     private BookSearchResultItemDto bookDto;
+
     private StudyInfoDto studyInfoDto;
+    @NotNull
     private List<StudyRemindDto> reminds;
+
     private List<Long> userIds;
 }
 

src/main/java/com/esquad/esquadbe/studypage/dto/StudyPageReadDto.java

@@ -1,16 +1,26 @@
 package com.esquad.esquadbe.studypage.dto;
 
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
+import com.esquad.esquadbe.studypage.entity.StudyPage;
+import jakarta.validation.constraints.NotBlank;
+import lombok.*;
 
 @ToString
 @NoArgsConstructor
 @AllArgsConstructor
 @Getter
+@Builder
 public class StudyPageReadDto {
+        @NotBlank
         private Long id;
         private String image;
+        @NotBlank
         private String title;
+
+        public StudyPageReadDto from(StudyPage studyPage) {
+                return StudyPageReadDto.builder()
+                        .id(studyPage.getId())
+                        .image(studyPage.getBook().getImgPath())
+                        .title(studyPage.getStudyPageName())
+                        .build();
+        }
 }

src/main/java/com/esquad/esquadbe/studypage/dto/StudyRemindDto.java

@@ -1,6 +1,9 @@
 package com.esquad.esquadbe.studypage.dto;
 
 import com.esquad.esquadbe.notification.entity.AlertDayType;
+import com.esquad.esquadbe.studypage.entity.StudyPage;
+import com.esquad.esquadbe.studypage.entity.StudyRemind;
+import jakarta.validation.constraints.NotBlank;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -13,7 +16,18 @@
 @AllArgsConstructor
 @Getter
 public class StudyRemindDto {
+    @NotBlank
     private AlertDayType dayType;
+    @NotBlank
     private LocalTime timeAt;
     private String description;
+
+    public StudyRemind from (StudyPage studyPage) {
+        return StudyRemind.builder()
+                .studyPage(studyPage)
+                .dayType(dayType)
+                .timeAt(timeAt)
+                .description(description)
+                .build();
+    }
 }