Feature/4-find-user-id

src/main/java/com/sptp/backend/common/exception/ErrorCode.java

@@ -17,6 +17,8 @@ public enum ErrorCode {
     NOT_FOUND_MEMBER(HttpStatus.NOT_FOUND, "해당 유저를 찾을 수 없습니다."),
     EXIST_MEMBER(HttpStatus.BAD_REQUEST, "이미 등록된 유저입니다."),
     NOT_MATCH_PASSWORD(HttpStatus.BAD_REQUEST, "패스워드가 일치하지 않습니다."),
+    NOT_FOUND_EMAIL(HttpStatus.NOT_FOUND, "가입되지 않은 이메일 입니다."),
+    NOT_MATCH_USERNAME(HttpStatus.BAD_REQUEST, "잘못된 이름입니다."),
 
     //토큰 예외
     TOKEN_EXPIRED(HttpStatus.UNAUTHORIZED, "토큰이 만료되었습니다."),

src/main/java/com/sptp/backend/email/service/EmailService.java

@@ -1,5 +1,5 @@
 package com.sptp.backend.email.service;
 
 public interface EmailService {
-    String sendMessage(String to)throws Exception;
+    void sendMessage(String to)throws Exception;
 }

src/main/java/com/sptp/backend/email/service/EmailServiceImpl.java

@@ -1,6 +1,8 @@
 package com.sptp.backend.email.service;
 
 import com.sptp.backend.email.service.EmailService;
+import com.sptp.backend.member.repository.Member;
+import com.sptp.backend.member.repository.MemberRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.mail.MailException;
 import org.springframework.mail.javamail.JavaMailSender;
@@ -16,12 +18,11 @@
 public class EmailServiceImpl implements EmailService {
 
     private final JavaMailSender emailSender;
+    private final MemberRepository memberRepository;
 
-    public static final String ePw = createKey();
-
-    private MimeMessage createMessage(String to)throws Exception{
+    private MimeMessage createMessage(String to, String UserId)throws Exception{
         System.out.println("보내는 대상 : "+ to);
-        System.out.println("인증 번호 : "+ePw);
+        System.out.println("아이디 : "+ UserId);
         MimeMessage  message = emailSender.createMimeMessage();
 
         message.addRecipients(Message.RecipientType.TO, to);//보내는 대상
@@ -31,56 +32,27 @@ private MimeMessage createMessage(String to)throws Exception{
         msgg+= "<div style='margin:20px;'>";
         msgg+= "<h1> 안녕하세요 Atties입니다. </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+= "<h3 style='color:blue;'>아래는 회원님의 아이디입니다.</h3>";
         msgg+= "<div style='font-size:130%'>";
-        msgg+= "CODE : <strong>";
-        msgg+= ePw+"</strong><div><br/> ";
+        msgg+= "회원ID : <strong>";
+        msgg+= UserId+"</strong><div><br/> ";
         msgg+= "</div>";
         message.setText(msgg, "utf-8", "html");//내용
         message.setFrom(new InternetAddress("[email protected]","limjunho"));//보내는 사람
 
         return message;
     }
 
-    public static String createKey() {
-        StringBuffer key = new StringBuffer();
-        Random rnd = new Random();
-
-        for (int i = 0; i < 8; i++) { // 인증코드 8자리
-            int index = rnd.nextInt(3); // 0~2 까지 랜덤
-
-            switch (index) {
-                case 0:
-                    key.append((char) ((int) (rnd.nextInt(26)) + 97));
-                    //  a~z  (ex. 1+97=98 => (char)98 = 'b')
-                    break;
-                case 1:
-                    key.append((char) ((int) (rnd.nextInt(26)) + 65));
-                    //  A~Z
-                    break;
-                case 2:
-                    key.append((rnd.nextInt(10)));
-                    // 0~9
-                    break;
-            }
-        }
-        return key.toString();
-    }
     @Override
-    public String sendMessage(String to)throws Exception {
-        // TODO Auto-generated method stub
-        MimeMessage message = createMessage(to);
-        try{//예외처리
+    public void sendMessage(String to)throws Exception {
+        String UserId = memberRepository.findByEmail(to).get().getUserId();
+        MimeMessage message = createMessage(to, UserId);
+        try{
             emailSender.send(message);
         }catch(MailException es){
             es.printStackTrace();
             throw new IllegalArgumentException();
         }
-        return ePw;
     }
 }

src/main/java/com/sptp/backend/member/service/MemberService.java

@@ -1,5 +1,6 @@
 package com.sptp.backend.member.service;
 
+import com.sptp.backend.member.web.dto.request.MemberFindIdRequestDto;
 import com.sptp.backend.member.web.dto.request.MemberLoginRequestDto;
 import com.sptp.backend.member.web.dto.request.MemberSaveRequestDto;
 import com.sptp.backend.member.repository.Member;
@@ -15,8 +16,11 @@
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
+import java.util.Arrays;
 import java.util.Collections;
+import java.util.List;
 import java.util.Optional;
 
 @Service
@@ -59,19 +63,22 @@ public TokenDto login(MemberLoginRequestDto dto) {
             throw new CustomException(ErrorCode.NOT_MATCH_PASSWORD, "잘못된 비밀번호입니다.");
         }
 
-
         TokenDto tokenDto = jwtTokenProvider.createToken(findMember.getUserId(), findMember.getRoles());
         jwtService.saveRefreshToken(tokenDto);
 
         return tokenDto;
     }
 
-    public Optional<Member> findByEmail(String email) {
-        Optional<Member> findUser = memberRepository.findByEmail(email);
-        if (findUser.isPresent()) {
-            return findUser;
+    public Member findByEmail(MemberFindIdRequestDto dto) {
+
+        // 이메일 및 유저이름 유효성 체크
+        Member findMember = memberRepository.findByEmail(dto.getEmail())
+                .orElseThrow(() -> new CustomException(ErrorCode.NOT_FOUND_EMAIL));
+        if (!dto.getUsername().equals(findMember.getUsername())) {
+            throw new CustomException(ErrorCode.NOT_MATCH_USERNAME);
         }
-        return null;
+
+        return findMember;
     }
 
     public void checkDuplicateMember(String userId) {
@@ -87,5 +94,4 @@ public boolean checkDuplicateMemberBoolean(String email) {
             return false;
         }
     }
-
 }

src/main/java/com/sptp/backend/member/web/MemberController.java

@@ -1,5 +1,6 @@
 package com.sptp.backend.member.web;
 
+import com.sptp.backend.member.web.dto.request.MemberFindIdRequestDto;
 import com.sptp.backend.jwt.service.JwtService;
 import com.sptp.backend.member.web.dto.request.MemberLoginRequestDto;
 import com.sptp.backend.member.web.dto.request.MemberSaveRequestDto;
@@ -10,12 +11,17 @@
 import com.sptp.backend.email.service.EmailService;
 import com.sptp.backend.jwt.web.dto.TokenDto;
 import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpHeaders;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
+import java.net.URI;
 import java.util.HashMap;
+import java.util.Optional;
 import java.util.Map;
 
 @RestController
@@ -57,7 +63,6 @@ public ResponseEntity<?> login(@RequestBody MemberLoginRequestDto memberLoginReq
                 .build();
 
         return ResponseEntity.status(HttpStatus.OK).body(tokenResponseDto);
-
     }
 
     @PostMapping("/members/token")
@@ -72,28 +77,25 @@ public ResponseEntity<?> refresh(@RequestHeader("refreshToken") String refreshTo
                 .build();
 
         return ResponseEntity.status(HttpStatus.OK).body(tokenResponseDto);
-
     }
 
+    // 아이디 찾기
+    @PostMapping("/members/id")
+    public ResponseEntity<?> findId(@RequestBody MemberFindIdRequestDto memberFindIdRequestDto) {
 
-    @PostMapping("/emailConfirm")
-    public String emailConfirm(@RequestParam String email) throws Exception {
+        Member member = memberService.findByEmail(memberFindIdRequestDto);
 
-        String confirm = emailService.sendMessage(email);
-        emailMap.put(email, confirm);
-        return confirm;
-    }
+        HttpHeaders headers = new HttpHeaders();
+        headers.setLocation(URI.create("/emailId?email=" + member.getEmail()));
 
-    @PostMapping("/emailConfirmCheck")
-    public String emailCheck(@RequestParam String email, @RequestParam String code) {
-        if (emailMap.get(email).equals(code)) {
-            emailMap.remove(email);
-            return "OK";
-        }else{
-            return "NO";
-        }
+        return new ResponseEntity<>(headers, HttpStatus.MOVED_PERMANENTLY);
     }
 
+    // 이메일로 아이디 발송
+    @PostMapping("/emailId")
+    public ResponseEntity emailConfirm(@RequestParam String email) throws Exception {
 
-
+        emailService.sendMessage(email);
+        return new ResponseEntity(HttpStatus.OK);
+    }
 }

src/main/java/com/sptp/backend/member/web/dto/request/MemberFindIdRequestDto.java

@@ -0,0 +1,14 @@
+package com.sptp.backend.member.web.dto.request;
+
+import lombok.*;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class MemberFindIdRequestDto {
+
+    private String username;
+    private String email;
+}