Merge branch 'dev' of https://github.com/DASOM-GitHub/dasom-web-backend into dev

Author: hodoon

build.gradle

@@ -39,7 +39,9 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-data-redis'
 	implementation 'org.springframework.boot:spring-boot-starter-security'
 	implementation 'org.springframework.boot:spring-boot-starter-validation'
+	implementation 'org.springframework.boot:spring-boot-starter-mail'
 	implementation 'org.springframework.boot:spring-boot-starter-web'
+	implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
 	compileOnly 'org.projectlombok:lombok'
 	developmentOnly 'org.springframework.boot:spring-boot-devtools'
 	runtimeOnly 'com.oracle.database.jdbc:ojdbc11'
@@ -53,6 +55,9 @@ dependencies {
 	implementation 'com.google.auth:google-auth-library-oauth2-http:0.20.0'
 
 
+
+
+
 	implementation 'io.jsonwebtoken:jjwt-api:0.12.6'
 	runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.12.6'
 	runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.12.6'

src/main/java/dmu/dasom/api/domain/applicant/dto/ApplicantCreateRequestDto.java

@@ -1,5 +1,8 @@
 package dmu.dasom.api.domain.applicant.dto;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonSetter;
+import com.fasterxml.jackson.annotation.Nulls;
 import dmu.dasom.api.domain.applicant.entity.Applicant;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.*;
@@ -9,6 +12,11 @@
 @Schema(name = "ApplicantCreateRequestDto", description = "지원자 생성 요청 DTO")
 public class ApplicantCreateRequestDto {
 
+    @NotNull
+    @Size(max = 16)
+    @Schema(description = "이름", example = "홍길동")
+    private String name;
+
     @NotNull
     @Pattern(regexp = "^[0-9]{8}$")
     @Size(min = 8, max = 8)
@@ -39,15 +47,21 @@ public class ApplicantCreateRequestDto {
     private String reasonForApply;
 
     @Size(max = 200)
-    @Schema(description = "활동 희망사항", example = "동아리 활동 참여")
+    @Schema(description = "활동 희망사항", example = "동아리 활동 참여", nullable = true)
     private String activityWish;
 
     @NotNull
     @Schema(description = "개인정보 처리방침 동의 여부", example = "true")
     private Boolean isPrivacyPolicyAgreed;
 
+    @JsonProperty(defaultValue = "false")
+    @JsonSetter(nulls = Nulls.SKIP)
+    @Schema(description = "지원서 덮어쓰기 확인 여부", example = "false", defaultValue = "false", nullable = true)
+    private Boolean isOverwriteConfirmed = false;
+
     public Applicant toEntity() {
         return Applicant.builder()
+                .name(this.name)
                 .studentNo(this.studentNo)
                 .contact(this.contact)
                 .email(this.email)

src/main/java/dmu/dasom/api/domain/applicant/entity/Applicant.java

@@ -1,5 +1,6 @@
 package dmu.dasom.api.domain.applicant.entity;
 
+import dmu.dasom.api.domain.applicant.dto.ApplicantCreateRequestDto;
 import dmu.dasom.api.domain.applicant.dto.ApplicantDetailsResponseDto;
 import dmu.dasom.api.domain.applicant.dto.ApplicantResponseDto;
 import dmu.dasom.api.domain.applicant.enums.ApplicantStatus;
@@ -9,6 +10,7 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.DynamicUpdate;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.LastModifiedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
@@ -17,6 +19,7 @@
 
 @AllArgsConstructor
 @Builder
+@DynamicUpdate
 @Entity
 @EntityListeners(AuditingEntityListener.class)
 @Getter
@@ -32,7 +35,7 @@ public class Applicant {
     @Size(max = 16)
     private String name;
 
-    @Column(name = "student_no", nullable = false, length = 8)
+    @Column(name = "student_no", nullable = false, unique = true, length = 8)
     @Pattern(regexp = "^[0-9]{8}$")
     @Size(min = 8, max = 8)
     private String studentNo;
@@ -105,4 +108,14 @@ public ApplicantDetailsResponseDto toApplicantDetailsResponse() {
                 .build();
     }
 
+    public void overwrite(final ApplicantCreateRequestDto request) {
+        this.name = request.getName();
+        this.contact = request.getContact();
+        this.email = request.getEmail();
+        this.grade = request.getGrade();
+        this.reasonForApply = request.getReasonForApply();
+        this.activityWish = request.getActivityWish();
+        this.isPrivacyPolicyAgreed = request.getIsPrivacyPolicyAgreed();
+    }
+
 }

src/main/java/dmu/dasom/api/domain/applicant/repository/ApplicantRepository.java

@@ -1,14 +1,25 @@
 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;
+
+import java.util.Optional;
+
 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);
+    List<Applicant> findByStatusIn(List<ApplicantStatus> statuses);
+
+    Optional<Applicant> findByStudentNo(final String studentNo);
+
 }

src/main/java/dmu/dasom/api/domain/applicant/service/ApplicantService.java

@@ -4,6 +4,7 @@
 import dmu.dasom.api.domain.applicant.dto.ApplicantDetailsResponseDto;
 import dmu.dasom.api.domain.applicant.dto.ApplicantResponseDto;
 import dmu.dasom.api.domain.applicant.dto.ApplicantStatusUpdateRequestDto;
+import dmu.dasom.api.domain.email.enums.MailType;
 import dmu.dasom.api.global.dto.PageResponse;
 
 public interface ApplicantService {
@@ -16,4 +17,8 @@ public interface ApplicantService {
 
     ApplicantDetailsResponseDto updateApplicantStatus(final Long id, final ApplicantStatusUpdateRequestDto request);
 
+    void sendEmailsToApplicants(MailType mailType);
+
+    ApplicantDetailsResponseDto getApplicantByStudentNo(final String studentNo);
+
 }

src/main/java/dmu/dasom/api/domain/applicant/service/ApplicantServiceImpl.java

@@ -5,26 +5,53 @@
 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;
+import dmu.dasom.api.domain.email.enums.MailType;
+import dmu.dasom.api.domain.email.service.EmailService;
 import dmu.dasom.api.global.dto.PageResponse;
+import jakarta.mail.MessagingException;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Optional;
+
+import java.util.List;
+
+@Slf4j
 @RequiredArgsConstructor
 @Service
+@Transactional
 public class ApplicantServiceImpl implements ApplicantService {
 
     private final static int DEFAULT_PAGE_SIZE = 20;
 
     private final ApplicantRepository applicantRepository;
+    private final EmailService emailService;
 
     // 지원자 저장
     @Override
     public void apply(final ApplicantCreateRequestDto request) {
+        final Optional<Applicant> applicant = findByStudentNo(request.getStudentNo());
+
+        // 이미 지원한 학번이 존재할 경우
+        if (applicant.isPresent()) {
+            // 덮어쓰기 확인 여부가 false일 경우 예외 발생
+            if (!request.getIsOverwriteConfirmed())
+                throw new CustomException(ErrorCode.DUPLICATED_STUDENT_NO);
+
+            // 기존 지원자 정보 갱신 수행
+            applicant.get().overwrite(request);
+            return;
+        }
+
+        // 새로운 지원자일 경우 저장
         applicantRepository.save(request.toEntity());
     }
 
@@ -55,10 +82,51 @@ public ApplicantDetailsResponseDto updateApplicantStatus(final Long id, final Ap
         return applicant.toApplicantDetailsResponse();
     }
 
+    @Override
+    public void sendEmailsToApplicants(MailType mailType) {
+        List<Applicant> applicants;
+
+        // MailType에 따라 지원자 조회
+        switch (mailType) {
+            case DOCUMENT_RESULT:
+                applicants = applicantRepository.findAll();
+                break;
+            case FINAL_RESULT:
+                applicants = applicantRepository.findByStatusIn(
+                        List.of(ApplicantStatus.INTERVIEW_FAILED,
+                                ApplicantStatus.INTERVIEW_PASSED)
+                );
+                break;
+            default:
+                throw new CustomException(ErrorCode.INTERNAL_SERVER_ERROR);
+        }
+
+        for (Applicant applicant : applicants) {
+            try {
+                emailService.sendEmail(applicant.getEmail(), applicant.getName(), mailType);
+            } catch (MessagingException e) {
+                System.err.println("Failed to send email to: " + applicant.getEmail());
+            }
+        }
+    }
+
+    // 학번으로 지원자 조회
+    @Override
+    public ApplicantDetailsResponseDto getApplicantByStudentNo(final String studentNo) {
+        return findByStudentNo(studentNo)
+            .map(Applicant::toApplicantDetailsResponse)
+            .orElseThrow(() -> new CustomException(ErrorCode.ARGUMENT_NOT_VALID));
+    }
+
     // Repository에서 ID로 지원자 조회
     private Applicant findById(final Long id) {
         return applicantRepository.findById(id)
                 .orElseThrow(() -> new CustomException(ErrorCode.EMPTY_RESULT));
     }
 
+    // 학번으로 지원자 존재 여부 확인
+    private Optional<Applicant> findByStudentNo(final String studentNo) {
+        return applicantRepository.findByStudentNo(studentNo);
+    }
+
 }

src/main/java/dmu/dasom/api/domain/common/exception/ErrorCode.java

@@ -18,7 +18,13 @@ public enum ErrorCode {
     INTERNAL_SERVER_ERROR(500, "C009", "서버에 문제가 발생하였습니다."),
     NOT_FOUND(404, "C010", "해당 리소스를 찾을 수 없습니다."),
     WRITE_FAIL(400, "C011", "데이터를 쓰는데 실패하였습니다."),
-    EMPTY_RESULT(400, "C012", "조회 결과가 없습니다.")
+    EMPTY_RESULT(400, "C012", "조회 결과가 없습니다."),
+    DUPLICATED_STUDENT_NO(400, "C013", "이미 등록된 학번입니다."),
+    SEND_EMAIL_FAIL(400, "C014", "이메일 전송에 실패하였습니다."),
+    MAIL_TYPE_NOT_VALID(400, "C015", "메일 타입이 올바르지 않습니다."),
+    INVALID_DATETIME_FORMAT(400, "C016", "날짜 형식이 올바르지 않습니다."),
+    INVALID_TIME_FORMAT(400, "C017", "시간 형식이 올바르지 않습니다."),
+    INVALID_INQUIRY_PERIOD(400, "C018", "조회 기간이 아닙니다.")
     ;
 
     private final int status;

src/main/java/dmu/dasom/api/domain/email/enums/MailType.java

@@ -0,0 +1,6 @@
+package dmu.dasom.api.domain.email.enums;
+
+public enum MailType {
+    DOCUMENT_RESULT, // 서류 합격
+    FINAL_RESULT // 최종 합격
+}

src/main/java/dmu/dasom/api/domain/email/service/EmailService.java

@@ -0,0 +1,74 @@
+package dmu.dasom.api.domain.email.service;
+
+import dmu.dasom.api.domain.common.exception.CustomException;
+import dmu.dasom.api.domain.common.exception.ErrorCode;
+import dmu.dasom.api.domain.email.enums.MailType;
+import jakarta.mail.MessagingException;
+import jakarta.mail.internet.MimeMessage;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.mail.javamail.JavaMailSender;
+import org.springframework.mail.javamail.MimeMessageHelper;
+import org.springframework.stereotype.Service;
+import org.thymeleaf.TemplateEngine;
+import org.thymeleaf.context.Context;
+
+@RequiredArgsConstructor
+@Service
+public class EmailService {
+
+    private JavaMailSender javaMailSender;
+    private TemplateEngine templateEngine;
+    @Value("${spring.mail.username}")
+    private String from;
+
+    public void sendEmail(String to, String name, MailType mailType) throws MessagingException {
+        if (mailType == null){
+            throw new CustomException(ErrorCode.MAIL_TYPE_NOT_VALID);
+        }
+        // 메일 제목 및 템플릿 설정
+        String subject;
+        String emailContent;
+        String buttonUrl = "#";
+        String buttonText;
+        switch (mailType) {
+            case DOCUMENT_RESULT -> {
+                subject = "동양미래대학교 컴퓨터소프트웨어공학과 전공 동아리 DASOM 서류 결과 안내";
+                emailContent = "먼저 다솜 34기에 많은 관심을 갖고 지원해 주셔서 감사드리며,<br>" +
+                        "내부 서류 평가 결과 및 추후 일정에 관해 안내드리고자 이메일을 발송하게 되었습니다.<br>" +
+                        "모집 폼 합/불합 결과는 아래 버튼 혹은 홈페이지를 통해 확인이 가능합니다.";
+                buttonText = "서류 결과 확인하기";
+            }
+            case FINAL_RESULT -> {
+                subject = "동양미래대학교 컴퓨터소프트웨어공학과 전공 동아리 DASOM 최종 합격 안내";
+                emailContent = "먼저 다솜 34기에 많은 관심을 갖고 지원해 주셔서 감사드리며,<br>" +
+                        "최종 면접 결과 및 추후 일정에 관해 안내드리고자 이메일을 발송하게 되었습니다.<br>" +
+                        "모집 폼 합/불합 결과는 아래 버튼 혹은 홈페이지를 통해 확인이 가능합니다.";
+                buttonText = "최종 결과 확인하기";
+            }
+            default -> throw new IllegalStateException("Unexpected value: " + mailType);
+        }
+
+        // HTML 템플릿에 전달할 데이터 설정
+        Context context = new Context();
+        context.setVariable("name", name); // 지원자 이름 전달
+        context.setVariable("emailContent", emailContent); // 이메일 내용 전달
+        context.setVariable("buttonUrl", buttonUrl); // 버튼 링크 전달
+        context.setVariable("buttonText", buttonText);
+
+        // HTML 템플릿 처리
+        String htmlBody = templateEngine.process("email-template", context);
+
+        // 이메일 생성 및 전송
+        MimeMessage message = javaMailSender.createMimeMessage();
+        MimeMessageHelper helper = new MimeMessageHelper(message, true, "UTF-8");
+
+        helper.setTo(to);
+        helper.setSubject(subject);
+        helper.setText(htmlBody, true);
+        helper.setFrom(from);
+
+        javaMailSender.send(message);
+    }
+
+}

src/main/java/dmu/dasom/api/domain/member/controller/MemberController.java

@@ -64,6 +64,7 @@ public ResponseEntity<Void> tokenRotation(@AuthenticationPrincipal final UserDet
         final HttpHeaders headers = new HttpHeaders();
         headers.add("Access-Token", tokenBox.getAccessToken());
         headers.add("Refresh-Token", tokenBox.getRefreshToken());
+        headers.add("Authority", tokenBox.getAuthority());
 
         return ResponseEntity.ok().headers(headers).build();
     }