🐛 Fix: 3차 추가 요청사항을 수정한다

src/main/java/KUSITMS/WITHUS/domain/application/application/controller/AdminApplicationController.java

@@ -156,6 +156,16 @@ public SuccessResponse<String> sendBulkMail(
         return SuccessResponse.ok("메일을 발송 요청을 보냈습니다.");
     }
 
+    @GetMapping("/recruitment/{recruitmentId}/search")
+    @Operation(summary = "공고 전체 지원자 검색", description = "메일/문자 발송용으로 공고의 전체 지원자를 이름 또는 이메일로 검색합니다.")
+    public SuccessResponse<List<ApplicationResponseDTO.ApplicantForMailSms>> searchApplicants(
+            @PathVariable Long recruitmentId,
+            @RequestParam(required = false) String keyword
+    ) {
+        List<ApplicationResponseDTO.ApplicantForMailSms> applicants = applicationService.searchApplicantsForMailSms(recruitmentId, keyword);
+        return SuccessResponse.ok(applicants);
+    }
+
     @PostMapping("/bulk-sms")
     @Operation(summary = "지원서 대상 다중 문자 발송", description = "복수의 수신자 전화번호와 메시지, 첨부파일(MMS)을 받아 일괄 발송합니다.")
     public SuccessResponse<String> sendBulkSms(

src/main/java/KUSITMS/WITHUS/domain/application/application/dto/ApplicationResponseDTO.java

@@ -555,4 +555,21 @@ public static Applicant from(Application application) {
         }
     }
 
+    @Schema(description = "메일/문자 발송용 지원자 검색 응답 DTO")
+    public record ApplicantForMailSms(
+            @Schema(description = "지원서 ID", example = "1") Long applicationId,
+            @Schema(description = "지원자 이름", example = "홍길동") String name,
+            @Schema(description = "지원자 이메일", example = "hong@example.com") String email,
+            @Schema(description = "프로필 사진 URL", example = "https://example.com/profile.jpg") String profileImageUrl
+    ) {
+        public static ApplicantForMailSms from(Application application) {
+            return new ApplicantForMailSms(
+                    application.getId(),
+                    application.getName(),
+                    application.getEmail(),
+                    application.getImageUrl()
+            );
+        }
+    }
+
 }

src/main/java/KUSITMS/WITHUS/domain/application/application/repository/ApplicationJpaRepository.java

@@ -11,6 +11,7 @@ public interface ApplicationJpaRepository extends JpaRepository<Application, Lon
     List<Application> findByRecruitmentId(Long recruitmentId);
     List<Application> findByRecruitmentIdAndStatusIn(Long recruitmentId, List<ApplicationStatus> statuses);
     List<Application> findByRecruitment_IdAndOrganizationRole_Id(Long recruitmentId, Long organizationRoleId);
+    List<Application> findByRecruitment_IdAndOrganizationRoleIsNull(Long recruitmentId);
     Long countByRecruitment_IdAndOrganizationRole_Id(Long recruitmentId, Long organizationRoleId);
     List<Application> findDistinctByRecruitment_IdAndEvaluators_Evaluator_IdAndEvaluators_EvaluationType(Long recruitmentId, Long evaluatorId, EvaluationType evaluationType);
     Long countByRecruitmentIdAndStatusIn(Long recruitmentId, List<ApplicationStatus> statuses);

src/main/java/KUSITMS/WITHUS/domain/application/application/repository/ApplicationRepository.java

