refactor: make existsCategoryByIdAndMember method

PrayHelper · Nov 5, 2023 · 76ae07e · 76ae07e
1 parent 2355817
commit 76ae07e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/main/java/com/uspray/uspray/infrastructure/CategoryRepository.java b/src/main/java/com/uspray/uspray/infrastructure/CategoryRepository.java
@@ -13,4 +13,6 @@ public interface CategoryRepository extends JpaRepository<Category, Long> {
   boolean existsCategoryByNameAndMember(String name, Member member);
 
   int countCategoryByMember(Member member);
+
+  boolean existsCategoryByIdAndMember(Long categoryId, Member member);
 }
diff --git a/src/main/java/com/uspray/uspray/service/CategoryService.java b/src/main/java/com/uspray/uspray/service/CategoryService.java
@@ -36,8 +36,8 @@ public CategoryResponseDto createCategory(String username,
 
   public CategoryResponseDto deleteCategory(String username, Long categoryId) {
     Category category = categoryRepository.getCategoryById(categoryId);
-    if (!category.getMember().getId()
-        .equals(memberRepository.getMemberByUserId(username).getId())) {
+    if (categoryRepository.existsCategoryByIdAndMember(categoryId,
+        memberRepository.getMemberByUserId(username))) {
       throw new NotFoundException(ErrorStatus.CATEGORY_UNAUTHORIZED_EXCEPTION,
           ErrorStatus.CATEGORY_UNAUTHORIZED_EXCEPTION.getMessage());
     }
@@ -47,8 +47,8 @@ public CategoryResponseDto deleteCategory(String username, Long categoryId) {
   public CategoryResponseDto updateCategory(String username, Long categoryId,
       CategoryRequestDto categoryRequestDto) {
     Category category = categoryRepository.getCategoryById(categoryId);
-    if (!category.getMember().getId()
-        .equals(memberRepository.getMemberByUserId(username).getId())) {
+    if (categoryRepository.existsCategoryByIdAndMember(categoryId,
+        memberRepository.getMemberByUserId(username))) {
       throw new NotFoundException(ErrorStatus.CATEGORY_UNAUTHORIZED_EXCEPTION,
           ErrorStatus.CATEGORY_UNAUTHORIZED_EXCEPTION.getMessage());
     }
@@ -58,8 +58,8 @@ public CategoryResponseDto updateCategory(String username, Long categoryId,
 
   public CategoryResponseDto getCategory(String username, Long categoryId) {
     Category category = categoryRepository.getCategoryById(categoryId);
-    if (!category.getMember().getId()
-        .equals(memberRepository.getMemberByUserId(username).getId())) {
+    if (categoryRepository.existsCategoryByIdAndMember(categoryId,
+        memberRepository.getMemberByUserId(username))) {
       throw new NotFoundException(ErrorStatus.CATEGORY_UNAUTHORIZED_EXCEPTION,
           ErrorStatus.CATEGORY_UNAUTHORIZED_EXCEPTION.getMessage());
     }