Merge pull request #182 from SMU-SATTO/feature/#176

HyunwooYi · web-flow · commit 221e1f5eee01 · 2024-08-29T03:44:14.000+09:00
[feature] 임시 비밀번호 발급 / 이메일 변경 추가
diff --git a/src/main/java/com/example/satto/domain/mail/controller/MailController.java b/src/main/java/com/example/satto/domain/mail/controller/MailController.java
@@ -3,6 +3,7 @@
 import com.example.satto.domain.mail.dto.EmailRequestDTO;
 import com.example.satto.domain.mail.service.EmailService;
 import com.example.satto.domain.mail.service.Impl.EmailServiceImpl;
+import com.example.satto.domain.users.dto.UsersRequestDTO;
 import com.example.satto.domain.users.service.UsersService;
 import com.example.satto.global.common.BaseResponse;
 import io.swagger.v3.oas.annotations.Operation;
@@ -13,7 +14,6 @@
 import org.springframework.web.bind.annotation.RestController;
 
 
-
 @RestController
 @RequestMapping("/api/v1/users/id")
 @RequiredArgsConstructor
@@ -29,11 +29,11 @@ public class MailController {
     @PostMapping("/mail/check")
     public BaseResponse<Object> emailConfirm(@RequestBody EmailRequestDTO.EmailCheckRequest emailCheckRequest) throws Exception {
 
-        if (usersService.studentIdDuplicate(emailCheckRequest)){
+        if (usersService.studentIdDuplicate(emailCheckRequest)) {
             return BaseResponse.onFailure("해당 학번으로 이미 가입하셨습니다.");
         } else {
 
-            String email = emailCheckRequest.getStudentId()+"@sangmyung.kr";
+            String email = emailCheckRequest.getStudentId() + "@sangmyung.kr";
             String confirm;
             confirm = emailService.sendSimpleMessage(email);
             if (confirm.isEmpty()) {
@@ -45,15 +45,43 @@ public BaseResponse<Object> emailConfirm(@RequestBody EmailRequestDTO.EmailCheck
         }
     }
 
+    @Operation(summary = "임시 비밀번호 전송",
+            description = "샘물 이메일 주소로 임시 비밀번호가 전송된다.")
+    @PostMapping("/findPw")
+    public BaseResponse<Object> findPw(@RequestBody EmailRequestDTO.EmailCheckRequest emailCheckRequest) throws Exception {
+        if (usersService.studentIdDuplicate(emailCheckRequest)) {
+            String email = emailCheckRequest.getStudentId() + "@sangmyung.kr";
+            String confirm;
+            confirm = emailService.sendFindPwMessage(email);
+            if (confirm.isEmpty()) {
+                return BaseResponse.onFailure("인증번호 전송 실패");
+            } else {
+                // UpdateUserPasswordDTO 객체 생성
+                UsersRequestDTO.UpdateUserPasswordDTO updateUserPasswordDTO = new UsersRequestDTO.UpdateUserPasswordDTO();
+                // password 필드에 confirm 값 설정
+                updateUserPasswordDTO.setPassword(confirm);
+
+                Long userId = usersService.findId(email);
+                // DTO와 userId를 resetPassword 메서드에 전달
+                usersService.resetPassword(updateUserPasswordDTO, userId);
+                return BaseResponse.onSuccess("인증번호 전송 성공");
+            }
+        } else {
+            return BaseResponse.onFailure("존재하지 않는 이메일 입니다.");
+        }
+    }
+
+
     // 인증번호 확인
     @Operation(summary = "인증번호 확입",
             description = "이메일로 받은 인증번호를 입력한다.")
     @PostMapping("/mail/authentication")
     public BaseResponse<Object> emailAuthentication(@RequestBody EmailRequestDTO.EmailAuthRequest emailAuthRequest) {
-        if (emailAuthRequest.getCertificationNum().equals(EmailServiceImpl.ePw)){
+        if (emailAuthRequest.getCertificationNum().equals(EmailServiceImpl.ePw)) {
             return BaseResponse.onSuccess("인증번호가 일치합니다.");
         } else {
             return BaseResponse.onFailure("인증번호가 일치하지 않습니다.");
         }
     }
 }
+
diff --git a/src/main/java/com/example/satto/domain/mail/dto/EmailRequestDTO.java b/src/main/java/com/example/satto/domain/mail/dto/EmailRequestDTO.java
@@ -13,4 +13,9 @@ public static class EmailAuthRequest {
     public static class EmailCheckRequest {
         private String studentId; // 학번
     }
+
+    @Getter
+    public static class FindPwRequest {
+        private String email; // 학번
+    }
 }
diff --git a/src/main/java/com/example/satto/domain/mail/service/EmailService.java b/src/main/java/com/example/satto/domain/mail/service/EmailService.java
@@ -1,5 +1,9 @@
 package com.example.satto.domain.mail.service;
 
+import com.example.satto.domain.users.entity.Users;
+
 public interface EmailService {
     String sendSimpleMessage(String to)throws Exception;
+
+    String sendFindPwMessage(String toEmail) throws Exception;
 }
diff --git a/src/main/java/com/example/satto/domain/mail/service/Impl/EmailServiceImpl.java b/src/main/java/com/example/satto/domain/mail/service/Impl/EmailServiceImpl.java
@@ -1,6 +1,7 @@
 package com.example.satto.domain.mail.service.Impl;
 
 import com.example.satto.domain.mail.service.EmailService;
+import com.example.satto.domain.users.entity.Users;
 import jakarta.mail.internet.InternetAddress;
 import jakarta.mail.internet.MimeMessage;
 import org.springframework.mail.MailException;
@@ -20,6 +21,7 @@ public class EmailServiceImpl implements EmailService {
     private final JavaMailSender emailSender;
 
     public static final String ePw = createKey();
+    public static final String findePw = createKey();
 
     public EmailServiceImpl(JavaMailSender emailSender) {
         this.emailSender = emailSender;
@@ -47,7 +49,7 @@ private MimeMessage createMessage(String to)throws Exception{
         msgg+= ePw+"</strong><div><br/> ";
         msgg+= "</div>";
         message.setText(msgg, "utf-8", "html");//내용
-        message.setFrom(new InternetAddress("rhythmpal0219@gmail.com","hyun"));//보내는 사람
+        message.setFrom(new InternetAddress("satto202409@gmail.com","satto"));//보내는 사람
 
         return message;
     }
@@ -88,4 +90,48 @@ public String sendSimpleMessage(String to)throws Exception {
         }
         return ePw;
     }
+
+    @Override
+    public String sendFindPwMessage(String toEmail)throws Exception {
+        // TODO Auto-generated method stub
+        MimeMessage message = findPwMessage(toEmail);
+        try{//예외처리
+            emailSender.send(message);
+        }catch(MailException es){
+            es.printStackTrace();
+            throw new IllegalArgumentException();
+        }
+        return findePw;
+    }
+
+
+    private MimeMessage findPwMessage(String toEmail) throws Exception {
+        System.out.println("보내는 대상 : "+ toEmail);
+        System.out.println("인증 번호 : "+findePw);
+
+        MimeMessage  message = emailSender.createMimeMessage();
+        ((MimeMessage) message).addRecipients(MimeMessage.RecipientType.TO, toEmail);//보내는 대상
+        message.setSubject("임시 비밀번호 발급");//제목
+
+        String msgg="";
+        msgg+= "<div style='margin:15px;'>";
+        msgg+= "<h1> SATTO </h1>";
+        msgg+= "<br>";
+        msgg+= "<p>아래 임시 비밀번호를 복사해 입력해주세요<p>";
+        msgg+= "<br>";
+        msgg+= "<p>감사합니다.<p>";
+        msgg+= "<br>";
+        msgg+= "<div align='center' style='border:1px solid black; font-family:verdana';>";
+        msgg+= "<h3 style='color:blue;'>임시 비밀번호 코드입니다.</h3>";
+        msgg+= "<div style='font-size:130%'>";
+        msgg+= "CODE : <strong>";
+        msgg+= findePw+"</strong><div><br/> ";
+        msgg+= "</div>";
+        message.setText(msgg, "utf-8", "html");//내용
+        message.setFrom(new InternetAddress("satto202409@gmail.com","satto"));//보내는 사람
+
+        return message;
+
+    }
+
 }
diff --git a/src/main/java/com/example/satto/domain/users/dto/UsersRequestDTO.java b/src/main/java/com/example/satto/domain/users/dto/UsersRequestDTO.java
@@ -1,6 +1,7 @@
 package com.example.satto.domain.users.dto;
 
 import lombok.Getter;
+import lombok.Setter;
 import org.springframework.aop.ClassFilter;
 
 public class UsersRequestDTO {
@@ -9,12 +10,13 @@ public class UsersRequestDTO {
     public static class UpdateUserDTO {
         private String name;
         private String nickname;
-        private String profileImg;
+        private String password;
         private String department;
         private int grade;
     }
 
     @Getter
+    @Setter
     public static class UpdateUserPasswordDTO {
         private String password;
     }
diff --git a/src/main/java/com/example/satto/domain/users/repository/UsersRepository.java b/src/main/java/com/example/satto/domain/users/repository/UsersRepository.java
@@ -3,6 +3,8 @@
 import com.example.satto.domain.users.entity.Users;
 import com.example.satto.domain.users.repository.querydsl.UsersRepositoryCustom;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.Optional;
@@ -23,6 +25,8 @@ public interface UsersRepository extends JpaRepository<Users, Long>, UsersReposi
 
     Users findByStudentId(Users studentId);
 
+    @Query("SELECT u.userId FROM Users u WHERE u.email = :email")
+    Long findIdByEmail(@Param("email") String email);
     void deleteProfileImgByStudentId(String studentId);
 }
 
diff --git a/src/main/java/com/example/satto/domain/users/service/Impl/UsersServiceImpl.java b/src/main/java/com/example/satto/domain/users/service/Impl/UsersServiceImpl.java
@@ -143,6 +143,7 @@ public Users updateAccount(UsersRequestDTO.UpdateUserDTO updateUserDTO, Long use
 
         user.setName(updateUserDTO.getName());
         user.setNickname(updateUserDTO.getNickname());
+        user.setPassword(passwordEncoder.encode(updateUserDTO.getPassword()));
         user.setDepartment(updateUserDTO.getDepartment());
         user.setGrade(updateUserDTO.getGrade());
 
@@ -207,7 +208,9 @@ public Users userProfile(String studentId) {
     public void resetPassword(UsersRequestDTO.UpdateUserPasswordDTO updateUserPasswordDTO, Long userId) {
         Users user = usersRepository.findById(userId)
                 .orElseThrow(() -> new UsersHandler(ErrorStatus._NOT_FOUND_USER));
+        System.out.println("받아온 비번: " +updateUserPasswordDTO.getPassword());
         user.setPassword(passwordEncoder.encode(updateUserPasswordDTO.getPassword()));
+        System.out.println("암호화 된 비번: " +passwordEncoder.encode(updateUserPasswordDTO.getPassword()));
         usersRepository.save(user);
     }
 
@@ -235,6 +238,11 @@ public List<Map<String, String>> searchUserByName(String name) {
         return afterMap;
     }
 
+    @Override
+    public Long findId(String email) {
+        Long userId = usersRepository.findIdByEmail(email);
+        return userId;
+
     @Transactional
     @Override
     public void saveProfile(MultipartFile file, String email) {
@@ -272,6 +280,7 @@ public void deleteProfileImage(String studentId) {
     private String extractKeyFromUrl(String url) {
         // URL에서 S3 key 추출 (폴더 포함)
         return url.substring(url.indexOf(s3Config.getPath2()));
+
     }
 
 }
diff --git a/src/main/java/com/example/satto/domain/users/service/UsersService.java b/src/main/java/com/example/satto/domain/users/service/UsersService.java
@@ -51,7 +51,11 @@ public interface UsersService {
 
     List<Map<String, String>> searchUserByName(String query);
 
+
+    Long findId(String email);
+
     void saveProfile(MultipartFile multipartFile, String email);
 
     void deleteProfileImage(String studentId);
+
 }

Original file line number	Diff line number	Diff line change
`@@ -13,4 +13,9 @@ public static class EmailAuthRequest {`
`13`	`13`	`public static class EmailCheckRequest {`
`14`	`14`	`private String studentId; // 학번`
`15`	`15`	`}`
	`16`	`+`
	`17`	`+ @Getter`
	`18`	`+ public static class FindPwRequest {`
	`19`	`+ private String email; // 학번`
	`20`	`+ }`
`16`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,9 @@`
`1`	`1`	`package com.example.satto.domain.mail.service;`
`2`	`2`
	`3`	`+import com.example.satto.domain.users.entity.Users;`
	`4`	`+`
`3`	`5`	`public interface EmailService {`
`4`	`6`	`String sendSimpleMessage(String to)throws Exception;`
	`7`	`+`
	`8`	`+ String sendFindPwMessage(String toEmail) throws Exception;`
`5`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,11 @@ public interface UsersService {`
`51`	`51`
`52`	`52`	`List<Map<String, String>> searchUserByName(String query);`
`53`	`53`
	`54`	`+`
	`55`	`+ Long findId(String email);`
	`56`	`+`
`54`	`57`	`void saveProfile(MultipartFile multipartFile, String email);`
`55`	`58`
`56`	`59`	`void deleteProfileImage(String studentId);`
	`60`	`+`
`57`	`61`	`}`