@@ -14,6 +14,7 @@ public interface ApplicationRepository {
     List<Application> findPassedByRecruitment(Long recruitmentId);
     List<Application> findByRecruitmentIdAndStatusIn(Long recruitmentId, List<ApplicationStatus> statuses);
     List<Application> findByRecruitment_IdAndOrganizationRole_Id(Long recruitmentId, Long organizationRoleId);
+    List<Application> findByRecruitment_IdAndOrganizationRoleIsNull(Long recruitmentId);
     Long countByRecruitment_IdAndOrganizationRole_Id(Long recruitmentId, Long organizationRoleId);
     List<Application> findAllById(List<Long> longs);
     List<Application> findDistinctByRecruitment_IdAndEvaluators_Evaluator_IdAndEvaluators_EvaluationType(Long recruitmentId, Long evaluatorId, EvaluationType evaluationType);
@@ -22,4 +23,5 @@ public interface ApplicationRepository {
     List<Application> findForTimeSlot(Long timeSlotId);
     Long findPreviousIdInRecruitment(Long recruitmentId, Long currentId);
     Long findNextIdInRecruitment(Long recruitmentId, Long currentId);
+    List<Application> findByRecruitmentIdAndNameOrEmail(Long recruitmentId, String keyword);
 }

src/main/java/KUSITMS/WITHUS/domain/application/application/repository/ApplicationRepositoryImpl.java

@@ -62,6 +62,11 @@ public List<Application> findByRecruitment_IdAndOrganizationRole_Id(Long recruit
         return applicationJpaRepository.findByRecruitment_IdAndOrganizationRole_Id(recruitmentId, organizationRoleId);
     }
 
+    @Override
+    public List<Application> findByRecruitment_IdAndOrganizationRoleIsNull(Long recruitmentId) {
+        return applicationJpaRepository.findByRecruitment_IdAndOrganizationRoleIsNull(recruitmentId);
+    }
+
     @Override
     public Long countByRecruitment_IdAndOrganizationRole_Id(Long recruitmentId, Long organizationRoleId) {
         return applicationJpaRepository.countByRecruitment_IdAndOrganizationRole_Id(recruitmentId, organizationRoleId);
@@ -154,4 +159,25 @@ public Long findNextIdInRecruitment(Long recruitmentId, Long currentId) {
                 )
                 .fetchOne();
     }
+
+    @Override
+    public List<Application> findByRecruitmentIdAndNameOrEmail(Long recruitmentId, String keyword) {
+        com.querydsl.core.types.dsl.BooleanExpression searchPredicate = null;
+
+        // 키워드가 있으면 이름 또는 이메일로 검색, 없으면 전체 목록 조회
+        if (keyword != null && !keyword.isBlank()) {
+            String searchKeyword = keyword.trim();
+            searchPredicate = application.name.containsIgnoreCase(searchKeyword)
+                    .or(application.email.containsIgnoreCase(searchKeyword));
+        }
+
+        return queryFactory
+                .selectFrom(application)
+                .where(
+                        application.recruitment.id.eq(recruitmentId),
+                        searchPredicate  // null이면 검색 조건 무시되어 전체 목록 조회
+                )
+                .orderBy(application.name.asc())
+                .fetch();
+    }
 }

src/main/java/KUSITMS/WITHUS/domain/application/application/service/ApplicationService.java

@@ -28,4 +28,5 @@ public interface ApplicationService {
     boolean toggleAcquaintance(Long applicationId, Long userId);
     List<ApplicationResponseDTO.CandidateDTO> findTimeslotCandidates(Long recruitmentId, Long timeslotId, String query, boolean excludeCurrent);
     List<ApplicationResponseDTO.Detail> getAllDetailForExcel(Long recruitmentId, AdminStageFilter stage, AdminApplicationSortField sortBy, Sort.Direction direction, List<Long> organizationRoleIds, List<ApplicationStatus> statuses, String keyword, Long id);
+    List<ApplicationResponseDTO.ApplicantForMailSms> searchApplicantsForMailSms(Long recruitmentId, String keyword);
 }

src/main/java/KUSITMS/WITHUS/domain/application/application/service/ApplicationServiceImpl.java

