From 0f4655432cdbfbde8e8e18930fbd425576e62cb2 Mon Sep 17 00:00:00 2001
From: Choi hyoseong <105284587+hyoseong-Choi@users.noreply.github.com>
Date: Mon, 10 Feb 2025 13:23:37 +0900
Subject: [PATCH] =?UTF-8?q?CLAP-356=20=EC=B9=B4=ED=85=8C=EA=B3=A0=EB=A6=AC?=
 =?UTF-8?q?=20=EC=88=98=EC=A0=95=EC=8B=9C=20=EA=B3=A0=EC=9C=A0=EC=BD=94?=
 =?UTF-8?q?=EB=93=9C=20=EB=B0=8F=20=EC=A0=9C=EB=AA=A9=20=EC=A4=91=EB=B3=B5?=
 =?UTF-8?q?=20=EA=B0=80=EB=8A=A5=ED=95=9C=20=EB=AC=B8=EC=A0=9C=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* CLAP-343 fix: 카테고리 고유코드 및 제목 중복 가능한 문제 수정

<footer>
- #443

* CLAP-343 fix: 카테고리 고유코드 및 제목 중복 가능한 문제 수정

<footer>
- #443

* CLAP-356 fix: 카테고리 수정시 고유코드 및 제목 중복 가능한 문제 수정

<footer>
- #449
---
 .../outbound/persistense/CategoryPersistenceAdapter.java        | 2 +-
 .../persistense/repository/task/CategoryRepository.java         | 2 +-
 .../server/application/service/admin/UpdateCategoryService.java | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/clap/server/adapter/outbound/persistense/CategoryPersistenceAdapter.java b/src/main/java/clap/server/adapter/outbound/persistense/CategoryPersistenceAdapter.java
index ed9f1a7f..e99883db 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/CategoryPersistenceAdapter.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/CategoryPersistenceAdapter.java
@@ -51,7 +51,7 @@ public List<Category> findSubCategory() {
 
     @Override
     public boolean existsByNameOrCode(String name, String code) {
-        return categoryRepository.existsByNameOrCode(name, code);
+        return categoryRepository.existsByNameOrCodeAndIsDeletedFalse(name, code);
     }
 
     @Override
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/task/CategoryRepository.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/task/CategoryRepository.java
index a5bec1e3..5cdcc2b1 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/repository/task/CategoryRepository.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/repository/task/CategoryRepository.java
@@ -12,5 +12,5 @@ public interface CategoryRepository extends JpaRepository<CategoryEntity, Long>
     List<CategoryEntity> findByIsDeletedFalseAndMainCategoryIsNull();
     List<CategoryEntity> findByIsDeletedFalseAndMainCategoryIsNotNull();
 
-    boolean existsByNameOrCode(String name, String code);
+    boolean existsByNameOrCodeAndIsDeletedFalse(String name, String code);
 }
\ No newline at end of file
diff --git a/src/main/java/clap/server/application/service/admin/UpdateCategoryService.java b/src/main/java/clap/server/application/service/admin/UpdateCategoryService.java
index 29ac6249..cae97710 100644
--- a/src/main/java/clap/server/application/service/admin/UpdateCategoryService.java
+++ b/src/main/java/clap/server/application/service/admin/UpdateCategoryService.java
@@ -12,6 +12,7 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import static clap.server.exception.code.MemberErrorCode.ACTIVE_MEMBER_NOT_FOUND;
+import static clap.server.exception.code.TaskErrorCode.CATEGORY_DUPLICATE;
 import static clap.server.exception.code.TaskErrorCode.CATEGORY_NOT_FOUND;
 
 @ApplicationService
@@ -25,6 +26,7 @@ public class UpdateCategoryService implements UpdateCategoryUsecase {
     @Transactional
     public void updateCategory(Long adminId, Long categoryId, String name, String code, String descriptionExample) {
         Member admin = loadMemberPort.findActiveMemberById(adminId).orElseThrow(() -> new ApplicationException(ACTIVE_MEMBER_NOT_FOUND));
+        if (loadCategoryPort.existsByNameOrCode(name, code)) throw new ApplicationException(CATEGORY_DUPLICATE);
         Category category = loadCategoryPort.findById(categoryId)
                 .orElseThrow(() -> new ApplicationException(CATEGORY_NOT_FOUND));
         category.updateCategory(admin, name, code, descriptionExample);