feat: 서류 지원결과와 최종 합격 결과 API 나누기

hodoon · hodoon · commit 79d3fd519b66 · 2025-02-18T22:53:16.000+09:00
diff --git a/src/main/java/dmu/dasom/api/domain/applicant/repository/ApplicantRepository.java b/src/main/java/dmu/dasom/api/domain/applicant/repository/ApplicantRepository.java
@@ -1,14 +1,20 @@
 package dmu.dasom.api.domain.applicant.repository;
 
 import dmu.dasom.api.domain.applicant.entity.Applicant;
+import dmu.dasom.api.domain.applicant.enums.ApplicantStatus;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 
+import java.util.List;
+
 public interface ApplicantRepository extends JpaRepository<Applicant, Long> {
 
     @Query("SELECT a FROM Applicant a ORDER BY a.id DESC")
     Page<Applicant> findAllWithPageRequest(final Pageable pageable);
 
+    // 상태별 지원자 조회
+    List<Applicant> findByStatus(ApplicantStatus status);
+
 }
diff --git a/src/main/java/dmu/dasom/api/domain/applicant/service/ApplicantService.java b/src/main/java/dmu/dasom/api/domain/applicant/service/ApplicantService.java
@@ -16,6 +16,8 @@ public interface ApplicantService {
 
     ApplicantDetailsResponseDto updateApplicantStatus(final Long id, final ApplicantStatusUpdateRequestDto request);
 
-    void sendEmailsToApplicants();
+    void sendDocumentPassEmailsToApplicants();
+
+    void sendFinalPassEmailsToDocumentPassApplicants();
 
 }
diff --git a/src/main/java/dmu/dasom/api/domain/applicant/service/ApplicantServiceImpl.java b/src/main/java/dmu/dasom/api/domain/applicant/service/ApplicantServiceImpl.java
@@ -5,6 +5,7 @@
 import dmu.dasom.api.domain.applicant.dto.ApplicantResponseDto;
 import dmu.dasom.api.domain.applicant.dto.ApplicantStatusUpdateRequestDto;
 import dmu.dasom.api.domain.applicant.entity.Applicant;
+import dmu.dasom.api.domain.applicant.enums.ApplicantStatus;
 import dmu.dasom.api.domain.applicant.repository.ApplicantRepository;
 import dmu.dasom.api.domain.common.exception.CustomException;
 import dmu.dasom.api.domain.common.exception.ErrorCode;
