CLAP-318 2차카테고리 입력 양식(설명 예시) 추가

hyoseong-Choi · nano-mm · parkjaehak · web-flow · commit 227040e1b9d3 · 2025-02-07T14:01:47.000+09:00
* CLAP-110 Feature : 담당자별 작업 처리량 조회 API 구현 <footer> - 관련: #73 * CLAP-111 Refactor : 통계 조회 API 리팩토링 및 기능 수정 <footer> - 관련: #74 * 내 작업한 내용에 대한 설명 * 담당자 조회 API 구현 * CLAP-111 Refactor : 통계 조회 API 주소 통합, 리팩토링, 예외처리 <footer> - 관련: #74 * Bug : 프로퍼티파일 수정 * CLAP-104 CI/CD : CI에서 s3.yml 파일 생성하도록 수정 * CLAP-146 Feature : 카테고리 목록 조회 API 구현 <footer> - 관련: #118 * CLAP-147 Feature : 카테고리 수정 API 구현 <footer> - 관련: #119 * CLAP-147 Feature : 카테고리 추가, 수정 API 리뷰반영 수정 <footer> - 관련: #119 * CLAP-148 Feature : 카테고리 삭제 API 구현 <footer> - 관련: #120 * CLAP-148 Feature : 카테고리 삭제 API 수정 <footer> - 관련: #120 * CLAP-148 Docs : 카테고리 API 스웨거 수정 <footer> - 관련: #120 * CLAP-107 Bug : CI test yml파일 key 중복 수정 <footer> - 관련: #60 * CLAP-148 Feature : 카테고리 CUD 리뷰 반영 수정, 조회 반환 양식 수정 <footer> - 관련: #120 * CLAP-214 Cleanup : 통계, 카테고리 미흡한부분 리팩토링 <footer> - 관련: #216 * CLAP-214 Fix : 통계조회 API 파라미터 바인딩 오류 수정 <footer> - 관련: #216 * CLAP-214 Fix : addConverter 수정 <footer> - 관련: #216 * CLAP-214 Hotfix : 추가한 파일들 제거 <footer> - 관련: #216 * CLAP-214 Hotfix : FindStatisticsController 스위치문 수정 <footer> - 관련: #216 * CLAP-214 Hotfix : AddCategoryService 지연로딩 오류 수정 <footer> - 관련: #216 * CLAP-214 Hotfix : DeleteCategoryService 카테고리 삭제 로직 수정 <footer> - 관련: #216 * CLAP-249 Refactor : 통계 조회 서비스 리팩토링 <footer> - 관련: #265 * CLAP-250 Test : 통계 조회 테스트코드 작성 <footer> - 관련: #266 * CLAP-214 Hotifx : 카테고리 수정 로직 수정 <footer> - 관련: #216 * CLAP-214 Hotifx : 카테고리 수정 로직 수정 <footer> - 관련: #216 * CLAP-256 fix: 스웨거 명세 추가 * CLAP-214 Hotifx : 카테고리 저장 트랜잭션 추가 <footer> - 관련: #216 * CLAP-214 Hotifx : 카테고리 저장 시간 수정 <footer> - 관련: #216 * CLAP-285 Hotifx : 모든 카테고리 조회 <footer> - 관련: #331 * CLAP-214 Hotifx : 카테고리 조회 Secured 설정 <footer> - 관련: #216 * CLAP-256 fix: convert 동작 mapper 추가 * CLAP-256 fix: 충돌해결 * CLAP-256 fix: 불필요한 테스트 파일 제거 * CLAP-256 fix: mapper statuslabel 수정 * CLAP-256 Fix : 팀 작업 현황 필터링 조회 수정 <footer> - 관련: #281 * CLAP-299 Feature : 사용자 작업 취소 <footer> - 관련: #352 * CLAP-299 Fix: 사용자 작업 취소 api 주소 수정 <footer> - 관련: #352 * CLAP-256 전체 작업수 계산 로직 개선 * fix: env 파일 제거 * fix: 어노테이션 수정 * fix: @RestController 제거 * fix: @ApplicationService로 수정 * CLAP-256 Fix : TeamStatusService 누락된 import 수정 <footer> - 관련: #281 * CLAP-256 Fix : TeamStatusService Secured 추가 <footer> - 관련: #281 * fix: 팀 작업 현황 필터링 조회 수정 및 정렬 기능 개선 * Delete src/main/resources/env.properties * Delete src/test/resources/application.yml * 충돌 해결: develop 브랜치와 병합 * Update application.yml * Revert application.yml files to match develop branch * CLAP-256 fix: Update application.yml * CLAP-256 fix: Update application.yml * CLAP-256 Fix : 팀 현황 필터조회 기여도순 정렬 수정 <footer> - 관련: #281 * CLAP-309 Fix : 엘라스틱서치에 저장할 작업 정보 수정 <footer> - 관련: #378 * CLAP-309 Fix : 엘라스틱서치에 저장 누락되는것 수정 <footer> - 관련: #378 * CLAP-test * CLAP-318 Fix : 2차카테고리 입력 양식(설명 예시) 추가 <footer> - 관련: #392 * CLAP-318 Test : 2차카테고리 입력 양식(설명 예시) 추가한 테스트코드 수정 <footer> - 관련: #392 --------- Co-authored-by: nano-mm <nano123@gachon.ac.kr> Co-authored-by: parkjaehak <atom8426@gmail.com>
diff --git a/src/main/java/clap/server/adapter/inbound/web/admin/AddCategoryController.java b/src/main/java/clap/server/adapter/inbound/web/admin/AddCategoryController.java
@@ -35,7 +35,11 @@ public void addMainCategory(@AuthenticationPrincipal SecurityUserDetails userInf
     @PostMapping("/sub-category")
     @Secured("ROLE_ADMIN")
     public void addSubCategory(@AuthenticationPrincipal SecurityUserDetails userInfo, @Valid @RequestBody AddSubCategoryRequest addCategoryRequest) {
-        addSubCategoryUsecase.addSubCategory(userInfo.getUserId(), addCategoryRequest.mainCategoryId(), addCategoryRequest.code(), addCategoryRequest.name());
+        addSubCategoryUsecase.addSubCategory(userInfo.getUserId(),
+                addCategoryRequest.mainCategoryId(),
+                addCategoryRequest.code(),
+                addCategoryRequest.name(),
+                addCategoryRequest.descriptionExample());
     }
 
 }
