메인 머지 (10/9) Merge pull request #169

메인 머지 (10/9)

Author: sso0om

back/.env.default

@@ -1,3 +1,5 @@
 CUSTOM__JWT__SECRET_KEY=NEED_TO_SET
 DB_USERNAME=NEED_TO_SET
 DB_PASSWORD=NEED_TO_SET
+MAIL_USERNAME=NEED_TO_SET
+MAIL_PASSWORD=NEED_TO_SET

back/build.gradle.kts

@@ -39,6 +39,7 @@ dependencies {
 	implementation("org.springframework.boot:spring-boot-starter-security")
 	implementation("org.springframework.boot:spring-boot-starter-web")
 	implementation ("org.springframework.boot:spring-boot-starter-data-redis")
+	implementation("org.springframework.boot:spring-boot-starter-mail")
 
 	// QueryDSL
 	implementation("com.querydsl:querydsl-jpa:5.0.0:jakarta")
@@ -65,8 +66,12 @@ dependencies {
 	implementation ("software.amazon.awssdk:s3:2.25.0")
 
 	implementation ("org.springframework.kafka:spring-kafka")
+	implementation("org.springframework.boot:spring-boot-starter-websocket")
 
 	runtimeOnly("com.mysql:mysql-connector-j")
+
+	// Sentry
+	implementation("io.sentry:sentry-spring-boot-starter-jakarta:8.19.1")
 }
 
 tasks.withType<Test> {

back/src/main/java/com/back/BackApplication.java

@@ -3,9 +3,11 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication
 @EnableJpaAuditing
+@EnableScheduling
 public class BackApplication {
 
 	public static void main(String[] args) {

back/src/main/java/com/back/domain/file/video/controller/VideoController.java

@@ -6,6 +6,7 @@
 import com.back.global.rsData.RsData;
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -16,15 +17,16 @@ public class VideoController {
     private final FileManager fileManager;
 
     @GetMapping("/videos/upload")
-    @Operation(summary="업로드용 URL 요청", description="파일 업로드를 위한 Presigned URL을 발급받습니다.")
+    @PreAuthorize("hasRole('ADMIN')")
+    @Operation(summary = "업로드용 URL 요청", description = "파일 업로드를 위한 Presigned URL을 발급받습니다.")
     public RsData<UploadUrlGetResponse> getUploadUrl() {
         PresignedUrlResponse uploadUrl = fileManager.getUploadUrl();
         UploadUrlGetResponse response = new UploadUrlGetResponse(uploadUrl.url().toString(), uploadUrl.expiresAt());
         return new RsData<>("200", "업로드용 URL 요청완료", response);
     }
 
     @GetMapping("/videos/download")
-    @Operation(summary="다운로드용 URL 요청", description="파일 다운로드를 위한 Presigned URL을 발급받습니다.")
+    @Operation(summary = "다운로드용 URL 요청", description = "파일 다운로드를 위한 Presigned URL을 발급받습니다.")
     public RsData<UploadUrlGetResponse> getDownloadUrls(@RequestParam String objectKey) {
         PresignedUrlResponse downloadUrl = fileManager.getDownloadUrl(objectKey);
         UploadUrlGetResponse response = new UploadUrlGetResponse(downloadUrl.url().toString(), downloadUrl.expiresAt());

back/src/main/java/com/back/domain/member/member/email/EmailService.java

@@ -0,0 +1,118 @@
+package com.back.domain.member.member.email;
+
+import com.back.global.exception.ServiceException;
+import jakarta.mail.MessagingException;
+import jakarta.mail.internet.MimeMessage;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.mail.javamail.JavaMailSender;
+import org.springframework.mail.javamail.MimeMessageHelper;
+import org.springframework.stereotype.Service;
+
+import java.io.UnsupportedEncodingException;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+@ConditionalOnBean(JavaMailSender.class)
+public class EmailService {
+    private final JavaMailSender mailSender;
+
+    /**
+     * 간단한 텍스트 이메일 발송
+     */
+    public void sendSimpleEmail(String to, String subject, String text) {
+        try {
+            MimeMessage message = mailSender.createMimeMessage();
+            MimeMessageHelper helper = new MimeMessageHelper(message, true, "UTF-8");
+
+            helper.setFrom("[email protected]", "JobMate");
+            helper.setTo(to);
+            helper.setSubject(subject);
+            helper.setText(text, false); // false = plain text
+
+            mailSender.send(message);
+            log.info("텍스트 이메일 발송 성공: {}", to);
+        } catch (MessagingException | UnsupportedEncodingException e) {
+            log.error("텍스트 이메일 발송 실패: {}", to, e);
+            throw new ServiceException("500-1", "텍스트 이메일 발송에 실패했습니다.");
+        }
+    }
+
+    /**
+     * HTML 이메일 발송
+     */
+    public void sendHtmlEmail(String to, String subject, String htmlContent) {
+        try {
+            MimeMessage message = mailSender.createMimeMessage();
+            MimeMessageHelper helper = new MimeMessageHelper(message, true, "UTF-8");
+
+            helper.setFrom("[email protected]", "JobMate");
+            helper.setTo(to);
+            helper.setSubject(subject);
+            helper.setText(htmlContent, true); // true = HTML
+
+            mailSender.send(message);
+            log.info("HTML 이메일 발송 성공: {}", to);
+        } catch (MessagingException | UnsupportedEncodingException e) {
+            log.error("HTML 이메일 발송 실패: {}", to, e);
+            throw new ServiceException("500-2", "HTML 이메일 발송에 실패했습니다.");
+        }
+    }
+
+    /**
+     * 인증번호 이메일 발송 (멘토 회원가입용)
+     */
+    public void sendVerificationCode(String to, String verificationCode) {
+        String subject = "[FiveLogic] 멘토 회원가입 인증번호";
+        String htmlContent = buildVerificationEmailHtml(verificationCode);
+        sendHtmlEmail(to, subject, htmlContent);
+    }
+
+    /**
+     * 인증번호 이메일 HTML 템플릿
+     */
+    private String buildVerificationEmailHtml(String verificationCode) {
+        return """
+                <!DOCTYPE html>
+                <html>
+                <head>
+                    <meta charset="UTF-8">
+                    <style>
+                        body { font-family: Arial, sans-serif; line-height: 1.6; color: #333; }
+                        .container { max-width: 600px; margin: 0 auto; padding: 20px; }
+                        .header { background-color: #4CAF50; color: white; padding: 20px; text-align: center; }
+                        .content { padding: 30px; background-color: #f9f9f9; }
+                        .code-box { background-color: #fff; border: 2px solid #4CAF50; padding: 20px; text-align: center; margin: 20px 0; }
+                        .code { font-size: 32px; font-weight: bold; color: #4CAF50; letter-spacing: 5px; }
+                        .footer { text-align: center; padding: 20px; color: #666; font-size: 12px; }
+                    </style>
+                </head>
+                <body>
+                    <div class="container">
+                        <div class="header">
+                            <h1>JobMate 멘토 회원가입</h1>
+                        </div>
+                        <div class="content">
+                            <h2>인증번호 확인</h2>
+                            <p>안녕하세요. FiveLogic입니다.</p>
+                            <p>멘토 회원가입을 위한 인증번호를 안내드립니다.</p>
+                            <p>아래 인증번호를 입력하여 회원가입을 완료해주세요.</p>
+
+                            <div class="code-box">
+                                <div class="code">%s</div>
+                            </div>
+
+                            <p><strong>※ 인증번호는 5분간 유효합니다.</strong></p>
+                            <p>본인이 요청하지 않은 경우, 이 메일을 무시하셔도 됩니다.</p>
+                        </div>
+                        <div class="footer">
+                            <p>© 2025 FiveLogic. All rights reserved.</p>
+                        </div>
+                    </div>
+                </body>
+                </html>
+                """.formatted(verificationCode);
+    }
+}

back/src/main/java/com/back/domain/member/member/service/MemberStorage.java

@@ -2,6 +2,7 @@
 
 import com.back.domain.member.member.entity.Member;
 import com.back.domain.member.member.error.MemberErrorCode;
+import com.back.domain.member.member.repository.MemberRepository;
 import com.back.domain.member.mentee.entity.Mentee;
 import com.back.domain.member.mentee.repository.MenteeRepository;
 import com.back.domain.member.mentor.entity.Mentor;
@@ -13,7 +14,7 @@
 @Component
 @RequiredArgsConstructor
 public class MemberStorage {
-
+    private final MemberRepository memberRepository;
     private final MentorRepository mentorRepository;
     private final MenteeRepository menteeRepository;
 
@@ -39,4 +40,9 @@ public Mentee findMenteeByMember(Member member) {
     public boolean existsMentorById(Long mentorId) {
         return mentorRepository.existsById(mentorId);
     }
+
+    public Member findMemberByEmail(String email) {
+        return memberRepository.findByEmail(email)
+            .orElseThrow(() -> new ServiceException(MemberErrorCode.NOT_FOUND_MEMBER));
+    }
 }

back/src/main/java/com/back/domain/member/member/verification/EmailVerificationService.java

@@ -1,31 +1,42 @@
 package com.back.domain.member.member.verification;
 
+import com.back.domain.member.member.email.EmailService;
 import com.back.global.exception.ServiceException;
-import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.security.SecureRandom;
 import java.time.Duration;
 import java.util.Optional;
 
 @Service
-@RequiredArgsConstructor
 @Slf4j
 public class EmailVerificationService {
     private final VerificationCodeStore codeStore;
+    private final Optional<EmailService> emailService;
     private static final Duration CODE_TTL = Duration.ofMinutes(5);
     private static final SecureRandom random = new SecureRandom();
 
+    public EmailVerificationService(VerificationCodeStore codeStore,
+                                     @Autowired(required = false) EmailService emailService) {
+        this.codeStore = codeStore;
+        this.emailService = Optional.ofNullable(emailService);
+    }
+
     public String generateAndSendCode(String email) {
         // 6자리 랜덤 코드 생성
         String code = String.format("%06d", random.nextInt(1000000));
 
         // 저장
         codeStore.saveCode(email, code, CODE_TTL);
 
-        // TODO: 실제 이메일 발송 로직 추가 (JavaMailSender)
-        log.info("Generated verification code for {}: {}", email, code);
+        // 이메일 발송 (EmailService가 있을 때만)
+        emailService.ifPresentOrElse(
+                service -> service.sendVerificationCode(email, code),
+                () -> log.info("EmailService not available - verification code: {}", code)
+        );
+        log.info("Generated and sent verification code for {}: {}", email, code);
 
         return code; // 테스트용으로 반환 (실제로는 이메일로만 전송)
     }
@@ -45,4 +56,4 @@ public void verifyCode(String email, String inputCode) {
         codeStore.deleteCode(email);
         log.info("Email verification successful for: {}", email);
     }
-}
+}

back/src/main/java/com/back/domain/mentoring/mentoring/controller/ReviewController.java

@@ -25,7 +25,7 @@ public class ReviewController {
     private final ReviewService reviewService;
 
     @GetMapping("/mentorings/{mentoringId}/reviews")
-    @Operation(summary = "멘토링 리뷰 조회", description = "멘토링 리뷰 목록을 조회합니다.")
+    @Operation(summary = "멘토링 리뷰 목록 조회", description = "멘토링 리뷰 목록을 조회합니다.")
     public RsData<ReviewPagingResponse> getReviews(
         @PathVariable Long mentoringId,
         @RequestParam(defaultValue = "0") int page,

back/src/main/java/com/back/domain/mentoring/mentoring/dto/MentoringDetailDto.java

@@ -17,6 +17,8 @@ public record MentoringDetailDto(
     String bio,
     @Schema(description = "멘토링 썸네일")
     String thumb,
+    @Schema(description = "멘토링 평점")
+    Double rating,
     @Schema(description = "생성일")
     LocalDateTime createDate,
     @Schema(description = "수정일")
@@ -29,6 +31,7 @@ public static MentoringDetailDto from(Mentoring mentoring) {
             mentoring.getTagNames(),
             mentoring.getBio(),
             mentoring.getThumb(),
+            mentoring.getRating(),
             mentoring.getCreateDate(),
             mentoring.getModifyDate()
         );

back/src/main/java/com/back/domain/mentoring/mentoring/dto/request/MentoringRequest.java

@@ -7,18 +7,18 @@
 import java.util.List;
 
 public record MentoringRequest(
-    @Schema(description = "멘토링 제목")
+    @Schema(description = "멘토링 제목", example = "title")
     @NotNull @Size(max = 100)
     String title,
 
     @Schema(description = "멘토링 태그", example = "[\"Java\", \"Spring\"]")
     List<String> tags,
 
-    @Schema(description = "멘토링 소개")
+    @Schema(description = "멘토링 소개", example = "bio")
     @NotNull
     String bio,
 
-    @Schema(description = "멘토링 썸네일")
+    @Schema(description = "멘토링 썸네일", example = "test.png")
     String thumb
 ) {
 }