[COZY-440] fix: 사용자 탈퇴시 탈퇴사유 요청받아서 메일 보내기 #213
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,6 +2,7 @@ | |
|
|
||
|
|
||
| import com.cozymate.cozymate_server.domain.auth.dto.TokenResponseDTO; | ||
| import com.cozymate.cozymate_server.domain.auth.service.AuthService; | ||
| import com.cozymate.cozymate_server.domain.auth.userdetails.MemberDetails; | ||
| import com.cozymate.cozymate_server.domain.mail.MailAuthentication; | ||
| import com.cozymate.cozymate_server.domain.mail.converter.MailConverter; | ||
|
|
@@ -10,7 +11,7 @@ | |
| import com.cozymate.cozymate_server.domain.mail.dto.response.VerifyResponseDTO; | ||
| import com.cozymate.cozymate_server.domain.mail.repository.MailRepository; | ||
| import com.cozymate.cozymate_server.domain.member.Member; | ||
| import com.cozymate.cozymate_server.domain.member.repository.MemberRepository; | ||
| import com.cozymate.cozymate_server.domain.university.University; | ||
| import com.cozymate.cozymate_server.domain.university.repository.UniversityRepository; | ||
| import com.cozymate.cozymate_server.global.response.code.status.ErrorStatus; | ||
|
|
@@ -26,6 +27,7 @@ | |
| import java.util.UUID; | ||
| import lombok.RequiredArgsConstructor; | ||
| import lombok.extern.slf4j.Slf4j; | ||
| import org.springframework.beans.factory.annotation.Value; | ||
| import org.springframework.mail.javamail.JavaMailSender; | ||
| import org.springframework.mail.javamail.MimeMessageHelper; | ||
| import org.springframework.stereotype.Service; | ||
|
|
@@ -40,8 +42,15 @@ public class MailService { | |
| private static final Integer MAIL_AUTHENTICATION_EXPIRED_TIME = 30; | ||
| private final JavaMailSender mailSender; | ||
| private final MailRepository mailRepository; | ||
| private final MemberRepository memberRepository; | ||
| private final UniversityRepository universityRepository; | ||
| private final AuthService authService; | ||
|
|
||
| @Value("${spring.mail.username}") | ||
| private static final String ADMIN_MAIL_USERNAME = "cozymate0"; | ||
|
There was a problem hiding this comment. 이거 @value 설정되어있는데, 값이 직접 주입되어있는건 먼가용 There was a problem hiding this comment. 메일고도화하면서 메일 주소 확정 나면 바꾸려구여 |
||
|
|
||
| private static final String ADMIN_MAIL_DOMAIN = "@gmail.com"; // 관리자 이메일 주소 | ||
|
|
||
|
|
||
| @Transactional | ||
| public void sendUniversityAuthenticationCode(MemberDetails memberDetails, | ||
|
|
@@ -61,26 +70,41 @@ public void sendUniversityAuthenticationCode(MemberDetails memberDetails, | |
| @Transactional | ||
| public VerifyResponseDTO verifyMemberUniversity(MemberDetails memberDetails, | ||
| VerifyRequestDTO verifyDTO) { | ||
| University memberUniversity = universityRepository.findById(verifyDTO.universityId()) | ||
| .orElseThrow(() -> new GeneralException(ErrorStatus._UNIVERSITY_NOT_FOUND)); | ||
|
|
||
| memberDetails.member().verifyMemberUniversity(memberUniversity, verifyDTO.majorName()); | ||
| memberRepository.save(memberDetails.member()); | ||
|
|
||
| TokenResponseDTO tokenResponseDTO = authService.generateMemberTokenDTO(memberDetails); | ||
| return MailConverter.toVerifyResponseDTO(tokenResponseDTO); | ||
| } | ||
|
|
||
| public String isVerified(Member member) { | ||
| Optional<MailAuthentication> mailAuthentication = mailRepository.findById(member.getId()); | ||
|
|
||
| if (mailAuthentication.isPresent() && Boolean.TRUE.equals( | ||
| mailAuthentication.get().getIsVerified())) { | ||
| return mailAuthentication.get().getMailAddress(); | ||
| } | ||
| return ""; | ||
| } | ||
|
|
||
| public void sendCustomMailToAdmin(String subject, String content) { | ||
| try { | ||
| MimeMessage message = mailSender.createMimeMessage(); | ||
| MimeMessageHelper helper = new MimeMessageHelper(message, true, "UTF-8"); | ||
|
|
||
| helper.setTo(ADMIN_MAIL_USERNAME + ADMIN_MAIL_DOMAIN); | ||
| helper.setSubject(subject); | ||
| helper.setText(content, true); // 전달받은 content를 그대로 전송 | ||
| mailSender.send(message); | ||
|
|
||
| } catch (MessagingException e) { | ||
| throw new GeneralException(ErrorStatus._MAIL_SEND_FAIL); | ||
| } | ||
| } | ||
|
|
||
|
There was a problem hiding this comment. 관리자에게 메일 보내는 함수입니다 일단 제 개인메일주소로 메일을 보냅니다. There was a problem hiding this comment. 눈꽃 요구로 cozymate0으로 수정했습니다 |
||
| private void verifyAuthenticationCode(Member member, String requestCode) { | ||
|
|
||
| MailAuthentication mailAuthentication = mailRepository.findById(member.getId()) | ||
|
|
@@ -101,13 +125,14 @@ private void verifyAuthenticationCode(Member member, String requestCode) { | |
| mailAuthentication.verify(); | ||
| } | ||
|
|
||
| private MailAuthentication createAndSendMail(Long memberId, String mailAddress, | ||
| String universityName) { | ||
|
|
||
| String authenticationCode = Base64.getEncoder() | ||
| .encodeToString(UUID.randomUUID().toString().getBytes()) | ||
| .substring(0, 6); | ||
|
|
||
| String emailBody = makeMailBody(authenticationCode, universityName); | ||
|
|
||
| try { | ||
| MimeMessage message = mailSender.createMimeMessage(); | ||
|
|
@@ -120,7 +145,7 @@ private MailAuthentication createAndSendMail(Long memberId, String mailAddress, | |
|
|
||
| return MailConverter.toMailAuthenticationWithParams(memberId, mailAddress, | ||
| authenticationCode, false); | ||
| } catch (MessagingException e) { | ||
| throw new GeneralException(ErrorStatus._MAIL_SEND_FAIL); | ||
| } | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| package com.cozymate.cozymate_server.domain.member.dto.request; | ||
|
|
||
| import org.hibernate.validator.constraints.Length; | ||
|
|
||
| public record WithdrawRequestDTO( | ||
| @Length(max = 100, message = "탈퇴 사유는 최대 100자") | ||
| String withdrawReason | ||
| ) { | ||
|
There was a problem hiding this comment. 탈퇴시 사용되는 dto입니다. 탈퇴사유는 줄글이라 body로 받습니다. |
||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
관리자에게 메일 보내는 test api 하나 만들어서 메일을 보내봤습니다. 테스트 성공후 바로
@Deprecated처리 했습니다.