diff --git a/src/main/java/clap/server/adapter/inbound/web/admin/UpdateCategoryController.java b/src/main/java/clap/server/adapter/inbound/web/admin/UpdateCategoryController.java
@@ -27,6 +27,10 @@ public class UpdateCategoryController {
     @Secured("ROLE_ADMIN")
     public void updateCategory(@AuthenticationPrincipal SecurityUserDetails userInfo, @PathVariable Long categoryId,
                                @Valid @RequestBody UpdateCategoryRequest updateCategoryRequest) {
-        updateCategoryUsecase.updateCategory(userInfo.getUserId(), categoryId, updateCategoryRequest.name(), updateCategoryRequest.code());
+        updateCategoryUsecase.updateCategory(userInfo.getUserId(),
+                categoryId,
+                updateCategoryRequest.name(),
+                updateCategoryRequest.code(),
+                updateCategoryRequest.descriptionExample());
     }
 }
diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/admin/request/AddSubCategoryRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/admin/request/AddSubCategoryRequest.java
@@ -11,5 +11,6 @@ public record AddSubCategoryRequest(
         @NotBlank @Length(max = 20)
         String name,
         @NotBlank @Pattern(regexp = "^[A-Z]{1,2}$", message = "올바른 카테고리 코드 형식이 아닙니다.")
-        String code) {
+        String code,
+        String descriptionExample) {
 }
diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/admin/request/UpdateCategoryRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/admin/request/UpdateCategoryRequest.java
@@ -8,6 +8,7 @@ public record UpdateCategoryRequest(
         @NotBlank @Length(max = 20)
         String name,
         @NotBlank @Pattern(regexp = "^[A-Z]{1,2}$", message = "올바른 카테고리 코드 형식이 아닙니다.")
-        String code
+        String code,
+        String descriptionExample
 ) {
 }
diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/admin/response/FindSubCategoryResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/admin/response/FindSubCategoryResponse.java
@@ -4,6 +4,7 @@ public record FindSubCategoryResponse(
         Long id,
         Long mainCategoryId,
         String name,
-        String code
+        String code,
+        String descriptionExample
 ) {
 }
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/CommentPersistenceAdapter.java b/src/main/java/clap/server/adapter/outbound/persistense/CommentPersistenceAdapter.java
@@ -34,4 +34,9 @@ public Comment saveComment(Comment comment) {
     public void deleteCommentWithTaskHistory(Long commentId) {
         commentRepository.deleteCommentWithTaskHistory(commentId);
     }
+
+    @Override
+    public void deleteComment(Comment comment) {
+        commentRepository.delete(commentPersistenceMapper.toEntity(comment));
+    }
 }
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/TaskHistoryPersistenceAdapter.java b/src/main/java/clap/server/adapter/outbound/persistense/TaskHistoryPersistenceAdapter.java
@@ -35,4 +35,9 @@ public TaskHistory save(TaskHistory taskHistory) {
         TaskHistoryEntity savedTaskHistoryEntity = taskHistoryRepository.save(taskHistoryEntity);
         return taskHistoryPersistenceMapper.toDomain(savedTaskHistoryEntity);
     }
