Merge pull request #430 from TaskFlow-CLAP/CLAP-335

CLAP-335 회원 등록 시에 해당 부서가 담당자 권한을 가지는지 검증 로직 구현

Author: joowojr

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

@@ -1,6 +1,10 @@
 package clap.server.adapter.inbound.web.dto.admin.response;
 
+import io.swagger.v3.oas.annotations.media.Schema;
+
 public record FindAllDepartmentsResponse(
         Long departmentId,
-        String name) {
+        String name,
+        @Schema(description = "담당자 권한 여부")
+        Boolean isManager) {
 }

src/main/java/clap/server/adapter/inbound/web/example/ErrorExampleController.java

@@ -53,7 +53,7 @@ public void getCommentErrorCode() {}
     @GetMapping("/statistic")
     @DevelopOnlyApi
     @Operation(summary = "작업 통계 관련 에러 코드 나열")
-    @ApiErrorCodes(LabelErrorCode.class)
+    @ApiErrorCodes(StatisticsErrorCode.class)
     public void getStatisticsErrorCode() {}
 
     @GetMapping("/label")

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

@@ -4,32 +4,26 @@
 import clap.server.adapter.outbound.persistense.entity.member.MemberEntity;
 import clap.server.adapter.outbound.persistense.entity.member.constant.MemberRole;
 import clap.server.adapter.outbound.persistense.entity.member.constant.MemberStatus;
-import clap.server.adapter.outbound.persistense.entity.task.TaskEntity;
-import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
 import clap.server.adapter.outbound.persistense.mapper.MemberPersistenceMapper;
-import clap.server.adapter.outbound.persistense.mapper.TaskPersistenceMapper;
 import clap.server.adapter.outbound.persistense.repository.member.MemberRepository;
-import clap.server.adapter.outbound.persistense.repository.task.TaskRepository;
 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.member.Member;
