CLAP-382 카테고리 이름, 코드 중복 체크 로직 수정

src/main/java/clap/server/adapter/inbound/web/dto/admin/response/FindAllCategoryResponse.java

@@ -1,11 +1,20 @@
 package clap.server.adapter.inbound.web.dto.admin.response;
 
+import io.swagger.v3.oas.annotations.media.Schema;
+
 import java.util.List;
 
 public record FindAllCategoryResponse(
-        Long id,
+        @Schema(description = "메인 카테고리 ID", example = "1")
+        Long mainCategoryId,
+
+        @Schema(description = "카테고리 이름", example = "VM 관련")
         String name,
+
+        @Schema(description = "카테고리 코드", example = "VM")
         String code,
+
+        @Schema(description = "서브 카테고리 목록")
         List<FindSubCategoryResponse> subCategory
 ) {
 }

src/main/java/clap/server/adapter/inbound/web/dto/admin/response/FindMainCategoryResponse.java

@@ -1,8 +1,15 @@
 package clap.server.adapter.inbound.web.dto.admin.response;
 
+import io.swagger.v3.oas.annotations.media.Schema;
+
 public record FindMainCategoryResponse(
-        Long id,
+        @Schema(description = "메인 카테고리 ID", example = "1")
+        Long mainCategoryId,
+
+        @Schema(description = "카테고리 이름", example = "VM 관련")
         String name,
+
+        @Schema(description = "카테고리 코드", example = "VM")
         String code
 ) {
 }

src/main/java/clap/server/adapter/inbound/web/dto/admin/response/FindSubCategoryResponse.java

@@ -1,10 +1,21 @@
 package clap.server.adapter.inbound.web.dto.admin.response;
 
+import io.swagger.v3.oas.annotations.media.Schema;
+
 public record FindSubCategoryResponse(
-        Long id,
+        @Schema(description = "서브 카테고리 ID", example = "4")
+        Long subCategoryId,
+
+        @Schema(description = "메인 카테고리 ID", example = "1")
         Long mainCategoryId,
+
+        @Schema(description = "카테고리 이름", example = "VM 수정")
         String name,
+
+        @Schema(description = "카테고리 코드", example = "VU")
         String code,
+
+        @Schema(description = "카테고리 설명 예시", example = "VM을 수정합니다.")
         String descriptionExample
 ) {
 }

src/main/java/clap/server/adapter/inbound/web/dto/admin/response/RetrieveAllMemberResponse.java

@@ -1,6 +1,7 @@
 package clap.server.adapter.inbound.web.dto.admin.response;
 
 import clap.server.adapter.outbound.persistense.entity.member.constant.MemberRole;
+import clap.server.adapter.outbound.persistense.entity.member.constant.MemberStatus;
 import io.swagger.v3.oas.annotations.media.Schema;
 
 import java.time.LocalDateTime;
@@ -31,7 +32,10 @@ public record RetrieveAllMemberResponse(
         String departmentRole,
 
         @Schema(description = "가입일", example = "2024-01-01T12:00:00")
-        LocalDateTime createdAt
+        LocalDateTime createdAt,
+
+        @Schema(description = "회원 상태", example = "ACTIVE")
+        MemberStatus memberStatus
 
 
 ) {}

src/main/java/clap/server/adapter/inbound/web/dto/history/request/EditCommentRequest.java