+
+    @Override
+    public void deleteTaskHistoryByCommentId(Long commentId) {
+        taskHistoryRepository.updateByComment_CommentId(commentId);
+    }
 }
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/history/TaskHistoryRepository.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/history/TaskHistoryRepository.java
@@ -8,5 +8,8 @@
 import org.springframework.stereotype.Repository;
 
 @Repository
-public interface TaskHistoryRepository extends JpaRepository<TaskHistoryEntity, Long> , TaskHistoryCustomRepository{
-}
+public interface TaskHistoryRepository extends JpaRepository<TaskHistoryEntity, Long>, TaskHistoryCustomRepository {
+    @Modifying
+    @Query("UPDATE TaskHistoryEntity t SET t.isDeleted = true WHERE t.comment.commentId = :commentId")
+    void updateByComment_CommentId(@Param("commentId") Long commentId);
+}
diff --git a/src/main/java/clap/server/application/mapper/CategoryResponseMapper.java b/src/main/java/clap/server/application/mapper/CategoryResponseMapper.java
@@ -22,6 +22,6 @@ public static FindMainCategoryResponse toFindMainCategoryResponse(Category categ
     }
 
     public static FindSubCategoryResponse toFindSubCategoryResponse(Category category) {
-        return new FindSubCategoryResponse(category.getCategoryId(), category.getMainCategory().getCategoryId(), category.getName(), category.getCode());
+        return new FindSubCategoryResponse(category.getCategoryId(), category.getMainCategory().getCategoryId(), category.getName(), category.getCode(), category.getDescriptionExample());
     }
 }
diff --git a/src/main/java/clap/server/application/port/inbound/admin/AddSubCategoryUsecase.java b/src/main/java/clap/server/application/port/inbound/admin/AddSubCategoryUsecase.java
@@ -1,5 +1,5 @@
 package clap.server.application.port.inbound.admin;
 
 public interface AddSubCategoryUsecase {
-    void addSubCategory(Long adminId, Long mainCategoryId, String code, String name);
+    void addSubCategory(Long adminId, Long mainCategoryId, String code, String name, String descriptionExample);
 }
diff --git a/src/main/java/clap/server/application/port/inbound/admin/UpdateCategoryUsecase.java b/src/main/java/clap/server/application/port/inbound/admin/UpdateCategoryUsecase.java
@@ -1,5 +1,5 @@
 package clap.server.application.port.inbound.admin;
 
 public interface UpdateCategoryUsecase {
-    void updateCategory(Long adminId, Long categoryId, String name, String code);
+    void updateCategory(Long adminId, Long categoryId, String name, String code, String descriptionExample);
 }
diff --git a/src/main/java/clap/server/application/port/outbound/task/CommandCommentPort.java b/src/main/java/clap/server/application/port/outbound/task/CommandCommentPort.java
@@ -7,4 +7,6 @@ public interface CommandCommentPort {
     Comment saveComment(Comment comment);
 
     void deleteCommentWithTaskHistory(Long commentId);
+
+    void deleteComment(Comment comment);
 }
diff --git a/src/main/java/clap/server/application/port/outbound/taskhistory/CommandTaskHistoryPort.java b/src/main/java/clap/server/application/port/outbound/taskhistory/CommandTaskHistoryPort.java
@@ -5,4 +5,6 @@
 
 public interface CommandTaskHistoryPort {
     TaskHistory save(TaskHistory taskHistory);
+
+    void deleteTaskHistoryByCommentId(Long commentId);
 }
diff --git a/src/main/java/clap/server/application/service/admin/AddCategoryService.java b/src/main/java/clap/server/application/service/admin/AddCategoryService.java
@@ -36,14 +36,14 @@ public void addMainCategory(Long adminId, String code, String name) {
 
     @Override
     @Transactional
-    public void addSubCategory(Long adminId, Long mainCategoryId, 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);
 
         Category subCategory = Category.createSubCategory(
                 activeMember.orElseThrow(() -> new ApplicationException(ACTIVE_MEMBER_NOT_FOUND)),
                 mainCategory.orElseThrow(() -> new ApplicationException(CATEGORY_NOT_FOUND)),
-                code, name);
+                code, name, descriptionExample);
         commandCategoryPort.save(subCategory);
     }
 }
