Merge pull request #100 from oduck-team/feature/98

회원 입덕 애니 및 작성 리뷰 갯수 #98
oduck-team · Nov 13, 2023 · b51cc16 · b51cc16
2 parents 452c135 + 54f6c1f
commit b51cc16
Show file tree

Hide file tree

Showing 15 changed files with 252 additions and 5 deletions.
diff --git a/src/docs/asciidoc/index.adoc b/src/docs/asciidoc/index.adoc
@@ -496,6 +496,46 @@ include::{snippets}/getBookmarks/successWithCursor/response-body.adoc[]
 .response-fields
 include::{snippets}/getBookmarks/successWithCursor/response-fields.adoc[]sho
 
+=== GET api/v1/members/:id/bookmarks/count
+
+.curl-request
+include::{snippets}/getBookmarkCount/success/curl-request.adoc[]
+
+.http-request
+include::{snippets}/getBookmarkCount/success/http-request.adoc[]
+
+.request-param
+include::{snippets}/getBookmarkCount/success/path-parameters.adoc[]
+
+.http-response
+include::{snippets}/getBookmarkCount/success/http-response.adoc[]
+
+.response-body
+include::{snippets}/getBookmarkCount/success/response-body.adoc[]
+
+.response-fields
+include::{snippets}/getBookmarkCount/success/response-fields.adoc[]
+
+=== GET api/v1/members/:id/short-reviews/count
+
+.curl-request
+include::{snippets}/getReviewCount/success/curl-request.adoc[]
+
+.http-request
+include::{snippets}/getReviewCount/success/http-request.adoc[]
+
+.request-param
+include::{snippets}/getReviewCount/success/path-parameters.adoc[]
+
+.http-response
+include::{snippets}/getReviewCount/success/http-response.adoc[]
+
+.response-body
+include::{snippets}/getReviewCount/success/response-body.adoc[]
+
+.response-fields
+include::{snippets}/getReviewCount/success/response-fields.adoc[]
+
 == animes
 === GET api/v1/animes
 .curl-request