-import clap.server.domain.model.task.Task;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
 import java.util.List;
 import java.util.Optional;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 @PersistenceAdapter
 @RequiredArgsConstructor
 public class MemberPersistenceAdapter implements LoadMemberPort, CommandMemberPort {
     private final MemberRepository memberRepository;
     private final MemberPersistenceMapper memberPersistenceMapper;
-    private final TaskRepository taskRepository;
-    private final TaskPersistenceMapper taskPersistenceMapper;
 
     @Override
     public Optional<Member> findById(final Long id) {
@@ -83,14 +77,6 @@ public List<Member> findActiveManagers() {
                 .collect(Collectors.toList());
     }
 
-    @Override
-    public List<Task> findTasksByMemberIdAndStatus(final Long memberId, final List<TaskStatus> taskStatuses) {
-        List<TaskEntity> taskEntities = taskRepository.findByProcessor_MemberIdAndTaskStatusIn(memberId, taskStatuses);
-        return taskEntities.stream()
-                .map(taskPersistenceMapper::toDomain)
-                .collect(Collectors.toList());
-    }
-
     @Override
     public Page<Member> findAllMembers(final Pageable pageable) {
         return memberRepository.findAllMembers(pageable).map(memberPersistenceMapper::toDomain);
@@ -117,4 +103,8 @@ public Optional<Member> findByEmail(final String email) {
                 .map(memberPersistenceMapper::toDomain);
     }
 
+    @Override
+    public boolean existsByNicknamesOrEmails(Set<String> nicknames, Set<String> emails) {
+        return memberRepository.existsByNicknamesOrEmails(nicknames, emails);
+    }
 }

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

@@ -21,6 +21,7 @@
 import java.time.LocalTime;
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 @Slf4j
 @PersistenceAdapter
@@ -116,5 +117,12 @@ public List<Task> findTeamStatus(final Long memberId, final FilterTeamStatusRequ
                 .map(taskPersistenceMapper::toDomain).toList();
     }
 
+    @Override
+    public List<Task> findTasksByMemberIdAndStatus(final Long memberId, final List<TaskStatus> taskStatuses) {
+        List<TaskEntity> taskEntities = taskRepository.findByProcessor_MemberIdAndTaskStatusIn(memberId, taskStatuses);
+        return taskEntities.stream()
+                .map(taskPersistenceMapper::toDomain)
+                .collect(Collectors.toList());
+    }
 
 }

src/main/java/clap/server/adapter/outbound/persistense/entity/member/DepartmentEntity.java

@@ -30,4 +30,7 @@ public class DepartmentEntity extends BaseTimeEntity {
     @Column(nullable = false)
     @Enumerated(EnumType.STRING)
     private DepartmentStatus status;
+
+    @Column(nullable = false)
+    private boolean isManager;
 }

src/main/java/clap/server/adapter/outbound/persistense/mapper/DepartmentPersistenceMapper.java

@@ -10,8 +10,10 @@
 public interface DepartmentPersistenceMapper extends PersistenceMapper<DepartmentEntity, Department> {
 
     @Mapping(source = "admin.memberId", target = "adminId")
+    @Mapping(source = "manager", target = "isManager")
     Department toDomain(DepartmentEntity entity);
 
     @Mapping(source = "adminId", target = "admin.memberId")
+    @Mapping(source = "manager", target = "isManager")
     DepartmentEntity toEntity(Department domain);
 }

src/main/java/clap/server/adapter/outbound/persistense/mapper/MemberPersistenceMapper.java

@@ -45,15 +45,12 @@ protected Member toDomainAdmin(MemberEntity admin) {
         if (admin == null) return null;
         return Member.builder()
                 .memberId(admin.getMemberId())
-                .memberInfo(new MemberInfo(
-                        admin.getName(),
-                        admin.getEmail(),
-                        admin.getNickname(),
-                        admin.isReviewer(),
-                        departmentPersistenceMapper.toDomain(admin.getDepartment()),
-                        admin.getRole(),
-                        admin.getDepartmentRole()
-                ))
+                .memberInfo(MemberInfo.builder()
+                        .name(admin.getName())
+                        .email(admin.getEmail())
+                        .nickname(admin.getNickname())
+                        .isReviewer(admin.isReviewer())
+                        .build())
                 .createdAt(admin.getCreatedAt())
                 .updatedAt(admin.getUpdatedAt())
                 .build();

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

@@ -4,10 +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.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
 import java.util.Optional;
+import java.util.Set;
 
 @Repository
 public interface MemberRepository extends JpaRepository<MemberEntity, Long>,  MemberCustomRepository {
@@ -28,5 +31,8 @@ public interface MemberRepository extends JpaRepository<MemberEntity, Long>,  Me
     Optional<MemberEntity> findByNameAndEmail(String name, String email);
 
     Optional<MemberEntity> findByEmail(String email);
+
+    @Query("SELECT COUNT(m) > 0 FROM MemberEntity m WHERE m.nickname IN :nicknames OR m.email IN :emails")
+    boolean existsByNicknamesOrEmails(@Param("nicknames") Set<String> nicknames, @Param("emails") Set<String> emails);
 }
 

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

@@ -7,7 +7,11 @@ public class DepartmentResponseMapper {
     private DepartmentResponseMapper() {
         throw new IllegalStateException("Utility class");
     }
+
     public static FindAllDepartmentsResponse toFindAllDepartmentsResponse(Department department) {
-        return new FindAllDepartmentsResponse(department.getDepartmentId(), department.getName());
+        return new FindAllDepartmentsResponse(
+                department.getDepartmentId(),
+                department.getName(),
+                department.isManager());
     }
 }

src/main/java/clap/server/application/port/inbound/domain/MemberService.java

@@ -25,11 +25,6 @@ public Member findActiveMember(Long memberId) {
                 () -> new ApplicationException(MemberErrorCode.ACTIVE_MEMBER_NOT_FOUND));
     }
 
-    public int getRemainingTasks(Long memberId) {
-        List<TaskStatus> targetStatuses = List.of(TaskStatus.IN_PROGRESS, TaskStatus.IN_REVIEWING);
-        return loadMemberPort.findTasksByMemberIdAndStatus(memberId, targetStatuses).size();
-    }
-
     public List<Member> findActiveManagers() {
         List<Member> activeManagers = loadMemberPort.findActiveManagers();