Merge pull request #235 from TaskFlow-CLAP/CLAP-213

CLAP-213 작업 도메인 레이어의 비즈니스 규칙과 정책을 분리

Author: joowojr

src/main/java/clap/server/adapter/inbound/web/admin/FindMemberController.java

@@ -3,8 +3,8 @@
 import clap.server.adapter.inbound.web.dto.admin.FindMemberRequest;
 import clap.server.adapter.inbound.web.dto.admin.RetrieveAllMemberResponse;
 import clap.server.application.mapper.RetrieveAllMemberMapper;
-import clap.server.application.port.inbound.management.FindAllMembersUsecase;
-import clap.server.application.port.inbound.management.FindMembersWithFilterUsecase;
+import clap.server.application.port.inbound.admin.FindAllMembersUsecase;
+import clap.server.application.port.inbound.admin.FindMembersWithFilterUsecase;
 import clap.server.domain.model.member.Member;
 import clap.server.exception.ApplicationException;
 import clap.server.exception.code.MemberErrorCode;

src/main/java/clap/server/adapter/inbound/web/task/TaskBoardController.java

@@ -8,6 +8,7 @@
 import clap.server.application.port.inbound.task.FilterTaskBoardUsecase;
 import clap.server.application.port.inbound.task.UpdateTaskBoardUsecase;
 import clap.server.application.port.inbound.task.GetTaskBoardUsecase;