diff --git a/src/main/java/io/oduck/api/domain/bookmark/dto/BookmarkResDto.java b/src/main/java/io/oduck/api/domain/bookmark/dto/BookmarkResDto.java
@@ -10,6 +10,13 @@
 import lombok.NoArgsConstructor;
 
 public class BookmarkResDto {
+    @Getter
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class BookmarkCountRes {
+        private Long count;
+    }
     @Getter
     @Builder
     @NoArgsConstructor(access = AccessLevel.PROTECTED)

diff --git a/src/main/java/io/oduck/api/domain/bookmark/repository/BookmarkRepository.java b/src/main/java/io/oduck/api/domain/bookmark/repository/BookmarkRepository.java
@@ -7,6 +7,7 @@
 
 @Repository
 public interface BookmarkRepository extends JpaRepository<Bookmark,Long>, BookmarkRepositoryCustom {
+    Long countByMemberId(Long memberId);
     Optional<Bookmark> findByMemberIdAndAnimeId(Long memberId, Long animeId);
 
 }
diff --git a/src/main/java/io/oduck/api/domain/bookmark/service/BookmarkService.java b/src/main/java/io/oduck/api/domain/bookmark/service/BookmarkService.java
@@ -1,5 +1,6 @@
 package io.oduck.api.domain.bookmark.service;
 
+import io.oduck.api.domain.bookmark.dto.BookmarkResDto.BookmarkCountRes;
 import io.oduck.api.domain.bookmark.dto.BookmarkResDto.BookmarkRes;
 import io.oduck.api.domain.bookmark.dto.BookmarkReqDto.Sort;
 import io.oduck.api.domain.bookmark.dto.BookmarkResDto.BookmarkedDateTimeRes;
@@ -9,6 +10,7 @@
 public interface BookmarkService {
     boolean toggleBookmark(Long memberId, Long animeId);
     BookmarkedDateTimeRes checkBookmarked(Long memberId, Long animeId);
+    BookmarkCountRes getBookmarksCountByMemberId(Long memberId);
     SliceResponse<BookmarkRes> getBookmarksByMemberId(Long memberId, String cursor, Sort sort, OrderDirection order, int size);
 
 }
diff --git a/src/main/java/io/oduck/api/domain/bookmark/service/BookmarkServiceImpl.java b/src/main/java/io/oduck/api/domain/bookmark/service/BookmarkServiceImpl.java
@@ -6,6 +6,7 @@
 import io.oduck.api.domain.anime.repository.AnimeRepository;
 import io.oduck.api.domain.bookmark.dto.BookmarkDslDto.BookmarkDsl;
 import io.oduck.api.domain.bookmark.dto.BookmarkReqDto;
+import io.oduck.api.domain.bookmark.dto.BookmarkResDto.BookmarkCountRes;
 import io.oduck.api.domain.bookmark.dto.BookmarkResDto.BookmarkRes;
 import io.oduck.api.domain.bookmark.dto.BookmarkResDto.BookmarkedDateTimeRes;
 import io.oduck.api.domain.bookmark.entity.Bookmark;
@@ -74,6 +75,14 @@ public BookmarkedDateTimeRes checkBookmarked(Long memberId, Long animeId) {
         throw new NotFoundException("bookmark");
     }
 
+    @Override
+    public BookmarkCountRes getBookmarksCountByMemberId(Long memberId) {
+        Long count = bookmarkRepository.countByMemberId(memberId);
+        return BookmarkCountRes.builder()
+            .count(count)
+            .build();
+    }
+
     @Override
     public SliceResponse<BookmarkRes> getBookmarksByMemberId(Long memberId, String cursor, BookmarkReqDto.Sort sort, OrderDirection order, int size) {
         Sort sortList = Sort.by(

diff --git a/src/main/java/io/oduck/api/domain/member/controller/MemberController.java b/src/main/java/io/oduck/api/domain/member/controller/MemberController.java
@@ -7,13 +7,15 @@
 import io.oduck.api.domain.bookmark.dto.BookmarkReqDto.Sort;
 import io.oduck.api.domain.member.dto.MemberResDto.MemberProfileRes;
 import io.oduck.api.domain.member.service.MemberService;
+import io.oduck.api.domain.review.service.ShortReviewService;
 import io.oduck.api.global.common.OrderDirection;
 import io.oduck.api.global.common.SliceResponse;
 import io.oduck.api.global.security.auth.dto.AuthUser;
 import io.oduck.api.global.security.auth.dto.LoginUser;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.Max;
 import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.Positive;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
@@ -33,6 +35,7 @@
 public class MemberController {
     private final MemberService memberService;
     private final BookmarkService bookmarkService;
+    private final ShortReviewService shortReviewService;
 
     // 로컬 회원 가입
     @PostMapping
@@ -70,7 +73,7 @@ public ResponseEntity<?> patchProfile(
 
     @GetMapping("/{id}/bookmarks")
     public ResponseEntity<?> getBookmaks(
-        @PathVariable("id") Long id,
+        @PathVariable("id") @Positive Long id,
         @RequestParam(required = false) String cursor,
         @RequestParam(required = false, defaultValue = "created_at") Sort sort,
         @RequestParam(required = false, defaultValue = "DESC") OrderDirection order,
@@ -80,11 +83,25 @@ public ResponseEntity<?> getBookmaks(
         SliceResponse<BookmarkRes> res = bookmarkService.getBookmarksByMemberId(id, cursor, sort, order, size);
         return ResponseEntity.ok(res);
     }
+
+    @GetMapping("/{id}/bookmarks/count")
+    public ResponseEntity<?> getBookmarksCount(
+        @PathVariable("id") @Positive Long id
+    ) {
+        return ResponseEntity.ok(bookmarkService.getBookmarksCountByMemberId(id));
+    }
 //
 //    @GetMapping("/{name}/short-reviews")
 //    public ResponseEntity<?> getShortReviews(
 //        @LoginUser AuthUser user
 //    ) {
 //        return ResponseEntity.ok(SliceResponse.of());
 //    }
+
+    @GetMapping("/{id}/short-reviews/count")
+    public ResponseEntity<?> getShoertReviewsCount(
+        @PathVariable("id") @Positive Long id
+    ) {
+        return ResponseEntity.ok(shortReviewService.getShortReviewCountByMemberId(id));
+    }
 }
diff --git a/src/main/java/io/oduck/api/domain/review/dto/ShortReviewResDto.java b/src/main/java/io/oduck/api/domain/review/dto/ShortReviewResDto.java
@@ -54,4 +54,12 @@ public String bringCursor(String property) {
             };
         }
     }
+
+    @Getter
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class ShortReviewCountRes {
+        private Long count;
+    }
 }
diff --git a/src/main/java/io/oduck/api/domain/review/repository/ShortReviewRepository.java b/src/main/java/io/oduck/api/domain/review/repository/ShortReviewRepository.java
@@ -6,6 +6,5 @@
 
 @Repository
 public interface ShortReviewRepository extends JpaRepository<ShortReview,Long>, ShortReviewRepositoryCustom {
-
-
+    Long countByMemberId(Long memberId);
 }
diff --git a/src/main/java/io/oduck/api/domain/review/service/ShortReviewService.java b/src/main/java/io/oduck/api/domain/review/service/ShortReviewService.java
@@ -3,6 +3,7 @@
 import io.oduck.api.domain.review.dto.ShortReviewReqDto.PatchShortReviewReq;
 import io.oduck.api.domain.review.dto.ShortReviewReqDto.PostShortReviewReq;
 import io.oduck.api.domain.review.dto.ShortReviewReqDto.Sort;
+import io.oduck.api.domain.review.dto.ShortReviewResDto.ShortReviewCountRes;
 import io.oduck.api.domain.review.dto.ShortReviewResDto.ShortReviewRes;
 import io.oduck.api.global.common.OrderDirection;
 import io.oduck.api.global.common.SliceResponse;
@@ -14,6 +15,7 @@ public interface ShortReviewService {
 
     //애니 짧은 리뷰 조회
     SliceResponse<ShortReviewRes> getShortReviews(Long animeId, String cursor, Sort sort, OrderDirection order, int size);
+    ShortReviewCountRes getShortReviewCountByMemberId(Long memberId);
 
     //애니 리뷰 수정
     void update(Long memberId, Long reviewId, PatchShortReviewReq req);

diff --git a/src/main/java/io/oduck/api/domain/review/service/ShortReviewServiceImpl.java b/src/main/java/io/oduck/api/domain/review/service/ShortReviewServiceImpl.java
@@ -11,6 +11,7 @@
 import io.oduck.api.domain.review.dto.ShortReviewReqDto;
 import io.oduck.api.domain.review.dto.ShortReviewReqDto.PatchShortReviewReq;
 import io.oduck.api.domain.review.dto.ShortReviewReqDto.PostShortReviewReq;
+import io.oduck.api.domain.review.dto.ShortReviewResDto.ShortReviewCountRes;
 import io.oduck.api.domain.review.dto.ShortReviewResDto.ShortReviewRes;
 import io.oduck.api.domain.review.entity.ShortReview;
 import io.oduck.api.domain.review.repository.ShortReviewRepository;
@@ -99,6 +100,14 @@ public SliceResponse<ShortReviewRes> getShortReviews(Long animeId, String cursor
         return SliceResponse.of(shortReviews, res, sort.getSort());
     }
 
+    @Override
+    public ShortReviewCountRes getShortReviewCountByMemberId(Long memberId) {
+        Long count = shortReviewRepository.countByMemberId(memberId);
+        return ShortReviewCountRes.builder()
+                   .count(count)
+                   .build();
+    }
+
     @Override
     public void update(Long memberId, Long reviewId, PatchShortReviewReq req) {
         ShortReview findShortReview = getShortReview(reviewId);

diff --git a/src/test/java/io/oduck/api/e2e/member/MemberControllerTest.java b/src/test/java/io/oduck/api/e2e/member/MemberControllerTest.java
@@ -633,5 +633,81 @@ void getBookmarksSuccessWithCursor() throws Exception {
         }
     }
 
+    @DisplayName("회원의 북마크 애니 갯수 조회")
+    @Nested
+    class GetBookmarkCount {
+        @DisplayName("회원의 북마크 애니 갯수 조회 성공시 200 OK 응답")
+        @Test
+        void getBookmarkCountSuccess() throws Exception {
+            // given
+            // 회원의 북마크 애니 갯수 조회에 필요한 데이터
+            Long memberId = 1L;
+
+            // when
+            ResultActions actions = mockMvc.perform(
+                get(BASE_URL + "/{memberId}/bookmarks/count", memberId)
+                    .contentType(MediaType.APPLICATION_JSON)
+                    .accept(MediaType.APPLICATION_JSON)
+            );
+
+            // then
+            actions
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.count").exists())
+                .andDo(
+                    document("getBookmarkCount/success",
+                        preprocessRequest(prettyPrint()),
+                        preprocessResponse(prettyPrint()),
+                        pathParameters(
+                            parameterWithName("memberId")
+                                .description("회원 id")),
+                        responseFields(
+                            fieldWithPath("count")
+                                .type(JsonFieldType.NUMBER)
+                                .description("회원의 북마크 애니 갯수")
+                        )
+                    )
+                );
+        }
+    }
+
     // TODO: 회원 리뷰 목록 조회
+
+    @DisplayName("회원의 리뷰 갯수 조회")
+    @Nested
+    class GetReviewCount {
+        @DisplayName("회원의 리뷰 갯수 조회 성공시 200 OK 응답")
+        @Test
+        void getReviewCountSuccess() throws Exception {
+            // given
+            // 회원의 리뷰 갯수 조회에 필요한 데이터
+            Long memberId = 1L;
+
+            // when
+            ResultActions actions = mockMvc.perform(
+                get(BASE_URL + "/{memberId}/short-reviews/count", memberId)
+                    .contentType(MediaType.APPLICATION_JSON)
+                    .accept(MediaType.APPLICATION_JSON)
+            );
+
+            // then
+            actions
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.count").exists())
+                .andDo(
+                    document("getReviewCount/success",
+                        preprocessRequest(prettyPrint()),
+                        preprocessResponse(prettyPrint()),
+                        pathParameters(
+                            parameterWithName("memberId")
+                                .description("회원 id")),
+                        responseFields(
+                            fieldWithPath("count")
+                                .type(JsonFieldType.NUMBER)
+                                .description("회원의 리뷰 갯수")
+                        )
+                    )
+                );
+        }
+    }
 }
diff --git a/src/test/java/io/oduck/api/unit/bookmark/repository/BookmarkRepositoryTest.java b/src/test/java/io/oduck/api/unit/bookmark/repository/BookmarkRepositoryTest.java
@@ -1,6 +1,7 @@
 package io.oduck.api.unit.bookmark.repository;
 
 import static io.oduck.api.global.utils.PagingUtils.applyPageableForNonOffset;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import io.oduck.api.domain.bookmark.dto.BookmarkDslDto.BookmarkDsl;
@@ -22,7 +23,7 @@
 @ActiveProfiles("test")
 public class BookmarkRepositoryTest {
     @Autowired
-    BookmarkRepository memberRepository;
+    BookmarkRepository bookmarkRepository;
 
     @DisplayName("회원 북마크 애니 목록 조회")
     @Nested
@@ -36,7 +37,7 @@ void selectBookmarksSuccess() {
             Pageable pageable = applyPageableForNonOffset(10, "createdAt", "desc");
 
             // when
-            Slice<BookmarkDsl> bookmarks = memberRepository.selectBookmarks(memberId, null, pageable);
+            Slice<BookmarkDsl> bookmarks = bookmarkRepository.selectBookmarks(memberId, null, pageable);
 
             assertNotNull(bookmarks);
             assertNotNull(bookmarks.getContent().get(0).getAnimeId());
@@ -45,4 +46,21 @@ void selectBookmarksSuccess() {
         }
     }
 
+    @DisplayName("회원 북마크 애니 갯수 조회")
+    @Nested
+    class selectBookmarkCount {
+        @DisplayName("회원 ID로 회원이 북마크한 애니 갯수 조회 성공")
+        @Test
+        void selectBookmarkCountSuccess() {
+            // given
+            Long memberId = 1L;
+
+            // when
+            Long bookmarkCount = bookmarkRepository.countByMemberId(memberId);
+
+            // then
+            assertNotNull(bookmarkCount);
+            assertEquals(3L, bookmarkCount);
+        }
+    }
 }
diff --git a/src/test/java/io/oduck/api/unit/bookmark/service/BookmarkServiceTest.java b/src/test/java/io/oduck/api/unit/bookmark/service/BookmarkServiceTest.java
@@ -17,6 +17,7 @@
 import io.oduck.api.domain.anime.repository.AnimeRepository;
 import io.oduck.api.domain.bookmark.dto.BookmarkDslDto.BookmarkDsl;
 import io.oduck.api.domain.bookmark.dto.BookmarkReqDto.Sort;
+import io.oduck.api.domain.bookmark.dto.BookmarkResDto.BookmarkCountRes;
 import io.oduck.api.domain.bookmark.dto.BookmarkResDto.BookmarkRes;
 import io.oduck.api.domain.bookmark.dto.BookmarkResDto.BookmarkedDateTimeRes;
 import io.oduck.api.domain.bookmark.entity.Bookmark;
@@ -134,6 +135,24 @@ void getBookmarksByMemberIdSuccess() {
         }
     }
 
+    @DisplayName("회원의 북마크 갯수 조회")
+    @Nested
+    class GetBookmarkCountByMemberId {
+        @DisplayName("회원의 북마크 갯수 조회 성공")
+        @Test
+        void getBookmarkCountByMemberIdSuccess() {
+            Long memberId = 1L;
+            Long count = 3L;
+
+            when(bookmarkRepository.countByMemberId(memberId)).thenReturn(count);
+
+            BookmarkCountRes result = bookmarkService.getBookmarksCountByMemberId(memberId);
+
+            assertNotNull(result);
+            assertEquals(count, result.getCount());
+        }
+    }
+
     @DisplayName("북마크 체크")
     @Nested
     class checkBookmarked {