Merge pull request #79 from Team-Lecue/feat/#78-mypage_favorite

[FEAT] 마이페이지 즐겨찾기 조회 API 구현
Team-Lecue · Mar 19, 2024 · a2e6baf · a2e6baf
2 parents b00654c + dec663c
commit a2e6baf
Show file tree

Hide file tree

Showing 11 changed files with 175 additions and 143 deletions.
diff --git a/src/main/java/org/sopt/lequuServer/domain/book/repository/BookRepository.java b/src/main/java/org/sopt/lequuServer/domain/book/repository/BookRepository.java
@@ -1,14 +1,14 @@
 package org.sopt.lequuServer.domain.book.repository;
 
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Optional;
 import org.sopt.lequuServer.domain.book.model.Book;
 import org.sopt.lequuServer.global.exception.enums.ErrorType;
 import org.sopt.lequuServer.global.exception.model.CustomException;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
-
-import java.time.LocalDateTime;
-import java.util.List;
-import java.util.Optional;
+import org.springframework.data.repository.query.Param;
 
 public interface BookRepository extends JpaRepository<Book, Long> {
 
@@ -21,6 +21,9 @@ default Book findByIdOrThrow(Long id) {
             () -> new CustomException(ErrorType.NOT_FOUND_BOOK_ERROR));
     }
 