@@ -206,10 +206,13 @@ public ApplicationResponseDTO.Detail getById(Long id, Long currentUserId) {
                 applicantAvailabilityRepository.findByApplicationId(id);
         List<Evaluation> evaluationList =
                 evaluationRepository.findEvaluationsForApplication(id);
+
+        // 공통 평가 기준(organizationRole이 null) + 해당 지원서의 organizationRole과 일치하는 평가 기준만 조회
         List<EvaluationCriteria> criteriaList =
-                evaluationCriteriaRepository.findByTypeAndRecruitment(
+                evaluationCriteriaRepository.findCommonAndByOrganizationRole(
+                        recruitmentId,
                         EvaluationType.DOCUMENT,
-                        recruitmentId
+                        app.getOrganizationRole()
                 );
 
         return assembler.toDetail(
@@ -466,6 +469,20 @@ public List<ApplicationResponseDTO.CandidateDTO> findTimeslotCandidates(
         return applicationRepository.findEligibleCandidates(recruitmentId, timeslotId, q, excludeCurrent);
     }
 
+    /**
+     * 메일/문자 발송용 지원자 검색
+     * @param recruitmentId 공고 ID
+     * @param keyword 검색어 (지원자 이름 또는 이메일)
+     * @return 지원자 목록 (지원서 ID, 이름, 이메일, 프로필 사진 URL)
+     */
+    @Override
+    public List<ApplicationResponseDTO.ApplicantForMailSms> searchApplicantsForMailSms(Long recruitmentId, String keyword) {
+        List<Application> applications = applicationRepository.findByRecruitmentIdAndNameOrEmail(recruitmentId, keyword);
+        return applications.stream()
+                .map(ApplicationResponseDTO.ApplicantForMailSms::from)
+                .toList();
+    }
+
     @Override
     public List<ApplicationResponseDTO.Detail> getAllDetailForExcel(
             Long recruitmentId,

src/main/java/KUSITMS/WITHUS/domain/application/application/service/evaluator/EvaluatorAssignmentService.java

@@ -46,7 +46,9 @@ public void distributeEvaluators(ApplicationEvaluatorRequestDTO.Distribute reque
         // 요청 이력 dto -> 엔티티 매핑
         List<DistributionAssignment> assignments = request.assignments().stream()
                 .map(dto -> {
-                    OrganizationRole role = organizationRoleRepository.getById(dto.organizationRoleId());
+                    OrganizationRole role = dto.organizationRoleId() != null
+                            ? organizationRoleRepository.getById(dto.organizationRoleId())
+                            : null;
                     return DistributionAssignment.builder()
                             .organizationRole(role)
                             .evaluationType(dto.evaluationType())
@@ -77,9 +79,10 @@ public void distributeEvaluators(ApplicationEvaluatorRequestDTO.Distribute reque
                 throw new CustomException(ErrorCode.INSUFFICIENT_EVALUATORS);
             }
 
-            // 이 역할을 지원한 지원서 리스트
-            List<Application> apps = applicationRepository
-                    .findByRecruitment_IdAndOrganizationRole_Id(recruitmentId, part.organizationRoleId());
+            // 이 역할을 지원한 지원서 리스트 (organizationRoleId가 null이면 공통(역할 미지정) 지원서 조회)
+            List<Application> apps = part.organizationRoleId() == null
+                    ? applicationRepository.findByRecruitment_IdAndOrganizationRoleIsNull(recruitmentId)
+                    : applicationRepository.findByRecruitment_IdAndOrganizationRole_Id(recruitmentId, part.organizationRoleId());
 
             // 각 지원서마다 랜덤 n명 배정
             for (Application app : apps) {

src/main/java/KUSITMS/WITHUS/domain/application/applicationEvaluator/dto/ApplicationEvaluatorRequestDTO.java

@@ -27,8 +27,7 @@ public record Distribute(
     ) {
         @Schema(description = "지원 역할(OrganizationRole)별 평가 담당자 배정 정보")
         public record PartAssignment(
-                @Schema(description = "지원 역할(OrganizationRole) ID - 지원서가 지원한 역할", example = "4")
-                @NotNull
+                @Schema(description = "지원 역할(OrganizationRole) ID - null이면 공통(역할 미지정 지원서) 대상", example = "4")
                 Long organizationRoleId,
 
                 @Schema(description = "평가 담당자 Role(OrganizationRole) ID - 평가를 담당할 역할", example = "7")

src/main/java/KUSITMS/WITHUS/domain/application/distributionRequest/dto/DistributionRequestResponseDTO.java

@@ -41,7 +41,7 @@ public record Assignment(
     ) {
         public static Assignment from(DistributionAssignment a) {
             return new Assignment(
-                    a.getOrganizationRole().getName(),
+                    a.getOrganizationRole() != null ? a.getOrganizationRole().getName() : "공통",
                     a.getEvaluationType(),
                     a.getCount()
             );

src/main/java/KUSITMS/WITHUS/domain/application/distributionRequest/entity/DistributionAssignment.java

@@ -22,7 +22,7 @@ public class DistributionAssignment extends BaseEntity {
     private DistributionRequest request;
 
     @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "ORGANIZATION_ROLE_ID", nullable = false)
+    @JoinColumn(name = "ORGANIZATION_ROLE_ID")
     private OrganizationRole organizationRole;
 
     @Enumerated(EnumType.STRING)

src/main/java/KUSITMS/WITHUS/domain/application/distributionRequest/repository/DistributionRequestRepositoryImpl.java

@@ -1,18 +1,22 @@
 package KUSITMS.WITHUS.domain.application.distributionRequest.repository;
 
 import KUSITMS.WITHUS.domain.application.distributionRequest.entity.DistributionRequest;
-import KUSITMS.WITHUS.global.exception.CustomException;
-import KUSITMS.WITHUS.global.exception.ErrorCode;
+import com.querydsl.jpa.impl.JPAQueryFactory;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
+import static KUSITMS.WITHUS.domain.application.distributionRequest.entity.QDistributionRequest.distributionRequest;
+import static KUSITMS.WITHUS.domain.application.distributionRequest.entity.QDistributionAssignment.distributionAssignment;
+import static KUSITMS.WITHUS.domain.organization.organizationRole.entity.QOrganizationRole.organizationRole;
+
 @Repository
 @RequiredArgsConstructor
 public class DistributionRequestRepositoryImpl implements DistributionRequestRepository {
 
     private final DistributionRequestJpaRepository distributionRequestJpaRepository;
+    private final JPAQueryFactory queryFactory;
 
     @Override
     public DistributionRequest findTopByRecruitmentIdOrderByCreatedAtDesc(Long recruitmentId) {
@@ -31,7 +35,14 @@ public DistributionRequest save(DistributionRequest distributionRequest) {
     }
 
     public List<DistributionRequest> findAllByRecruitmentIdOrderByCreatedAtDesc(Long recruitmentId) {
-        return distributionRequestJpaRepository.findAllByRecruitmentIdOrderByCreatedAtDesc(recruitmentId);
+        return queryFactory
+                .selectFrom(distributionRequest)
+                .distinct()
+                .leftJoin(distributionRequest.assignments, distributionAssignment).fetchJoin()
+                .leftJoin(distributionAssignment.organizationRole, organizationRole).fetchJoin()
+                .where(distributionRequest.recruitmentId.eq(recruitmentId))
+                .orderBy(distributionRequest.createdAt.desc())
+                .fetch();
     }
 
 }

src/main/java/KUSITMS/WITHUS/domain/evaluation/evaluationCriteria/repository/EvaluationCriteriaRepository.java

@@ -2,6 +2,7 @@
 
 import KUSITMS.WITHUS.domain.evaluation.evaluationCriteria.entity.EvaluationCriteria;
 import KUSITMS.WITHUS.domain.evaluation.evaluationCriteria.enumerate.EvaluationType;
+import KUSITMS.WITHUS.domain.organization.organizationRole.entity.OrganizationRole;
 
 import java.util.List;
 
@@ -10,5 +11,6 @@ public interface EvaluationCriteriaRepository {
     List<EvaluationCriteria> findByTypeAndRecruitment(EvaluationType type, Long recruitmentId);
     Long countByRecruitment_IdAndEvaluationType(Long recruitmentId, EvaluationType stage);
     List<EvaluationCriteria> findByRecruitment_IdAndEvaluationType(Long recruitmentId, EvaluationType stage);
+    List<EvaluationCriteria> findCommonAndByOrganizationRole(Long recruitmentId, EvaluationType type, OrganizationRole organizationRole);
     List<EvaluationCriteria> findAllById(List<Long> criteriaIds);
 }

src/main/java/KUSITMS/WITHUS/domain/evaluation/evaluationCriteria/repository/EvaluationCriteriaRepositoryImpl.java

@@ -2,18 +2,24 @@
 
 import KUSITMS.WITHUS.domain.evaluation.evaluationCriteria.entity.EvaluationCriteria;
 import KUSITMS.WITHUS.domain.evaluation.evaluationCriteria.enumerate.EvaluationType;
+import KUSITMS.WITHUS.domain.organization.organizationRole.entity.OrganizationRole;
 import KUSITMS.WITHUS.global.exception.CustomException;
 import KUSITMS.WITHUS.global.exception.ErrorCode;
+import com.querydsl.core.types.dsl.BooleanExpression;
+import com.querydsl.jpa.impl.JPAQueryFactory;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
+import static KUSITMS.WITHUS.domain.evaluation.evaluationCriteria.entity.QEvaluationCriteria.evaluationCriteria;
+
 @Repository
 @RequiredArgsConstructor
 public class EvaluationCriteriaRepositoryImpl implements EvaluationCriteriaRepository {
 
     private final EvaluationCriteriaJpaRepository evaluationCriteriaJpaRepository;
+    private final JPAQueryFactory queryFactory;
 
     @Override
     public EvaluationCriteria getById(Long id) {
@@ -35,6 +41,23 @@ public List<EvaluationCriteria> findByRecruitment_IdAndEvaluationType(Long recru
         return evaluationCriteriaJpaRepository.findByRecruitment_IdAndEvaluationType(recruitmentId, stage);
     }
 
+    @Override
+    public List<EvaluationCriteria> findCommonAndByOrganizationRole(Long recruitmentId, EvaluationType type, OrganizationRole organizationRole) {
+        BooleanExpression roleFilter = organizationRole == null
+                ? evaluationCriteria.organizationRole.isNull()
+                : evaluationCriteria.organizationRole.isNull()
+                .or(evaluationCriteria.organizationRole.eq(organizationRole));
+
+        return queryFactory
+                .selectFrom(evaluationCriteria)
+                .where(
+                        evaluationCriteria.recruitment.id.eq(recruitmentId)
+                                .and(evaluationCriteria.evaluationType.eq(type))
+                                .and(roleFilter)
+                )
+                .fetch();
+    }
+
     @Override
     public List<EvaluationCriteria> findAllById(List<Long> criteriaIds) {
         return evaluationCriteriaJpaRepository.findAllById(criteriaIds);

src/main/java/KUSITMS/WITHUS/domain/recruitment/position/dto/PositionResponseDTO.java

@@ -1,5 +1,6 @@
 package KUSITMS.WITHUS.domain.recruitment.position.dto;
 
+import KUSITMS.WITHUS.domain.organization.organizationRole.entity.OrganizationRole;
 import KUSITMS.WITHUS.domain.recruitment.position.entity.Position;
 import io.swagger.v3.oas.annotations.media.Schema;
 
@@ -23,5 +24,17 @@ public static Detail from(Position position) {
                     position.getColor()
             );
         }
+
+        public static Detail from(OrganizationRole organizationRole) {
+            if (organizationRole == null) {
+                return null;
+            }
+
+            return new Detail(
+                    organizationRole.getId(),
+                    organizationRole.getName(),
+                    organizationRole.getColor()
+            );
+        }
     }
 }

src/main/java/KUSITMS/WITHUS/domain/recruitment/position/service/PositionServiceImpl.java

@@ -7,19 +7,28 @@
 import KUSITMS.WITHUS.domain.recruitment.position.repository.PositionRepository;
 import KUSITMS.WITHUS.domain.recruitment.recruitment.entity.Recruitment;
 import KUSITMS.WITHUS.domain.recruitment.recruitment.repository.RecruitmentRepository;
+import com.querydsl.jpa.impl.JPAQueryFactory;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
+import static KUSITMS.WITHUS.domain.recruitment.recruitment.entity.QRecruitment.recruitment;
+import static KUSITMS.WITHUS.domain.recruitment.recruitmentOrganizationRole.entity.QRecruitmentOrganizationRole.recruitmentOrganizationRole;
+import static KUSITMS.WITHUS.domain.organization.organizationRole.entity.QOrganizationRole.organizationRole;
+
+import KUSITMS.WITHUS.global.exception.CustomException;
+import KUSITMS.WITHUS.global.exception.ErrorCode;
+
 @Service
 @Transactional(readOnly = true)
 @RequiredArgsConstructor
 public class PositionServiceImpl implements PositionService {
 
     private final PositionRepository positionRepository;
     private final RecruitmentRepository recruitmentRepository;
+    private final JPAQueryFactory queryFactory;
 
     /**
      * 파트 생성
@@ -53,8 +62,20 @@ public void delete(Long id) {
 
     @Override
     public List<PositionResponseDTO.Detail> findAllByRecruitmentId(Long recruitmentId) {
-        return positionRepository.findAllByRecruitmentId(recruitmentId).stream()
-                .map(PositionResponseDTO.Detail::from)
+        // Recruitment의 RecruitmentOrganizationRole 리스트와 각각의 OrganizationRole을 함께 조회하기 위해 fetch join 사용
+        Recruitment found = queryFactory
+                .selectFrom(recruitment)
+                .leftJoin(recruitment.positions, recruitmentOrganizationRole).fetchJoin()
+                .leftJoin(recruitmentOrganizationRole.organizationRole, organizationRole).fetchJoin()
+                .where(recruitment.id.eq(recruitmentId))
+                .fetchOne();
+
+        if (found == null) {
+            throw new CustomException(ErrorCode.RECRUITMENT_NOT_EXIST);
+        }
+
+        return found.getPositions().stream()
+                .map(ror -> PositionResponseDTO.Detail.from(ror.getOrganizationRole()))
                 .toList();
     }
 }