Merge pull request #65 from konkuk-icteam-student/feat/team

[feat] 소속·분류 삭제 시 참조 데이터 존재 여부 검증 추가

Author: jiyun921

src/main/java/com/better/CommuteMate/category/application/CategoryService.java

@@ -8,6 +8,7 @@
 import com.better.CommuteMate.category.application.dto.response.PutCategoryUpdateResponse;
 import com.better.CommuteMate.domain.category.entity.Category;
 import com.better.CommuteMate.domain.category.repository.CategoryRepository;
+import com.better.CommuteMate.domain.category.repository.ManagerCategoryRepository;
 import com.better.CommuteMate.domain.faq.repository.FaqRepository;
 import com.better.CommuteMate.global.exceptions.CategoryException;
 import com.better.CommuteMate.global.exceptions.error.CategoryErrorCode;
@@ -24,6 +25,7 @@ public class CategoryService {
 
     private final CategoryRepository categoryRepository;
     private final FaqRepository faqRepository;
+    private final ManagerCategoryRepository managerCategoryRepository;
 
     public PostCategoryResponse registerCategory(PostCategoryRequest request) {
 
@@ -65,7 +67,7 @@ public void deleteCategory(Long categoryId) {
         Category category = categoryRepository.findById(categoryId)
                 .orElseThrow(() -> new CategoryException(CategoryErrorCode.CATEGORY_NOT_FOUND));
 
-        if (faqRepository.existsByCategoryId(categoryId)) {
+        if (faqRepository.existsByCategoryId(categoryId)|| managerCategoryRepository.existsByCategoryId(categoryId)) {
             throw new CategoryException(CategoryErrorCode.CATEGORY_DELETE_NOT_ALLOWED);
         }
 

src/main/java/com/better/CommuteMate/category/controller/CategoryController.java

@@ -86,6 +86,7 @@ public ResponseEntity<Response> getCategoryList() {
     @ApiResponses(value = {
             @ApiResponse(responseCode = "200", description = "카테고리 삭제 성공"),
             @ApiResponse(responseCode = "404", description = "존재하지 않는 categoryId"),
+            @ApiResponse(responseCode = "409", description = "해당 카테고리에 FAQ 또는 담당자가 존재하여 삭제 불가"),
             @ApiResponse(responseCode = "500", description = "서버 오류")
     })
     @DeleteMapping("/{categoryId}")

src/main/java/com/better/CommuteMate/domain/category/repository/ManagerCategoryRepository.java

@@ -13,6 +13,7 @@
 @Repository
 public interface ManagerCategoryRepository extends JpaRepository<ManagerCategory, Long> {
     boolean existsByManagerIdAndCategoryId(Long managerId, Long categoryId);
+    boolean existsByCategoryId(Long categoryId);
     Optional<ManagerCategory>  findByManagerIdAndCategoryId(Long managerId, Long categoryId);
 
     @Query("""

src/main/java/com/better/CommuteMate/domain/manager/repository/ManagerRepository.java

@@ -10,4 +10,5 @@
 @Repository
 public interface ManagerRepository extends JpaRepository<Manager, Long> {
     Optional<Manager> findByNameAndTeamAndPhonenum(String name, Team team, String phonenum);
+    boolean existsByTeamId(Long teamId);
 }

src/main/java/com/better/CommuteMate/global/exceptions/error/CategoryErrorCode.java

@@ -10,7 +10,7 @@ public enum CategoryErrorCode implements CustomErrorCode {
 
     CATEGORY_NOT_FOUND("존재하지 않는 categoryId입니다.", "[Error] : Category를 찾을 수 없습니다.", HttpStatus.NOT_FOUND),
     CATEGORY_ALREADY_EXISTS("이미 존재하는 category 이름입니다.", "[Error] : Category 이름 중복 발생", HttpStatus.CONFLICT),
-    CATEGORY_DELETE_NOT_ALLOWED("해당 category에 속한 FAQ가 존재하여 삭제할 수 없습니다.", "[Error] : Category 삭제 실패 - FAQ가 존재합니다.", HttpStatus.CONFLICT);
+    CATEGORY_DELETE_NOT_ALLOWED("해당 category에 속한 FAQ 또는 담당자가 존재하여 삭제할 수 없습니다.", "[Error] : Category 삭제 실패 - FAQ 또는 담당자가 존재합니다.", HttpStatus.CONFLICT);
 
     private final String message;
     private final String logMessage;

src/main/java/com/better/CommuteMate/global/exceptions/error/TeamErrorCode.java

@@ -9,7 +9,8 @@
 public enum TeamErrorCode implements CustomErrorCode {
 
     TEAM_NOT_FOUND("존재하지 않는 TeamId입니다.", "[Error] : Team을 찾을 수 없습니다.", HttpStatus.NOT_FOUND),
-    TEAM_ALREADY_EXISTS("이미 존재하는 team 이름입니다.", "[Error] : Team 이름 중복 발생", HttpStatus.CONFLICT)
+    TEAM_ALREADY_EXISTS("이미 존재하는 team 이름입니다.", "[Error] : Team 이름 중복 발생", HttpStatus.CONFLICT),
+    TEAM_DELETE_NOT_ALLOWED("해당 team에 속한 담당자가 존재하여 삭제할 수 없습니다.", "[Error] : Team 삭제 실패 - 담당자가 존재합니다.", HttpStatus.CONFLICT)
     ;
 
     private final String message;

src/main/java/com/better/CommuteMate/team/application/TeamService.java

@@ -1,5 +1,6 @@
 package com.better.CommuteMate.team.application;
 
+import com.better.CommuteMate.domain.manager.repository.ManagerRepository;
 import com.better.CommuteMate.domain.team.entity.Team;
 import com.better.CommuteMate.domain.team.repository.TeamRepository;
 import com.better.CommuteMate.global.exceptions.TeamException;
@@ -20,6 +21,7 @@
 public class TeamService {
 
     private final TeamRepository teamRepository;
+    private final ManagerRepository managerRepository;
 
     public PostTeamResponse registerTeam(PostTeamRequest request) {
 
@@ -48,6 +50,10 @@ public void deleteTeam(Long teamId) {
         Team team = teamRepository.findById(teamId)
                 .orElseThrow(() -> new TeamException(TeamErrorCode.TEAM_NOT_FOUND));
 
+        if (managerRepository.existsByTeamId(teamId)) {
+            throw new TeamException(TeamErrorCode.TEAM_DELETE_NOT_ALLOWED);
+        }
+
         teamRepository.delete(team);
     }
 }

src/main/java/com/better/CommuteMate/team/controller/TeamController.java

@@ -70,6 +70,7 @@ public ResponseEntity<Response> getTeamList() {
     @ApiResponses(value = {
             @ApiResponse(responseCode = "200", description = "소속 삭제 성공"),
             @ApiResponse(responseCode = "404", description = "존재하지 않는 teamId"),
+            @ApiResponse(responseCode = "409", description = "해당 소속에 담당자가 존재하여 삭제 불가"),
             @ApiResponse(responseCode = "500", description = "서버 오류")
     })
     @DeleteMapping("/{teamId}")