@@ -3,6 +3,7 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 
+@Deprecated
 public record EditCommentRequest(
         @Schema(description = "댓글 내용")
         @NotBlank

src/main/java/clap/server/adapter/inbound/web/dto/log/request/FilterLogRequest.java

@@ -14,8 +14,7 @@ public record FilterLogRequest(
         Integer term,
 
         @NotNull
-        @Schema(description = "로그 상태 목록",
-                example = "[\"LOGIN\", \"ASSIGNER_CHANGED\", \"COMMENT_ADDED\"]")
+        @Schema(description = "로그 상태 목록")
         List<LogStatus> logStatus,
 
         @NotNull

src/main/java/clap/server/adapter/inbound/web/dto/member/request/SendVerificationCodeRequest.java

@@ -2,6 +2,7 @@
 
 import jakarta.validation.constraints.NotBlank;
 
+@Deprecated
 public record SendVerificationCodeRequest(
         @NotBlank
         String nickname,

src/main/java/clap/server/adapter/inbound/web/dto/member/request/VerifyCodeRequest.java

@@ -3,6 +3,7 @@
 
 import jakarta.validation.constraints.NotBlank;
 
+@Deprecated
 public record VerifyCodeRequest(
         @NotBlank
         String email,

src/main/java/clap/server/adapter/outbound/api/agit/AgitTemplateBuilder.java

@@ -42,19 +42,19 @@ public String createPayLoad(PushNotificationTemplate request, Task task, String
 
     public String createMessage(PushNotificationTemplate request, String taskDetailUrl) {
 
-        return  switch (request.notificationType()) {
-            case TASK_REQUESTED -> "📌 *새 작업 요청:* `" + request.taskName() + "`\\n"
-                    + "\\t\\t*•요청자: " + request.senderName() + "*\\n"
-                    + "[확인하러 가기](" + taskDetailUrl + ")";
-            case STATUS_SWITCHED -> "⚙️ *작업 상태 변경:* `" + request.taskName() + "\\n"
-                    + "\\t\\t*•작업 상태: " + request.message() + "*\\n"
-                    + "[확인하러 가기](" + taskDetailUrl + ")";
-            case PROCESSOR_CHANGED -> "🔄 *담당자 변경:* `" + request.taskName() + "\\n"
-                    + "\\t\\t*•새 담당자: " + request.message() + "*\\n"
-                    + "[확인하러 가기](" + taskDetailUrl + ")";
-            case PROCESSOR_ASSIGNED -> "👤 *작업 담당자 배정:* `" + request.taskName() + "\\n"
-                    + "\\t\\t*•담당자: " + request.message() + "*\\n"
-                    + "[확인하러 가기](" + taskDetailUrl + ")";
+        return switch (request.notificationType()) {
+            case TASK_REQUESTED -> "📌 *새 작업이 요청되었습니다.*\\n"
+                    + "\\t\\t*• 🔖  작업명:*  " + "*" + request.taskName() + "*" + "\\n"
+                    + "\\t\\t*• 🙋  요청자:*  " + "*" + request.senderName() + "*" + "\\n\\n"
+                    + "\\t[자세히 보기](" + taskDetailUrl + ")";
+
+            case STATUS_SWITCHED -> "작업 상태가 " + "*" + request.message() + "*" + "으로 변경되었습니다.";
+
+            case PROCESSOR_CHANGED -> "담당자가 " + "*" + request.message() + "*" + "으로 변경되었습니다.";
+
+            case PROCESSOR_ASSIGNED -> "작업이 *승인*되었습니다.*\n"
+                    + "\\t\\t*• 👤 담당자:* " + "*" + request.message() + "*";
+
             default -> null;
         };
     }

src/main/java/clap/server/adapter/outbound/api/data/PushNotificationTemplate.java

@@ -9,6 +9,7 @@ public record PushNotificationTemplate(
         String taskName,
         String senderName,
         String message,
-        String commenterName
+        String commenterName,
+        String reason
 ) {
 }

src/main/java/clap/server/adapter/outbound/api/email/EmailTemplateBuilder.java

@@ -30,12 +30,20 @@ public EmailTemplate createWebhookTemplate(PushNotificationTemplate request, Str
                 context.setVariable("title", request.taskName());
                 break;
             case STATUS_SWITCHED:
-                templateName = "status-switched";
-                subject = "[TaskFlow] "+ request.taskName()+ " 작업의 상태가 " + request.message() + "으로 변경되었습니다.";
-                context.setVariable("taskDetailUrl", taskDetailUrl);
-                context.setVariable("receiverName", request.senderName());
-                context.setVariable("title", request.taskName());
-                context.setVariable("status", request.message());
+                if (request.message().equals("TERMINATED")) {
+                    templateName = "task-terminated";
+                    subject = "[TaskFlow] " + request.taskName() + " 작업이 종료되었습니다.";
+                    context.setVariable("taskDetailUrl", taskDetailUrl);
+                    context.setVariable("reason", request.reason());
+                    context.setVariable("title", request.taskName());
+                } else {
+                    templateName = "status-switched";
+                    subject = "[TaskFlow] "+ request.taskName()+ " 작업의 상태가 " + request.message() + "으로 변경되었습니다.";
+                    context.setVariable("taskDetailUrl", taskDetailUrl);
+                    context.setVariable("receiverName", request.senderName());
+                    context.setVariable("title", request.taskName());
+                    context.setVariable("status", request.message());
+                }
                 break;
             case PROCESSOR_CHANGED:
                 templateName = "processor-changed";

src/main/java/clap/server/adapter/outbound/api/kakaoWork/KakaoWorkBlockBuilder.java

@@ -17,7 +17,10 @@ public class KakaoWorkBlockBuilder {
     public String makeObjectBlock(PushNotificationTemplate request, String taskDetailUrl){
         return switch (request.notificationType()) {
             case TASK_REQUESTED -> makeTaskRequestBlock(request, taskDetailUrl);
-            case STATUS_SWITCHED -> makeTaskStatusBlock(request, taskDetailUrl);
+            case STATUS_SWITCHED -> switch (request.message()) { // getStatusChangeType() 메서드로 추가 분기
+                case "TERMINATED" -> makeTerminatedStatusBlock(request, taskDetailUrl);
+                default -> makeTaskStatusBlock(request, taskDetailUrl);
+            };
             case PROCESSOR_CHANGED -> makeProcessorChangeBlock(request, taskDetailUrl);
             case PROCESSOR_ASSIGNED -> makeNewProcessorBlock(request, taskDetailUrl);
             case COMMENT -> makeCommentBlock(request, taskDetailUrl);
@@ -366,4 +369,72 @@ private String makeTaskStatusBlock(PushNotificationTemplate request, String task
 
         return payload;
     }
+
+    private String makeTerminatedStatusBlock(PushNotificationTemplate request, String taskDetailUrl) {
+        Object[] blocks = new Object[]{
+                Map.of(
+                        "type", "header",
+                        "text", "TaskFlow 알림 서비스",
+                        "style", "blue"
+                ),
+                Map.of(
+                        "type", "text",
+                        "text", "TaskFlow 작업 종료 알림",
+                        "inlines", new Object[]{
+                                Map.of(
+                                        "type", "styled",
+                                        "text", "TaskFlow 작업 종료 알림",
+                                        "bold", true
+                                )
+                        }
+                ),
+                Map.of(
+                        "type", "text",
+                        "text", "TaskFlow 작업 종료 알림",
+                        "inlines", new Object[]{
+                                Map.of(
+                                        "type", "styled",
+                                        "text", " - Task Title : " + request.taskName(),
+                                        "bold", false
+                                )
+                        }
+                ),
+                Map.of(
+                        "type", "text",
+                        "text", "TaskFlow 작업 종료 알림",
+                        "inlines", new Object[]{
+                                Map.of(
+                                        "type", "styled",
+                                        "text", " - 거절 사유 : " + request.reason(),
+                                        "bold", false
+                                )
+                        }
+                ),
+                Map.of(
+                        "type", "button",
+                        "text", "확인하기",
+                        "style", "default",
+                        "action", Map.of(
+                                "type", "open_system_browser",
+                                "name", "button1",
+                                "value", taskDetailUrl
+                        )
+                )
+        };
+
+        String payload;
+        try {
+            payload = "{" +
+                    "\"email\":\"" + request.email() + "\"," +
+                    "\"text\":\"작업 종료 알림\"," +
+                    "\"blocks\":" + objectMapper.writeValueAsString(blocks) +
+                    "}";
+        } catch (JsonProcessingException e) {
+            throw new RuntimeException(e);
+        }
+
+        return payload;
+    }
+
+
 }

src/main/java/clap/server/adapter/outbound/persistense/CategoryPersistenceAdapter.java

@@ -50,10 +50,17 @@ public List<Category> findSubCategory() {
     }
 
     @Override
-    public boolean existsByNameOrCode(String name, String code) {
-        return categoryRepository.existsByNameOrCodeAndIsDeletedFalse(name, code);
+    public boolean existsMainCategoryByNameOrCode(String name, String code) {
+        return categoryRepository.existsByNameOrCodeAndMainCategoryIsNullAndIsDeletedFalse(name, code);
     }
 
+    @Override
+    public boolean existsSubCategoryByNameOrCode(Category category, String name, String code) {
+        CategoryEntity categoryEntity = categoryPersistenceMapper.toEntity(category);
+        return categoryRepository.existsByMainCategoryAndIsDeletedFalseAndNameOrCode(categoryEntity, name, code);
+    }
+
+
     @Override
     public void save(final Category category) {
         categoryRepository.save(categoryPersistenceMapper.toEntity(category));

src/main/java/clap/server/adapter/outbound/persistense/repository/log/AnonymousLogCustomRepositoryImpl.java

@@ -29,9 +29,6 @@ public Page<AnonymousLogEntity> filterAnonymousLogs(FilterLogRequest request, Pa
             LocalDateTime fromDate = LocalDateTime.now().minusHours(request.term());
             builder.and(anonymousLogEntity.requestAt.after(fromDate));
         }
-        if (!request.logStatus().isEmpty()) {
-            builder.and(anonymousLogEntity.logStatus.in(request.logStatus()));
-        }
         if (!request.nickName().isEmpty()) {
             builder.and(anonymousLogEntity.loginNickname.contains(request.nickName()));
         }

src/main/java/clap/server/adapter/outbound/persistense/repository/notification/NotificationRepository.java

@@ -5,6 +5,8 @@
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Slice;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -13,7 +15,14 @@
 @Repository
 public interface NotificationRepository extends JpaRepository<NotificationEntity, Long> {
 
-    Slice<NotificationEntity> findAllByReceiver_MemberIdOrderByCreatedAtDesc(Long receiverId, Pageable pageable);
+    @Query("SELECT n FROM NotificationEntity n " +
+            "JOIN FETCH n.task t " +
+            "JOIN FETCH n.receiver r " +
+            "WHERE n.receiver.memberId = :receiverId " +
+            "AND t.isDeleted = false " +
+            "ORDER BY n.createdAt DESC")
+    Slice<NotificationEntity> findAllByReceiver_MemberIdOrderByCreatedAtDesc(
+            @Param("receiverId") Long receiverId, Pageable pageable);
 
     List<NotificationEntity> findAllByReceiver_MemberId(Long memberId);
 

src/main/java/clap/server/adapter/outbound/persistense/repository/task/CategoryRepository.java

@@ -1,6 +1,8 @@
 package clap.server.adapter.outbound.persistense.repository.task;
 import clap.server.adapter.outbound.persistense.entity.task.CategoryEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -12,5 +14,9 @@ public interface CategoryRepository extends JpaRepository<CategoryEntity, Long>
     List<CategoryEntity> findByIsDeletedFalseAndMainCategoryIsNull();
     List<CategoryEntity> findByIsDeletedFalseAndMainCategoryIsNotNull();
 
-    boolean existsByNameOrCodeAndIsDeletedFalse(String name, String code);
+    @Query("SELECT CASE WHEN COUNT(c) > 0 THEN true ELSE false END FROM CategoryEntity c WHERE c.mainCategory IS NULL AND c.isDeleted = false AND (c.name = :name OR c.code = :code)")
+    boolean existsByNameOrCodeAndMainCategoryIsNullAndIsDeletedFalse(@Param("name") String name, @Param("code") String code);
+
+    @Query("SELECT CASE WHEN COUNT(c) > 0 THEN true ELSE false END FROM CategoryEntity c WHERE c.mainCategory = :mainCategory AND c.isDeleted = false AND (c.name = :name OR c.code = :code)")
+    boolean existsByMainCategoryAndIsDeletedFalseAndNameOrCode(@Param("mainCategory")CategoryEntity mainCategory, @Param("name") String name, @Param("code") String code);
 }

src/main/java/clap/server/application/mapper/response/AdminResponseMapper.java

@@ -5,6 +5,7 @@
 
 import java.util.List;
 
+
 public class AdminResponseMapper {
     private AdminResponseMapper() {
         throw new IllegalStateException("Utility class");
@@ -26,7 +27,8 @@ public static RetrieveAllMemberResponse toRetrieveAllMemberResponse(Member membe
                 member.getMemberInfo().getDepartment().getName(),
                 member.getMemberInfo().getRole(),
                 member.getMemberInfo().getDepartmentRole(),
-                member.getCreatedAt()
+                member.getCreatedAt(),
+                member.getStatus()
         );
     }
 }

src/main/java/clap/server/application/mapper/response/CategoryResponseMapper.java

@@ -11,11 +11,11 @@ public class CategoryResponseMapper {
     private CategoryResponseMapper() {throw new IllegalStateException("Utility class");}
 
     public static FindAllCategoryResponse toFindAllCategoryResponse(
-            Long id,
+            Long mainCategoryId,
             String name,
             String code,
             List<FindSubCategoryResponse> subCategoryResponses) {
-        return new FindAllCategoryResponse(id, name, code, subCategoryResponses);
+        return new FindAllCategoryResponse(mainCategoryId, name, code, subCategoryResponses);
     }
 
     public static FindMainCategoryResponse toFindMainCategoryResponse(Category category) {

src/main/java/clap/server/application/port/outbound/task/LoadCategoryPort.java

@@ -12,5 +12,7 @@ public interface LoadCategoryPort {
     List<Category> findMainCategory();
     List<Category> findSubCategory();
 
-    boolean existsByNameOrCode(String name, String code);
+    boolean existsMainCategoryByNameOrCode(String name, String code);
+
+    boolean existsSubCategoryByNameOrCode(Category category, String name, String code);
 }