@@ -64,19 +65,48 @@ public ApplicantDetailsResponseDto updateApplicantStatus(final Long id, final Ap
 
     // 지원자 이메일 보내기
     @Override
-    public void sendEmailsToApplicants(){
+    public void sendDocumentPassEmailsToApplicants(){
         List<Applicant> applicants = applicantRepository.findAll();
 
         if(applicants.isEmpty()) {
             throw new CustomException(ErrorCode.EMPTY_RESULT);
         }
 
-        String subject = "다솜 지원 결과";
+        String subject = "다솜 서류 지원 결과";
 
         for(Applicant applicant : applicants){
             try {
-                emailService.sendEmail(applicant.getEmail(), subject, applicant.getName());
-                log.info("HTML 이메일 전송 완료: {}", applicant.getEmail());
+                emailService.sendEmail(
+                        applicant.getEmail(),
+                        subject,
+                        "document-pass-template",
+                        applicant.getName()
+                );
+                log.info("이메일 전송 완료: {}", applicant.getEmail());
+            } catch (MessagingException e) {
+                log.error("이메일 전송 실패: {}", applicant.getEmail(), e);
+            }
+        }
+    }
+
+    @Override
+    public void sendFinalPassEmailsToDocumentPassApplicants() {
+        List<Applicant> applicants = applicantRepository.findByStatus(ApplicantStatus.DOCUMENT_PASSED);
+
+        if(applicants.isEmpty()){
+            throw new CustomException(ErrorCode.EMPTY_RESULT);
+        }
+
+        String subject = "다솜 최종 합격 결과";
+        for (Applicant applicant : applicants) {
+            try {
+                emailService.sendEmail(
+                        applicant.getEmail(),
+                        subject,
+                        "final-pass-template",
+                        applicant.getName()
+                );
+                log.info("이메일 전송 완료: {}", applicant.getEmail());
             } catch (MessagingException e) {
                 log.error("이메일 전송 실패: {}", applicant.getEmail(), e);
             }
diff --git a/src/main/java/dmu/dasom/api/domain/email/service/EmailService.java b/src/main/java/dmu/dasom/api/domain/email/service/EmailService.java
@@ -21,13 +21,13 @@ public class EmailService {
     @Value("${spring.mail.username}")
     private String from;
 
-    public void sendEmail(String to, String subject, String name) throws MessagingException {
+    public void sendEmail(String to, String subject, String templateName, String name) throws MessagingException {
         // HTML 템플릿에 전달할 데이터 설정
         Context context = new Context();
         context.setVariable("name", name); // 지원자 이름 전달
 
         // HTML 템플릿 처리
-        String htmlBody = templateEngine.process("email-template", context);
+        String htmlBody = templateEngine.process(templateName, context);
 
         // 이메일 생성 및 전송
         MimeMessage message = javaMailSender.createMimeMessage();
diff --git a/src/main/java/dmu/dasom/api/global/admin/controller/AdminController.java b/src/main/java/dmu/dasom/api/global/admin/controller/AdminController.java
@@ -79,7 +79,7 @@ public ResponseEntity<ApplicantDetailsResponseDto> updateApplicantStatus(@PathVa
         return ResponseEntity.ok(applicantService.updateApplicantStatus(id, request));
     }
 
-    @Operation(summary = "지원자 메일 전송")
+    @Operation(summary = "서류 결과 메일 전송")
     @ApiResponses(value = {
             @ApiResponse(responseCode = "200", description = "메일 전송 성공"),
             @ApiResponse(responseCode = "400", description = "잘못된 요청",
@@ -89,15 +89,37 @@ public ResponseEntity<ApplicantDetailsResponseDto> updateApplicantStatus(@PathVa
                             examples = {
                                     @ExampleObject(
                                             name = "전송 실패",
-                                            value = "{ \"code\": \"C013\", \"message\": \"이메일 전송에 실패하였습니다.\" }"
+                                            value = "{ \"code\": \"C014\", \"message\": \"이메일 전송에 실패하였습니다.\" }"
                                     )
                             }
                     )
             )
     })
-    @PostMapping("/applicants/send-email")
-    public ResponseEntity<String> sendEmailsToApplicants() {
-        applicantService.sendEmailsToApplicants();
+    @PostMapping("/applicants/send-document-pass-email")
+    public ResponseEntity<String> sendDocumentPassEmails() {
+        applicantService.sendDocumentPassEmailsToApplicants();
+        return ResponseEntity.ok("이메일 전송 성공");
+    }
+
+    @Operation(summary = "최종 결과 메일 전송")
+    @ApiResponses(value = {
+            @ApiResponse(responseCode = "200", description = "메일 전송 성공"),
+            @ApiResponse(responseCode = "400", description = "잘못된 요청",
+                    content = @Content(
+                            mediaType = "application/json",
+                            schema = @Schema(implementation = ErrorResponse.class),
+                            examples = {
+                                    @ExampleObject(
+                                            name = "전송 실패",
+                                            value = "{ \"code\": \"C014\", \"message\": \"이메일 전송에 실패하였습니다.\" }"
+                                    )
+                            }
+                    )
+            )
+    })
+    @PostMapping("/applicants/send-final-pass-email")
+    public ResponseEntity<String> sendFinalPassEmail(){
+        applicantService.sendFinalPassEmailsToDocumentPassApplicants();
         return ResponseEntity.ok("이메일 전송 성공");
     }
 
diff --git a/src/main/resources/template/email-template.html b/src/main/resources/template/email-template.html
@@ -23,12 +23,12 @@
         .header {
             font-size: 24px;
             font-weight: bold;
-            color: #4caf50;
+            color: #00B493;
             margin-bottom: 20px;
         }
         .sub-header {
             font-size: 16px;
-            background-color: #4caf50;
+            background-color: #00B493;
             padding: 10px;
             border-radius: 5px;
             margin-bottom: 20px;
@@ -41,19 +41,19 @@
             margin-bottom: 10px;
         }
         .highlight {
-            color: #4caf50;
+            color: #00B493;
         }
         .button {
             display: inline-block;
-            background-color: #4caf50;
+            background-color: #00B493;
             color: #ffffff;
             padding: 12px 24px;
             border-radius: 5px;
             text-decoration: none;
             font-size: 16px;
         }
         .button:hover {
-            background-color: #45a049;
+            background-color: #00B493;
         }
     </style>
 </head>
@@ -63,7 +63,7 @@
     <div class="header">DASOM</div>
 
     <!-- Sub-header Section -->
-    <div class="sub-header">컴퓨터 소프트웨어 공학과 전공 동아리 다솜<br>34기 합격자 조회</div>
+    <div class="sub-header">컴퓨터소프트웨어공학과 전공동아리 다솜<br>34기 서류 합격자 조회</div>
 
     <!-- Content Section -->
     <div class="content">

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,8 @@ public interface ApplicantService {`
`16`	`16`
`17`	`17`	`ApplicantDetailsResponseDto updateApplicantStatus(final Long id, final ApplicantStatusUpdateRequestDto request);`
`18`	`18`
`19`		`- void sendEmailsToApplicants();`
	`19`	`+ void sendDocumentPassEmailsToApplicants();`
	`20`	`+`
	`21`	`+ void sendFinalPassEmailsToDocumentPassApplicants();`
`20`	`22`
`21`	`23`	`}`