From da9b6fe256aacc95f870ada63659f09e7adc4c22 Mon Sep 17 00:00:00 2001
From: hyoseong-Choi <gytjd9516@naver.com>
Date: Sun, 9 Feb 2025 23:55:23 +0900
Subject: [PATCH 1/2] =?UTF-8?q?CLAP-343=20fix:=20=EC=B9=B4=ED=85=8C?=
 =?UTF-8?q?=EA=B3=A0=EB=A6=AC=20=EA=B3=A0=EC=9C=A0=EC=BD=94=EB=93=9C=20?=
 =?UTF-8?q?=EB=B0=8F=20=EC=A0=9C=EB=AA=A9=20=EC=A4=91=EB=B3=B5=20=EA=B0=80?=
 =?UTF-8?q?=EB=8A=A5=ED=95=9C=20=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- #443
---
 .../outbound/persistense/entity/task/CategoryEntity.java    | 4 ++--
 .../V20250209343__Create_Unique_Constraint_To_Category.sql  | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 src/main/resources/db/migration/dev/V20250209343__Create_Unique_Constraint_To_Category.sql

diff --git a/src/main/java/clap/server/adapter/outbound/persistense/entity/task/CategoryEntity.java b/src/main/java/clap/server/adapter/outbound/persistense/entity/task/CategoryEntity.java
index 03d747c9..3cda9e78 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/entity/task/CategoryEntity.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/entity/task/CategoryEntity.java
@@ -23,10 +23,10 @@ public class CategoryEntity extends BaseTimeEntity {
     @JoinColumn(name = "admin_id", nullable = false)
     private MemberEntity admin;
 
-    @Column(nullable = false)
+    @Column(nullable = false, unique = true)
     private String code;
 
-    @Column(nullable = false)
+    @Column(nullable = false, unique = true)
     private String name;
 
     @ManyToOne(fetch = FetchType.EAGER)
diff --git a/src/main/resources/db/migration/dev/V20250209343__Create_Unique_Constraint_To_Category.sql b/src/main/resources/db/migration/dev/V20250209343__Create_Unique_Constraint_To_Category.sql
new file mode 100644
index 00000000..73542995
--- /dev/null
+++ b/src/main/resources/db/migration/dev/V20250209343__Create_Unique_Constraint_To_Category.sql
@@ -0,0 +1,6 @@
+alter table category
+    add constraint category_name
+        unique (name);
+alter table category
+    add constraint category_code
+        unique (code);
\ No newline at end of file

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

<footer>
- #443
---
 .../outbound/persistense/CategoryPersistenceAdapter.java    | 5 +++++
 .../outbound/persistense/entity/task/CategoryEntity.java    | 4 ++--
 .../persistense/repository/task/CategoryRepository.java     | 2 ++
 .../application/port/outbound/task/LoadCategoryPort.java    | 2 ++
 .../application/service/admin/AddCategoryService.java       | 4 +++-
 src/main/java/clap/server/exception/code/TaskErrorCode.java | 3 ++-
 .../V20250209343__Create_Unique_Constraint_To_Category.sql  | 6 ------
 7 files changed, 16 insertions(+), 10 deletions(-)
 delete mode 100644 src/main/resources/db/migration/dev/V20250209343__Create_Unique_Constraint_To_Category.sql

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 ef4b1d69..ed9f1a7f 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/CategoryPersistenceAdapter.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/CategoryPersistenceAdapter.java
@@ -49,6 +49,11 @@ public List<Category> findSubCategory() {
                 .toList();
     }
 
+    @Override
+    public boolean existsByNameOrCode(String name, String code) {
+        return categoryRepository.existsByNameOrCode(name, code);
+    }
+
     @Override
     public void save(final Category category) {
         categoryRepository.save(categoryPersistenceMapper.toEntity(category));
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/entity/task/CategoryEntity.java b/src/main/java/clap/server/adapter/outbound/persistense/entity/task/CategoryEntity.java
index 3cda9e78..03d747c9 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/entity/task/CategoryEntity.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/entity/task/CategoryEntity.java
@@ -23,10 +23,10 @@ public class CategoryEntity extends BaseTimeEntity {
     @JoinColumn(name = "admin_id", nullable = false)
     private MemberEntity admin;
 
-    @Column(nullable = false, unique = true)
+    @Column(nullable = false)
     private String code;
 
-    @Column(nullable = false, unique = true)
+    @Column(nullable = false)
     private String name;
 
     @ManyToOne(fetch = FetchType.EAGER)
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 017e760e..a5bec1e3 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
@@ -11,4 +11,6 @@ public interface CategoryRepository extends JpaRepository<CategoryEntity, Long>
     List<CategoryEntity> findByIsDeletedFalse();
     List<CategoryEntity> findByIsDeletedFalseAndMainCategoryIsNull();
     List<CategoryEntity> findByIsDeletedFalseAndMainCategoryIsNotNull();
+
+    boolean existsByNameOrCode(String name, String code);
 }
\ No newline at end of file
diff --git a/src/main/java/clap/server/application/port/outbound/task/LoadCategoryPort.java b/src/main/java/clap/server/application/port/outbound/task/LoadCategoryPort.java
index 49cc6eeb..2533e8ff 100644
--- a/src/main/java/clap/server/application/port/outbound/task/LoadCategoryPort.java
+++ b/src/main/java/clap/server/application/port/outbound/task/LoadCategoryPort.java
@@ -11,4 +11,6 @@ public interface LoadCategoryPort {
     List<Category> findAll();
     List<Category> findMainCategory();
     List<Category> findSubCategory();
+
+    boolean existsByNameOrCode(String name, String code);
 }
diff --git a/src/main/java/clap/server/application/service/admin/AddCategoryService.java b/src/main/java/clap/server/application/service/admin/AddCategoryService.java
index 6a09de2f..4b934dc4 100644
--- a/src/main/java/clap/server/application/service/admin/AddCategoryService.java
+++ b/src/main/java/clap/server/application/service/admin/AddCategoryService.java
@@ -15,6 +15,7 @@
 import java.util.Optional;
 
 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
@@ -28,6 +29,7 @@ public class AddCategoryService implements AddMainCategoryUsecase, AddSubCategor
     @Transactional
     public void addMainCategory(Long adminId, String code, String name) {
         Optional<Member> activeMember = loadMemberPort.findActiveMemberById(adminId);
+        if (loadCategoryPort.existsByNameOrCode(name, code)) throw new ApplicationException(CATEGORY_DUPLICATE);
         Category mainCategory = Category.createMainCategory(
                 activeMember.orElseThrow(() -> new ApplicationException(ACTIVE_MEMBER_NOT_FOUND)),
                 code, name);
@@ -39,7 +41,7 @@ public void addMainCategory(Long adminId, String code, String name) {
     public void addSubCategory(Long adminId, Long mainCategoryId, String code, String name, String descriptionExample) {
         Optional<Member> activeMember = loadMemberPort.findActiveMemberById(adminId);
         Optional<Category> mainCategory = loadCategoryPort.findById(mainCategoryId);
-
+        if (loadCategoryPort.existsByNameOrCode(name, code)) throw new ApplicationException(CATEGORY_DUPLICATE);
         Category subCategory = Category.createSubCategory(
                 activeMember.orElseThrow(() -> new ApplicationException(ACTIVE_MEMBER_NOT_FOUND)),
                 mainCategory.orElseThrow(() -> new ApplicationException(CATEGORY_NOT_FOUND)),
diff --git a/src/main/java/clap/server/exception/code/TaskErrorCode.java b/src/main/java/clap/server/exception/code/TaskErrorCode.java
index 04b87837..3f01e759 100644
--- a/src/main/java/clap/server/exception/code/TaskErrorCode.java
+++ b/src/main/java/clap/server/exception/code/TaskErrorCode.java
@@ -18,7 +18,8 @@ public enum TaskErrorCode implements BaseErrorCode {
     NOT_A_REVIEWER(HttpStatus.FORBIDDEN, "TASK_009", "작업 승인 및 수정 권한이 없습니다."),
     NOT_A_REQUESTER(HttpStatus.FORBIDDEN, "TASK_010", "작업 수정 및 취소 권한이 없습니다."),
     TASK_STATUS_NOT_ALLOWED(HttpStatus.BAD_REQUEST, "TASK_011", "변경할 수 없는 작업 상태입니다. 다른 API를 사용해주세요"),
-    FILE_COUNT_EXCEEDED(HttpStatus.BAD_REQUEST, "TASK_012", "파일은 5개 이상 첨부 가능합니다.")
+    FILE_COUNT_EXCEEDED(HttpStatus.BAD_REQUEST, "TASK_012", "파일은 5개 이상 첨부 가능합니다."),
+    CATEGORY_DUPLICATE(HttpStatus.BAD_REQUEST, "TASK_013", "카테고리 이름 또는 코드는 중복될 수 없습니다.")
     ;
 
     private final HttpStatus httpStatus;
diff --git a/src/main/resources/db/migration/dev/V20250209343__Create_Unique_Constraint_To_Category.sql b/src/main/resources/db/migration/dev/V20250209343__Create_Unique_Constraint_To_Category.sql
deleted file mode 100644
index 73542995..00000000
--- a/src/main/resources/db/migration/dev/V20250209343__Create_Unique_Constraint_To_Category.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-alter table category
-    add constraint category_name
-        unique (name);
-alter table category
-    add constraint category_code
-        unique (code);
\ No newline at end of file