+    @Query("select b from Book b where b.member.id = :memberId")
+    List<Book> findByMemberId(@Param("memberId") Long id);
+
     Optional<Book> findByUuid(String uuid);
 
     default Book findByUuidOrThrow(String uuid) {

diff --git a/src/main/java/org/sopt/lequuServer/domain/favorite/repository/FavoriteRepository.java b/src/main/java/org/sopt/lequuServer/domain/favorite/repository/FavoriteRepository.java
@@ -3,14 +3,23 @@
 import org.sopt.lequuServer.domain.book.model.Book;
 import org.sopt.lequuServer.domain.favorite.model.Favorite;
 import org.sopt.lequuServer.domain.member.model.Member;
+import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;
 import java.util.Optional;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 public interface FavoriteRepository extends JpaRepository<Favorite, Long> {
     List<Favorite> findByMemberOrderByCreatedAtDesc(Member member);
 
     Optional<Favorite> findByMemberAndBook(Member member, Book book);
+
+    List<Favorite> findByMember(Member member);
+
+    @EntityGraph(attributePaths = {"book"})
+    @Query("select f from Favorite f where f.member.id = :memberId")
+    List<Favorite> findByMemberId(@Param("memberId") Long memberId);
 }
 
diff --git a/src/main/java/org/sopt/lequuServer/domain/member/controller/MemberApi.java b/src/main/java/org/sopt/lequuServer/domain/member/controller/MemberApi.java
@@ -19,6 +19,7 @@
 import org.springframework.web.bind.annotation.RequestHeader;
 
 import java.security.Principal;
+import java.util.List;
 
 @Tag(name = "Member", description = "마이페이지 & 로그인 관련 API")
 public interface MemberApi {
@@ -77,18 +78,18 @@ public ResponseEntity<ApiResponse<?>> kakaoAccessToken(
     @SecurityRequirement(name = "JWT Authorization")
     @io.swagger.v3.oas.annotations.responses.ApiResponse(
             responseCode = "200",
-            description = "마이페이지의 유저 닉네임과 내 레큐북 조회에 성공했습니다.",
+            description = "마이페이지의 내 레큐북 조회에 성공했습니다.",
             content = @Content(schema = @Schema(implementation = MypageBookResponseDto.class))
     )
     @Operation(summary = "마이페이지 레큐북 조회")
-    public ResponseEntity<ApiResponse<MypageBookResponseDto>> getMypageBook(Principal principal);
+    public ResponseEntity<ApiResponse<List<MypageBookResponseDto>>> getMypageBook(Principal principal);
 
     @SecurityRequirement(name = "JWT Authorization")
     @io.swagger.v3.oas.annotations.responses.ApiResponse(
             responseCode = "200",
-            description = "마이페이지의 유저 닉네임과 내 레큐노트 조회에 성공했습니다.",
+            description = "마이페이지의 내 레큐노트 조회에 성공했습니다.",
             content = @Content(schema = @Schema(implementation = MypageNoteResponseDto.class))
     )
     @Operation(summary = "마이페이지 레큐노트 조회")
-    public ResponseEntity<ApiResponse<MypageNoteResponseDto>> getMypageNote(Principal principal);
-}
+    public ResponseEntity<ApiResponse<List<MypageNoteResponseDto>>> getMypageNote(Principal principal);
+}
diff --git a/src/main/java/org/sopt/lequuServer/domain/member/controller/MemberController.java b/src/main/java/org/sopt/lequuServer/domain/member/controller/MemberController.java
@@ -2,12 +2,10 @@
 
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
+import org.sopt.lequuServer.domain.favorite.dto.response.FavoriteBookResponseDto;
 import org.sopt.lequuServer.domain.member.dto.request.MemberNicknameRequestDto;
 import org.sopt.lequuServer.domain.member.dto.request.SocialLoginRequestDto;
-import org.sopt.lequuServer.domain.member.dto.response.MemberLoginResponseDto;
-import org.sopt.lequuServer.domain.member.dto.response.MemberNicknameResponseDto;
-import org.sopt.lequuServer.domain.member.dto.response.MypageBookResponseDto;
-import org.sopt.lequuServer.domain.member.dto.response.MypageNoteResponseDto;
+import org.sopt.lequuServer.domain.member.dto.response.*;
 import org.sopt.lequuServer.domain.member.service.MemberService;
 import org.sopt.lequuServer.global.auth.fegin.kakao.KakaoLoginService;
 import org.sopt.lequuServer.global.auth.jwt.JwtProvider;
@@ -18,6 +16,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import java.security.Principal;
+import java.util.List;
 
 import static org.sopt.lequuServer.global.exception.enums.SuccessType.*;
 
@@ -64,12 +63,22 @@ public ResponseEntity<ApiResponse<MemberNicknameResponseDto>> setMemberNickname(
     }
 
     @GetMapping("/mypage/book")
-    public ResponseEntity<ApiResponse<MypageBookResponseDto>> getMypageBook(Principal principal) {
+    public ResponseEntity<ApiResponse<List<MypageBookResponseDto>>> getMypageBook(Principal principal) {
         return ResponseEntity.ok(ApiResponse.success(GET_MYPAGE_BOOK_SUCCESS, memberService.getMypageBook(JwtProvider.getUserFromPrincial(principal))));
     }
 
     @GetMapping("/mypage/note")
-    public ResponseEntity<ApiResponse<MypageNoteResponseDto>> getMypageNote(Principal principal) {
+    public ResponseEntity<ApiResponse<List<MypageNoteResponseDto>>> getMypageNote(Principal principal) {
         return ResponseEntity.ok(ApiResponse.success(GET_MYPAGE_NOTE_SUCCESS, memberService.getMypageNote(JwtProvider.getUserFromPrincial(principal))));
     }
+
+    @GetMapping("/mypage/favorite")
+    public ResponseEntity<ApiResponse<List<FavoriteBookResponseDto>>> getMypageFavorite(Principal principal) {
+        return ResponseEntity.ok(ApiResponse.success(GET_MYPAGE_FAVORITE_SUCCESS, memberService.getMypageFavorite(JwtProvider.getUserFromPrincial(principal))));
+    }
+
+    @GetMapping("/mypage")
+    public ResponseEntity<ApiResponse<MypageResponseDto>> getMypage(Principal principal) {
+        return ResponseEntity.ok(ApiResponse.success(GET_MYPAGE_SUCCESS, memberService.getMypage(JwtProvider.getUserFromPrincial(principal))));
+    }
 }
diff --git a/src/main/java/org/sopt/lequuServer/domain/member/dto/response/MypageBookResponseDto.java b/src/main/java/org/sopt/lequuServer/domain/member/dto/response/MypageBookResponseDto.java
@@ -1,26 +1,50 @@
 package org.sopt.lequuServer.domain.member.dto.response;
 
+import static java.util.Comparator.comparing;
+
 import io.swagger.v3.oas.annotations.media.Schema;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
 import org.sopt.lequuServer.domain.book.model.Book;
 
-import java.util.List;
+public record MypageBookResponseDto(
 
-import static java.util.Comparator.comparing;
+        @Schema(description = "레큐북 고유 id", example = "1")
+        Long bookId,
 
-public record MypageBookResponseDto(
+        @Schema(description = "레큐북 UUID", example = "ee4f66f9-9cf4-4b28-90f4-f71d0ecba021")
+        String bookUuid,
+
+        @Schema(description = "레큐북 즐겨찾기 등록 여부", example = "true")
+        Boolean isFavorite,
+
+        @Schema(description = "최애 이름", example = "LeoJ")
+        String favoriteName,
 
-        @Schema(description = "유저 닉네임", example = "레큐")
-        String memberNickname,
+        @Schema(description = "레큐북 제목", example = "1번째 레큐북")
+        String title,
 
-        List<MypageBooksResponseDto> bookList
+        @Schema(description = "레큐북 생성 일시", example = "2024.01.11")
+        String bookDate,
+
+        @Schema(description = "레큐노트 개수", example = "1974")
+        int noteNum
 ) {
-    public static MypageBookResponseDto of(String nickName, List<Book> books) {
+    public static List<MypageBookResponseDto> of(List<Book> books, List<Book> favoriteBooks) {
 
-        List<MypageBooksResponseDto> bookList = books.stream()
+        return books.stream()
                 .sorted(comparing(Book::getCreatedAt).reversed())
-                .map(MypageBooksResponseDto::of)
+                .map(book ->
+                    new MypageBookResponseDto(
+                            book.getId(),
+                            book.getUuid(),
+                            favoriteBooks.contains(book),
+                            book.getFavoriteName(),
+                            book.getTitle(),
+                            book.getCreatedAt().format(DateTimeFormatter.ofPattern("yyyy.MM.dd")),
+                            book.getNotes().size()
+                    )
+                )
                 .toList();
-
-        return new MypageBookResponseDto(nickName, bookList);
     }
-}
+}
diff --git a/src/main/java/org/sopt/lequuServer/domain/member/dto/response/MypageBooksResponseDto.java b/src/main/java/org/sopt/lequuServer/domain/member/dto/response/MypageBooksResponseDto.java
diff --git a/src/main/java/org/sopt/lequuServer/domain/member/dto/response/MypageNoteResponseDto.java b/src/main/java/org/sopt/lequuServer/domain/member/dto/response/MypageNoteResponseDto.java
@@ -3,24 +3,54 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import org.sopt.lequuServer.domain.note.model.Note;
 
+import java.time.format.DateTimeFormatter;
 import java.util.List;
 
 import static java.util.Comparator.comparing;
 
 public record MypageNoteResponseDto(
 
-        @Schema(description = "유저 닉네임", example = "레큐")
-        String memberNickname,
+        @Schema(description = "레큐북 UUID", example = "ee4f66f9-9cf4-4b28-90f4-f71d0ecba021")
+        String bookUuid,
 
-        List<MypageNotesResponseDto> noteList
+        @Schema(description = "최애 이름", example = "LeoJ")
+        String favoriteName,
+
+        @Schema(description = "레큐북 제목", example = "1번째 레큐북")
+        String title,
+
+        @Schema(description = "레큐노트 고유 id", example = "1")
+        Long noteId,
+
+        @Schema(description = "레큐노트 내용", example = "레큐노트 내용입니다.")
+        String content,
+
+        @Schema(description = "레큐노트 생성 일시", example = "2024.01.11")
+        String noteDate,
+
+        @Schema(description = "레큐노트 텍스트 컬러 번호", example = "#191919")
+        String noteTextColor,
+
+        @Schema(description = "레큐노트 배경 (#929DD9 or 이미지 URL(*.jpg))", example = "https://dzfv99wxq6tx0.cloudfront.net/notes/background_image/676c2ca3-f868-423f-8000-a0bcb67dc797.jpg")
+        String noteBackground
 ) {
-    public static MypageNoteResponseDto of(String nickName, List<Note> notes) {
+    public static List<MypageNoteResponseDto> of(List<Note> notes) {
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy.MM.dd");
 
-        List<MypageNotesResponseDto> noteList = notes.stream()
+        List<MypageNoteResponseDto> noteList = notes.stream()
                 .sorted(comparing(Note::getCreatedAt).reversed())
-                .map(MypageNotesResponseDto::of)
+                .map(note -> new MypageNoteResponseDto(
+                        note.getBook().getUuid(),
+                        note.getBook().getFavoriteName(),
+                        note.getBook().getTitle(),
+                        note.getId(),
+                        note.getContent(),
+                        note.getCreatedAt().format(DateTimeFormatter.ofPattern("yyyy.MM.dd")),
+                        note.getTextColor(),
+                        note.getBackground()
+                ))
                 .toList();
 
-        return new MypageNoteResponseDto(nickName, noteList);
+        return noteList;
     }
-}
+}
diff --git a/src/main/java/org/sopt/lequuServer/domain/member/dto/response/MypageNotesResponseDto.java b/src/main/java/org/sopt/lequuServer/domain/member/dto/response/MypageNotesResponseDto.java
diff --git a/src/main/java/org/sopt/lequuServer/domain/member/dto/response/MypageResponseDto.java b/src/main/java/org/sopt/lequuServer/domain/member/dto/response/MypageResponseDto.java
@@ -0,0 +1,13 @@
+package org.sopt.lequuServer.domain.member.dto.response;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+public record MypageResponseDto(
+
+    @Schema(description = "유저 닉네임", example = "레큐")
+    String memberNickname
+) {
+    public static MypageResponseDto of(String nickName) {
+        return new MypageResponseDto(nickName);
+    }
+}