From 76ae07e834cbb55a6a65fd0f9a793422be4c3c76 Mon Sep 17 00:00:00 2001 From: baebae02 Date: Sun, 5 Nov 2023 23:23:26 +0900 Subject: [PATCH] refactor: make existsCategoryByIdAndMember method --- .../uspray/infrastructure/CategoryRepository.java | 2 ++ .../com/uspray/uspray/service/CategoryService.java | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/uspray/uspray/infrastructure/CategoryRepository.java b/src/main/java/com/uspray/uspray/infrastructure/CategoryRepository.java index e7d8245f..0b0180e7 100644 --- 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 { 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 index dc75156c..b183d208 100644 --- 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()); }