Merge pull request #37 from KOA-TF/feat/member

Member, MemberDetail 칼럼 수정, 이메일 인증 API 수정

api-module/src/main/java/com/koa/apimodule/command/api/MemberController.java

@@ -3,6 +3,7 @@
 import com.koa.commonmodule.common.ApplicationResponse;
 import com.koa.coremodule.member.application.dto.request.MemberDetailCreateRequest;
 import com.koa.coremodule.member.application.dto.request.MemberPasswordChangeRequest;
+import com.koa.coremodule.member.application.dto.response.CheckEmailResponse;
 import com.koa.coremodule.member.application.dto.response.CheckPasswordResponse;
 import com.koa.coremodule.member.application.dto.response.MemberDetailInfoResponse;
 import com.koa.coremodule.member.application.dto.response.MemberInfoResponse;
@@ -40,9 +41,10 @@ public class MemberController {
     private final EmailVerificationUseCase emailVerificationUseCase;
     private final MemberPasswordChangeUseCase memberPasswordChangeUseCase;
 
-    @GetMapping
-    public MemberInfoResponse getMemberInfo(){
-        return memberGetUseCase.getMemberInfo();
+    @GetMapping("/info")
+    public ApplicationResponse<MemberInfoResponse> getMemberInfo(){
+        MemberInfoResponse response = memberGetUseCase.getMemberInfo();
+        return ApplicationResponse.ok(response);
     }
 
     @PostMapping
@@ -56,13 +58,18 @@ public ApplicationResponse<CheckRegisterResponse> checkMemberRegistered(@Request
          CheckRegisterResponse response = memberCheckUseCase.checkMemberRegistered(email, password);
          return ApplicationResponse.ok(response);
     }
-
-    @GetMapping("/info")
+    @GetMapping("/info/detail")
     public ApplicationResponse<MemberDetailInfoResponse> getMemberDetailInfo() {
         MemberDetailInfoResponse response = memberGetUseCase.getMemberDetailInfo();
         return ApplicationResponse.ok(response);
     }
 
+    @PostMapping("/email")
+    public ApplicationResponse<CheckEmailResponse> checkEmail(@RequestParam String email) {
+        CheckEmailResponse response = memberCheckUseCase.checkEmail(email);
+        return ApplicationResponse.ok(response);
+    }
+
     @PostMapping("/verify")
     public ApplicationResponse<Void> postVerifyEmail(@RequestParam String email) {
         emailVerificationUseCase.sendVerificationEmail(email);

core-module/src/main/java/com/koa/coremodule/auth/application/common/consts/IgnoredPathConsts.java

@@ -22,6 +22,7 @@ private static Map<String, Set<HttpMethod>> createIgnoredPathMap() {
         map.put("/v1/member/register", Set.of(HttpMethod.POST));
         map.put("/h2-console/**", Set.of(HttpMethod.GET, HttpMethod.POST));
         map.put("/v1/auth/login/**", Set.of(HttpMethod.GET, HttpMethod.POST));
+        map.put("/v1/member/email", Set.of(HttpMethod.POST));
         map.put("/v1/member/verify", Set.of(HttpMethod.POST));
         map.put("/v1/member/verify/code", Set.of(HttpMethod.POST));
         map.put("/api-docs/**", Set.of(HttpMethod.GET, HttpMethod.POST));

core-module/src/main/java/com/koa/coremodule/email/service/EmailSendService.java

@@ -15,9 +15,10 @@
 @Service
 @RequiredArgsConstructor
 public class EmailSendService {
-    private static final int LENGTH = 6;
-    private static final String MESSAGE= "인증번호는 %s 입니다.";
-    private static final String TITLE = "KOA 이메일 인증";
+    private static final int CODE_LENGTH = 6;
+    private static final String MESSAGE_TEMPLATE = "인증번호는 %s 입니다.";
+    private static final String EMAIL_TITLE = "KOA 이메일 인증";
+
     private final JavaMailSender emailSender;
     private final RedisUtils redisUtils;
 
@@ -26,27 +27,22 @@ public class EmailSendService {
 
     public void sendEmail(String email) {
         String code = createCode();
-        SimpleMailMessage emailForm = createEmailForm(email, TITLE, String.format(MESSAGE, code));
+        String messageText = String.format(MESSAGE_TEMPLATE, code);
+        SimpleMailMessage emailForm = createEmailForm(email, EMAIL_TITLE, messageText);
         emailSender.send(emailForm);
         redisUtils.setDataExpire(email, code, authCodeExpirationMillis);
     }
 
     private String createCode() {
-        try {
-            Random random = SecureRandom.getInstanceStrong();
-            StringBuilder builder = new StringBuilder();
-            for (int i = 0; i < LENGTH; i++) {
-                builder.append(random.nextInt(10));
-            }
-            return builder.toString();
-        } catch (NoSuchAlgorithmException e) {
-            throw new CreateCodeException(Error.CREATE_CODE_FAIL);
+        Random random = new Random();
+        StringBuilder codeBuilder = new StringBuilder(CODE_LENGTH);
+        for (int i = 0; i < CODE_LENGTH; i++) {
+            codeBuilder.append(random.nextInt(10));
         }
+        return codeBuilder.toString();
     }
 
-    private SimpleMailMessage createEmailForm(String toEmail,
-                                              String title,
-                                              String text) {
+    private SimpleMailMessage createEmailForm(String toEmail, String title, String text) {
         SimpleMailMessage message = new SimpleMailMessage();
         message.setTo(toEmail);
         message.setSubject(title);

core-module/src/main/java/com/koa/coremodule/member/application/dto/request/MemberDetailCreateRequest.java

@@ -11,7 +11,6 @@ public class MemberDetailCreateRequest {
     private String major;
     private String part;
     private List<InterestCreateRequest> interests;
-    private String phoneNumber;
     private String description;
     private List<LinkCreateRequest> links;
 

core-module/src/main/java/com/koa/coremodule/member/application/dto/response/CheckEmailResponse.java

@@ -0,0 +1,12 @@
+package com.koa.coremodule.member.application.dto.response;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@Getter
+@Builder
+@AllArgsConstructor
+public class CheckEmailResponse {
+    private final Boolean isEmailExist;
+}

core-module/src/main/java/com/koa/coremodule/member/application/dto/response/MemberDetailInfoResponse.java

@@ -13,7 +13,6 @@ public class MemberDetailInfoResponse {
     private String major;
     private String part;
     private List<InterestInfoResponse> interests;
-    private String phoneNumber;
     private String description;
     private String profileImage;
     private List<LinkInfoResponse> links;

core-module/src/main/java/com/koa/coremodule/member/application/dto/response/MemberInfoResponse.java

@@ -10,6 +10,8 @@
 @AllArgsConstructor(access = AccessLevel.PUBLIC)
 public class MemberInfoResponse {
     private String name;
+    private String period;
     private String email;
+    private String phoneNumber;
     private boolean isMemberDetailExist;
 }

core-module/src/main/java/com/koa/coremodule/member/application/mapper/MemberMapper.java

@@ -24,7 +24,9 @@ public class MemberMapper {
     public static MemberInfoResponse mapToMemberInfoResponse(Member member, boolean isMemberDetailExist){
         return MemberInfoResponse.builder()
                 .name(member.getName())
+                .period(member.getPeriod())
                 .email(member.getEmail())
+                .phoneNumber(member.getPhoneNumber())
                 .isMemberDetailExist(isMemberDetailExist)
                 .build();
     }
@@ -33,7 +35,6 @@ public static MemberDetail mapToMemberInfo(Member member, MemberDetailCreateRequ
         return MemberDetail.builder()
                 .major(memberInfoCreateRequest.getMajor())
                 .part(Part.valueOf(memberInfoCreateRequest.getPart()))
-                .phoneNumber(memberInfoCreateRequest.getPhoneNumber())
                 .description(memberInfoCreateRequest.getDescription())
                 .profileImage(imageUrl)
                 .member(member)
@@ -61,7 +62,6 @@ public static MemberDetailInfoResponse mapToMemberDetailInfoResponse(MemberDetai
                 .major(memberDetail.getMajor())
                 .part(memberDetail.getPart().toString())
                 .interests(interests)
-                .phoneNumber(memberDetail.getPhoneNumber())
                 .description(memberDetail.getDescription())
                 .profileImage(memberDetail.getProfileImage())
                 .links(links)

core-module/src/main/java/com/koa/coremodule/member/application/service/EmailVerificationUseCase.java

@@ -16,7 +16,6 @@ public class EmailVerificationUseCase {
     private final MemberQueryService memberQueryService;
 
     public void sendVerificationEmail(String email) {
-        memberQueryService.checkEmailExist(email);
         emailSendService.sendEmail(email);
     }
 

core-module/src/main/java/com/koa/coremodule/member/application/service/MemberCheckUseCase.java

@@ -1,10 +1,9 @@
 package com.koa.coremodule.member.application.service;
 
 import com.koa.commonmodule.annotation.ApplicationService;
-import com.koa.commonmodule.exception.Error;
+import com.koa.coremodule.member.application.dto.response.CheckEmailResponse;
 import com.koa.coremodule.member.application.dto.response.CheckPasswordResponse;
 import com.koa.coremodule.member.application.dto.response.CheckRegisterResponse;
-import com.koa.coremodule.member.application.exception.WrongPasswordException;
 import com.koa.coremodule.member.domain.entity.Member;
 import com.koa.coremodule.member.domain.service.MemberQueryService;
 import com.koa.coremodule.member.domain.utils.MemberUtils;
@@ -28,4 +27,9 @@ public CheckPasswordResponse checkPassword(String password) {
         Member member = memberUtils.getAccessMember();
         return new CheckPasswordResponse(member.getPassword().equals(password));
     }
+
+    public CheckEmailResponse checkEmail(String email) {
+        final boolean isEmailExist = memberQueryService.checkEmailExist(email);
+        return new CheckEmailResponse(isEmailExist);
+    }
 }

core-module/src/main/java/com/koa/coremodule/member/domain/entity/Member.java

@@ -24,7 +24,9 @@ public class Member extends BaseEntity {
     private Long id;
 
     private String name;
+    private String period;
     private String email;
+    private String phoneNumber;
     private String password;
     private String fcmToken;
 
@@ -34,9 +36,11 @@ public class Member extends BaseEntity {
     private Boolean isDeleted = Boolean.FALSE;
 
     @Builder
-    public Member(String name, String email, String password, Authority authority) {
+    public Member(String name, String period, String email, String phoneNumber, String password, Authority authority) {
         this.name = name;
+        this.period = period;
         this.email = email;
+        this.phoneNumber = phoneNumber;
         this.password = password;
         this.authority = authority;
     }

core-module/src/main/java/com/koa/coremodule/member/domain/entity/MemberDetail.java

@@ -31,7 +31,6 @@ public class MemberDetail extends BaseEntity {
 
     private String major;
     private Part part;
-    private String phoneNumber;
     private String description;
     private String profileImage;
     private Boolean isDeleted = Boolean.FALSE;
@@ -42,10 +41,9 @@ public class MemberDetail extends BaseEntity {
     private Member member;
 
     @Builder
-    public MemberDetail(String major, Part part, String phoneNumber, String description, String profileImage, Member member) {
+    public MemberDetail(String major, Part part, String description, String profileImage, Member member) {
         this.major = major;
         this.part = part;
-        this.phoneNumber = phoneNumber;
         this.description = description;
         this.profileImage = profileImage;
         this.member = member;

core-module/src/main/java/com/koa/coremodule/member/domain/service/MemberQueryService.java

@@ -30,9 +30,7 @@ public Member findByEmail(String email) {
                 .orElseThrow(() -> new UserNotFoundException(Error.MEMBER_NOT_FOUND));
     }
 
-    public void checkEmailExist(String email) {
-        if(memberRepository.existsByEmail(email) == false) {
-            throw new UserNotFoundException(Error.MEMBER_NOT_FOUND);
-        }
+    public boolean checkEmailExist(String email) {
+        return memberRepository.existsByEmail(email);
     }
 }