+import clap.server.application.port.inbound.task.UpdateTaskOrderAndStatusUsecase;
 import clap.server.common.annotation.architecture.WebAdapter;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -35,15 +36,16 @@ public class TaskBoardController {
     private final GetTaskBoardUsecase getTaskBoardUsecase;
     private final FilterTaskBoardUsecase filterTaskBoardUsecase;
     private final UpdateTaskBoardUsecase updateTaskBoardUsecase;
+    private final UpdateTaskOrderAndStatusUsecase updateTaskOrderAndStatus;
 
     @Operation(summary = "작업 보드 조회 API")
     @Secured({"ROLE_MANAGER"})
-    @PostMapping
+    @GetMapping
     public ResponseEntity<TaskBoardResponse> getTaskBoard(@RequestParam(defaultValue = "0") int page,
                                                           @RequestParam(defaultValue = "20") int pageSize,
-                                                          @Parameter(description = "완료 일자 조회 기준, yyyy-mm-dd 형식으로 입력합니다.") @RequestParam(required = false)
+                                                          @Parameter(description = "작업 완료 일자 조회 기준, yyyy-mm-dd 형식으로 입력합니다.") @RequestParam(required = false)
                                                           @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate untilDate,
-                                                          @io.swagger.v3.oas.annotations.parameters.RequestBody(description = "필터링 조회 request") @RequestBody(required = false) FilterTaskBoardRequest request,
+                                                          @io.swagger.v3.oas.annotations.parameters.RequestBody(description = "필터링 조회 request") @ModelAttribute FilterTaskBoardRequest request,
                                                           @AuthenticationPrincipal SecurityUserDetails userInfo) {
         Pageable pageable = PageRequest.of(page, pageSize);
         if (request != null) {
@@ -62,7 +64,7 @@ public void updateTaskBoard(@Parameter(description = "전환될 작업의 상태
         if (status == null) {
             updateTaskBoardUsecase.updateTaskOrder(userInfo.getUserId(), request);
         } else {
-            updateTaskBoardUsecase.updateTaskOrderAndStatus(userInfo.getUserId(), request, status);
+            updateTaskOrderAndStatus.updateTaskOrderAndStatus(userInfo.getUserId(), request, status);
         }
     }
 

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

@@ -8,38 +8,20 @@
 import clap.server.application.port.outbound.member.CommandMemberPort;
 import clap.server.application.port.outbound.member.LoadMemberPort;
 import clap.server.common.annotation.architecture.PersistenceAdapter;
-import clap.server.domain.model.task.Task;
-import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus ;
-import clap.server.adapter.outbound.persistense.entity.task.TaskEntity;
-import clap.server.adapter.outbound.persistense.repository.task.TaskRepository;
-import clap.server.adapter.outbound.persistense.mapper.TaskPersistenceMapper;
-
-import java.util.stream.Collectors;
-import java.util.List;
-
 import clap.server.domain.model.member.Member;
-import com.querydsl.core.BooleanBuilder;
-import com.querydsl.jpa.impl.JPAQueryFactory;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import static clap.server.adapter.outbound.persistense.entity.member.QMemberEntity.memberEntity;
-
 @PersistenceAdapter
 @RequiredArgsConstructor
-    public class MemberPersistenceAdapter implements LoadMemberPort, CommandMemberPort {
+public class MemberPersistenceAdapter implements LoadMemberPort, CommandMemberPort {
     private final MemberRepository memberRepository;
     private final MemberPersistenceMapper memberPersistenceMapper;
-    private final TaskRepository taskRepository;
-    private final TaskPersistenceMapper taskPersistenceMapper;
-    private final JPAQueryFactory jpaQueryFactory;
-
 
     @Override
     public Optional<Member> findById(final Long id) {
@@ -82,61 +64,13 @@ public void save(final Member member) {
 
     @Override
     public Page<Member> findAllMembers(Pageable pageable) {
-        return executeQueryWithPageable(pageable, new BooleanBuilder().and(memberEntity.status.ne(MemberStatus.DELETED)));
+        return memberRepository.findAllMembers(pageable).map(memberPersistenceMapper::toDomain);
     }
 
     @Override
     public Page<Member> findMembersWithFilter(Pageable pageable, FindMemberRequest filterRequest) {
-        BooleanBuilder whereClause = createMemberFilter(filterRequest);
-        return executeQueryWithPageable(pageable, whereClause);
-    }
-
-    // 공통 쿼리 처리
-    private Page<Member> executeQueryWithPageable(Pageable pageable, BooleanBuilder whereClause) {
-        List<MemberEntity> entities = jpaQueryFactory
-                .selectFrom(memberEntity)
-                .where(whereClause)
-                .offset(pageable.getOffset())
-                .limit(pageable.getPageSize())
-                .fetch();
-
-        long total = jpaQueryFactory
-                .select(memberEntity.count())
-                .from(memberEntity)
-                .where(whereClause)
-                .fetchOne();
-
-        return new PageImpl<>(
-                entities.stream()
-                        .map(memberPersistenceMapper::toDomain)
-                        .toList(),
-                pageable,
-                total
-        );
-    }
-
-    // 필터 조건 생성
-    private BooleanBuilder createMemberFilter(FindMemberRequest filterRequest) {
-        BooleanBuilder whereClause = new BooleanBuilder();
-        whereClause.and(memberEntity.status.ne(MemberStatus.DELETED));
-
-        if (filterRequest.name() != null) {
-            whereClause.and(memberEntity.name.containsIgnoreCase(filterRequest.name()));
-        }
-        if (filterRequest.email() != null) {
-            whereClause.and(memberEntity.email.containsIgnoreCase(filterRequest.email()));
-        }
-        if (filterRequest.nickName() != null) {
-            whereClause.and(memberEntity.nickname.containsIgnoreCase(filterRequest.nickName()));
-        }
-        if (filterRequest.departmentName() != null) {
-            whereClause.and(memberEntity.department.name.containsIgnoreCase(filterRequest.departmentName()));
-        }
-        if (filterRequest.role() != null) {
-            whereClause.and(memberEntity.role.eq(filterRequest.role()));
-        }
+        return memberRepository.findMembersWithFilter(pageable, filterRequest).map(memberPersistenceMapper::toDomain);
 
-        return whereClause;
     }
 }
 

src/main/java/clap/server/adapter/outbound/persistense/entity/task/constant/TaskStatus.java

@@ -1,11 +1,8 @@
 package clap.server.adapter.outbound.persistense.entity.task.constant;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
-import java.util.List;
-
 @Getter
 @RequiredArgsConstructor
 public enum TaskStatus {
@@ -16,11 +13,4 @@ public enum TaskStatus {
     TERMINATED("종료");
 
     private final String description;
-
-    public static List<TaskStatus> getTaskBoardStatusList() {
-        return List.of(
-                TaskStatus.IN_PROGRESS,
-                TaskStatus.PENDING_COMPLETED,
-                TaskStatus.COMPLETED);
-    }
 }

src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberCustomRepository.java

@@ -0,0 +1,11 @@
+package clap.server.adapter.outbound.persistense.repository.member;
+
+import clap.server.adapter.inbound.web.dto.admin.FindMemberRequest;
+import clap.server.adapter.outbound.persistense.entity.member.MemberEntity;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+
+public interface MemberCustomRepository {
+    Page<MemberEntity> findAllMembers(Pageable pageable);
+    Page<MemberEntity> findMembersWithFilter(Pageable pageable, FindMemberRequest filterRequest) ;
+}

src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberCustomRepositoryImpl.java

@@ -0,0 +1,78 @@
+package clap.server.adapter.outbound.persistense.repository.member;
+
+import clap.server.adapter.inbound.web.dto.admin.FindMemberRequest;
+import clap.server.adapter.outbound.persistense.entity.member.MemberEntity;
+import clap.server.adapter.outbound.persistense.entity.member.constant.MemberStatus;
+import com.querydsl.core.BooleanBuilder;
+import com.querydsl.jpa.impl.JPAQueryFactory;
+import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+import static clap.server.adapter.outbound.persistense.entity.member.QMemberEntity.memberEntity;
+
+@Repository
+@RequiredArgsConstructor
+public class MemberCustomRepositoryImpl implements MemberCustomRepository {
+    private final JPAQueryFactory queryFactory;
+
+    private Page<MemberEntity> executeQueryWithPageable(Pageable pageable, BooleanBuilder whereClause) {
+        List<MemberEntity> result = queryFactory
+                .selectFrom(memberEntity)
+                .where(whereClause)
+                .offset(pageable.getOffset())
+                .limit(pageable.getPageSize())
+                .fetch();
+
+        long total = queryFactory
+                .select(memberEntity.count())
+                .from(memberEntity)
+                .where(whereClause)
+                .fetch().size();
+
+        return new PageImpl<>(
+                result,
+                pageable,
+                total
+        );
+    }
+
+    // 필터 조건 생성
+    private BooleanBuilder createMemberFilter(FindMemberRequest filterRequest) {
+        BooleanBuilder whereClause = new BooleanBuilder();
+        whereClause.and(memberEntity.status.ne(MemberStatus.DELETED));
+
+        if (filterRequest.name() != null) {
+            whereClause.and(memberEntity.name.containsIgnoreCase(filterRequest.name()));
+        }
+        if (filterRequest.email() != null) {
+            whereClause.and(memberEntity.email.containsIgnoreCase(filterRequest.email()));
+        }
+        if (filterRequest.nickName() != null) {
+            whereClause.and(memberEntity.nickname.containsIgnoreCase(filterRequest.nickName()));
+        }
+        if (filterRequest.departmentName() != null) {
+            whereClause.and(memberEntity.department.name.eq(filterRequest.departmentName()));
+        }
+        if (filterRequest.role() != null) {
+            whereClause.and(memberEntity.role.eq(filterRequest.role()));
+        }
+
+        return whereClause;
+    }
+
+    @Override
+    public Page<MemberEntity> findAllMembers(Pageable pageable) {
+        return executeQueryWithPageable(pageable, new BooleanBuilder().and(memberEntity.status.ne(MemberStatus.DELETED)));
+    }
+
+    @Override
+    public Page<MemberEntity> findMembersWithFilter(Pageable pageable, FindMemberRequest filterRequest) {
+        BooleanBuilder whereClause = createMemberFilter(filterRequest);
+        return executeQueryWithPageable(pageable, whereClause);
+    }
+}

src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberRepository.java

@@ -4,14 +4,13 @@
 import clap.server.adapter.outbound.persistense.entity.member.constant.MemberRole;
 import clap.server.adapter.outbound.persistense.entity.member.constant.MemberStatus;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
 import java.util.Optional;
 
 @Repository
-public interface MemberRepository extends JpaRepository<MemberEntity, Long>, JpaSpecificationExecutor<MemberEntity> {
+public interface MemberRepository extends JpaRepository<MemberEntity, Long>,  MemberCustomRepository {
 
 
     List<MemberEntity> findByRoleAndStatus(MemberRole role, MemberStatus status);
@@ -23,6 +22,9 @@ public interface MemberRepository extends JpaRepository<MemberEntity, Long>, Jpa
 
     List<MemberEntity> findByIsReviewerTrue();
 
+    List<MemberEntity> findAll(); // 전체 회원 조회
+
+
     Optional<MemberEntity> findByMemberIdAndIsReviewerTrue(Long memberId);
 }
 

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

@@ -18,7 +18,8 @@
 import java.util.List;
 
 import static clap.server.adapter.outbound.persistense.entity.task.QTaskEntity.taskEntity;
-import static com.querydsl.core.types.Order.*;
+import static com.querydsl.core.types.Order.ASC;
+import static com.querydsl.core.types.Order.DESC;
 
 @Repository
 @RequiredArgsConstructor

src/main/java/clap/server/application/mapper/AttachmentMapper.java

@@ -28,18 +28,6 @@ public static List<Attachment> toTaskAttachments(Task task, List<MultipartFile>
                 .toList();
     }
 
-    public static List<Attachment> toCommentAttachments(Task task, Comment comment, List<MultipartFile> files, List<String> fileUrls) {
-        return IntStream.range(0, files.size())
-                .mapToObj(i -> createCommentAttachment(
-                        task,
-                        comment,
-                        files.get(i).getOriginalFilename(),
-                        fileUrls.get(i),
-                        files.get(i).getSize()
-                ))
-                .toList();
-    }
-
 
     public static List<AttachmentResponse> toAttachmentResponseList(List<Attachment> attachments) {
         return attachments.stream()

src/main/java/clap/server/application/port/inbound/admin/FindAllMembersUsecase.java

@@ -0,0 +1,9 @@
+package clap.server.application.port.inbound.admin;
+
+import clap.server.domain.model.member.Member;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+
+public interface FindAllMembersUsecase {
+    Page<Member> findAllMembers(Pageable pageable);
+}