diff --git a/src/main/java/clap/server/application/service/admin/UpdateCategoryService.java b/src/main/java/clap/server/application/service/admin/UpdateCategoryService.java
@@ -23,11 +23,11 @@ public class UpdateCategoryService implements UpdateCategoryUsecase {
 
     @Override
     @Transactional
-    public void updateCategory(Long adminId, Long categoryId, String name, String code) {
+    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));
         Category category = loadCategoryPort.findById(categoryId)
                 .orElseThrow(() -> new ApplicationException(CATEGORY_NOT_FOUND));
-        category.updateCategory(admin, name, code);
+        category.updateCategory(admin, name, code, descriptionExample);
         commandCategoryPort.save(category);
     }
 }
diff --git a/src/main/java/clap/server/application/service/history/CommandCommentService.java b/src/main/java/clap/server/application/service/history/CommandCommentService.java
@@ -55,13 +55,16 @@ public void deleteComment(Long userId, Long commentId) {
         Member member = memberService.findActiveMember(userId);
         Comment comment = commentService.findById(commentId);
 
-        if (Objects.equals(comment.getMember().getMemberId(), member.getMemberId())) {
+        if (Member.checkCommenter(comment.getTask(), member)) {
+            // 첨부파일이 있을 경우 삭제
             if (loadAttachmentPort.exitsByCommentId(commentId)) {
                 deleteAttachments(commentId);
             }
-            commandCommentPort.deleteCommentWithTaskHistory(commentId);
-        }else{
-            throw new DomainException(MemberErrorCode.NOT_A_COMMENTER);
+            // comment 삭제
+            commandCommentPort.deleteComment(comment);
+            // comment와 관련된 taskHistory도 함께 삭제
+
+            commandTaskHistoryPort.deleteTaskHistoryByCommentId(commentId);
         }
     }
 
diff --git a/src/main/java/clap/server/domain/model/task/Category.java b/src/main/java/clap/server/domain/model/task/Category.java
@@ -31,19 +31,21 @@ public static Category createMainCategory(Member admin, String code, String name
                 .build();
     }
 
-    public static Category createSubCategory(Member admin, Category mainCategory, String code, String name) {
+    public static Category createSubCategory(Member admin, Category mainCategory, String code, String name, String descriptionExample) {
         return Category.builder()
                 .mainCategory(mainCategory)
                 .admin(admin)
                 .code(code)
                 .name(name)
+                .descriptionExample(descriptionExample != null ? descriptionExample : "")
                 .build();
     }
 
-    public void updateCategory(Member admin, String name, String code){
+    public void updateCategory(Member admin, String name, String code, String descriptionExample){
         this.admin = admin;
         this.name = name;
         this.code = code;
+        this.descriptionExample = descriptionExample != null ? descriptionExample : "";
     }
 
     public void deleteCategory(Member admin) {
diff --git a/src/test/java/clap/server/application/service/admin/AddCategoryServiceTest.java b/src/test/java/clap/server/application/service/admin/AddCategoryServiceTest.java
@@ -70,7 +70,8 @@ void addMainCategory() {
     @Test
     void addSubCategory() {
         MemberEntity admin = entityManager.find(MemberEntity.class, 1);
-        addCategoryService.addSubCategory(admin.getMemberId(), 1L, "CR", "생성");
+        addCategoryService.addSubCategory(admin.getMemberId(), 1L,
+                "CR", "생성", "vm이름:\n이미지:\n인스턴스 유형\n볼륨 용량\nvpc이름:\n보안그룸:");
 
         CategoryEntity category = entityManager.find(CategoryEntity.class, 2);
         assertThat(category.getCategoryId()).isEqualTo(2);

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,11 @@ public void addMainCategory(@AuthenticationPrincipal SecurityUserDetails userInf`
`35`	`35`	`@PostMapping("/sub-category")`
`36`	`36`	`@Secured("ROLE_ADMIN")`
`37`	`37`	`public void addSubCategory(@AuthenticationPrincipal SecurityUserDetails userInfo, @Valid @RequestBody AddSubCategoryRequest addCategoryRequest) {`
`38`		`- addSubCategoryUsecase.addSubCategory(userInfo.getUserId(), addCategoryRequest.mainCategoryId(), addCategoryRequest.code(), addCategoryRequest.name());`
	`38`	`+ addSubCategoryUsecase.addSubCategory(userInfo.getUserId(),`
	`39`	`+ addCategoryRequest.mainCategoryId(),`
	`40`	`+ addCategoryRequest.code(),`
	`41`	`+ addCategoryRequest.name(),`
	`42`	`+ addCategoryRequest.descriptionExample());`
`39`	`43`	`}`
`40`	`44`
`41`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,10 @@ public class UpdateCategoryController {`
`27`	`27`	`@Secured("ROLE_ADMIN")`
`28`	`28`	`public void updateCategory(@AuthenticationPrincipal SecurityUserDetails userInfo, @PathVariable Long categoryId,`
`29`	`29`	`@Valid @RequestBody UpdateCategoryRequest updateCategoryRequest) {`
`30`		`- updateCategoryUsecase.updateCategory(userInfo.getUserId(), categoryId, updateCategoryRequest.name(), updateCategoryRequest.code());`
	`30`	`+ updateCategoryUsecase.updateCategory(userInfo.getUserId(),`
	`31`	`+ categoryId,`
	`32`	`+ updateCategoryRequest.name(),`
	`33`	`+ updateCategoryRequest.code(),`
	`34`	`+ updateCategoryRequest.descriptionExample());`
`31`	`35`	`}`
`32`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,5 +11,6 @@ public record AddSubCategoryRequest(`
`11`	`11`	`@NotBlank @Length(max = 20)`
`12`	`12`	`String name,`
`13`	`13`	`@NotBlank @Pattern(regexp = "^[A-Z]{1,2}$", message = "올바른 카테고리 코드 형식이 아닙니다.")`
`14`		`- String code) {`
	`14`	`+ String code,`
	`15`	`+ String descriptionExample) {`
`15`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ public record UpdateCategoryRequest(`
`8`	`8`	`@NotBlank @Length(max = 20)`
`9`	`9`	`String name,`
`10`	`10`	`@NotBlank @Pattern(regexp = "^[A-Z]{1,2}$", message = "올바른 카테고리 코드 형식이 아닙니다.")`
`11`		`- String code`
	`11`	`+ String code,`
	`12`	`+ String descriptionExample`
`12`	`13`	`) {`
`13`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ public record FindSubCategoryResponse(`
`4`	`4`	`Long id,`
`5`	`5`	`Long mainCategoryId,`
`6`	`6`	`String name,`
`7`		`- String code`
	`7`	`+ String code,`
	`8`	`+ String descriptionExample`
`8`	`9`	`) {`
`9`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,4 +34,9 @@ public Comment saveComment(Comment comment) {`
`34`	`34`	`public void deleteCommentWithTaskHistory(Long commentId) {`
`35`	`35`	`commentRepository.deleteCommentWithTaskHistory(commentId);`
`36`	`36`	`}`
	`37`	`+`
	`38`	`+ @Override`
	`39`	`+ public void deleteComment(Comment comment) {`
	`40`	`+ commentRepository.delete(commentPersistenceMapper.toEntity(comment));`
	`41`	`+ }`
`37`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,4 +35,9 @@ public TaskHistory save(TaskHistory taskHistory) {`
`35`	`35`	`TaskHistoryEntity savedTaskHistoryEntity = taskHistoryRepository.save(taskHistoryEntity);`
`36`	`36`	`return taskHistoryPersistenceMapper.toDomain(savedTaskHistoryEntity);`
`37`	`37`	`}`
	`38`	`+`
	`39`	`+ @Override`
	`40`	`+ public void deleteTaskHistoryByCommentId(Long commentId) {`
	`41`	`+ taskHistoryRepository.updateByComment_CommentId(commentId);`
	`42`	`+ }`
`38`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,6 @@ public static FindMainCategoryResponse toFindMainCategoryResponse(Category categ`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`public static FindSubCategoryResponse toFindSubCategoryResponse(Category category) {`
`25`		`- return new FindSubCategoryResponse(category.getCategoryId(), category.getMainCategory().getCategoryId(), category.getName(), category.getCode());`
	`25`	`+ return new FindSubCategoryResponse(category.getCategoryId(), category.getMainCategory().getCategoryId(), category.getName(), category.getCode(), category.getDescriptionExample());`
`26`	`26`	`}`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`package clap.server.application.port.inbound.admin;`
`2`	`2`
`3`	`3`	`public interface AddSubCategoryUsecase {`
`4`		`- void addSubCategory(Long adminId, Long mainCategoryId, String code, String name);`
	`4`	`+ void addSubCategory(Long adminId, Long mainCategoryId, String code, String name, String descriptionExample);`
`5`	`5`	`}`