#9 Member 패키지 리팩터링 및 테스트 작성

src/main/java/com/example/interviewPrep/quiz/emitter/repository/EmitterService.java

@@ -0,0 +1,18 @@
+package com.example.interviewPrep.quiz.emitter.repository;
+
+import org.springframework.stereotype.Service;
+
+@Service
+public class EmitterService {
+
+      private final EmitterRepository emitterRepository;
+
+      public EmitterService(EmitterRepository emitterRepository){
+        this.emitterRepository = emitterRepository;
+      }
+
+      public void deleteMemberEmitter(String memberId){
+    emitterRepository.deleteById(memberId);
+  }
+
+}

src/main/java/com/example/interviewPrep/quiz/exception/advice/ErrorCode.java

@@ -20,7 +20,7 @@ public enum ErrorCode {
 
     MISSING_PARAMETER("missing_parameter", ""),
 
-    NOT_FOUND_LOGIN("not_found_LOGIN", "id, password를 확인해 주세요."),
+    NOT_FOUND_LOGIN("not_found_LOGIN", "email, password를 확인해 주세요."),
     NON_LOGIN("non_login", "로그인 상태가 아닙니다."),
 
     WRONG_ID_TOKEN("wrong_id_token", "로그아웃된 사용자의 토큰입니다."),

src/main/java/com/example/interviewPrep/quiz/member/controller/MemberController.java

@@ -1,75 +1,81 @@
 package com.example.interviewPrep.quiz.member.controller;
 
+import com.example.interviewPrep.quiz.member.domain.Member;
 import com.example.interviewPrep.quiz.member.dto.*;
 import com.example.interviewPrep.quiz.member.service.AuthenticationService;
 import com.example.interviewPrep.quiz.member.service.MemberService;
 import com.example.interviewPrep.quiz.member.social.service.OauthService;
 import com.example.interviewPrep.quiz.response.ResultResponse;
-import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
 
 @RestController
-@RequestMapping("/members/")
-@RequiredArgsConstructor
 @CrossOrigin(origins = "*")
 @Slf4j
 public class MemberController {
     private final AuthenticationService authService;
     private final MemberService memberService;
     private final OauthService oauthService;
 
-    @PostMapping("signup")
-    public ResultResponse<?> signUp(@RequestBody SignUpRequestDTO memberDTO) throws Exception {
+    public MemberController(AuthenticationService authService, MemberService memberService, OauthService oauthService){
+        this.authService = authService;
+        this.memberService = memberService;
+        this.oauthService = oauthService;
+    }
+
+    @PostMapping("/api/v1/members/signup")
+    public ResultResponse<Member> signUp(@RequestBody SignUpRequestDTO memberDTO) throws Exception {
         return ResultResponse.success(memberService.createMember(memberDTO));
     }
 
-    @GetMapping("userInfo")
-    public ResultResponse<?> getUserInfo(){
+    @GetMapping("/api/v1/members/userInfo")
+    public ResultResponse<Member> getUserInfo(){
         return ResultResponse.success(memberService.getUserInfo());
     }
 
-    @PostMapping("login")
-    public ResultResponse<?> login(@RequestBody @NotNull LoginRequestDTO memberDTO, HttpServletResponse response){
+    @PostMapping("/api/v1/members/login")
+    public ResultResponse<LoginResponseDTO> login(@RequestBody @NotNull LoginRequestDTO memberDTO, HttpServletResponse response){
         return ResultResponse.success(authService.login(memberDTO, response));
     }
 
-    @PutMapping("/change")
-    public ResultResponse<?> changeNickNameAndEmail(@RequestBody @NotNull MemberDTO memberDTO){
-        return ResultResponse.success(memberService.changeNickNameAndEmail(memberDTO));
+    @PutMapping("/api/v1/members/change")
+    public ResultResponse<Member> updateNickNameAndEmail(@RequestBody @NotNull MemberDTO memberDTO, @AuthenticationPrincipal Authentication authentication){
+        return ResultResponse.success(memberService.updateNickNameAndEmail(memberDTO, authentication));
     }
 
-    @PutMapping("/password/change")
-    public ResultResponse<?> changePassword(@RequestBody @NotNull MemberDTO memberDTO){
-        return ResultResponse.success(memberService.changePassword(memberDTO));
+    @PutMapping("/api/v1/members/password/change")
+    public ResultResponse<Member> updatePassword(@RequestBody @NotNull MemberDTO memberDTO){
+        return ResultResponse.success(memberService.updatePassword(memberDTO));
     }
 
-    @GetMapping(value="auth/{socialType}")
+    @GetMapping("/api/v1/members/auth/{socialType}")
     public void socialLoginType(@PathVariable String socialType){
         oauthService.request(socialType);
     }
 
-    @GetMapping(value="auth/{socialType}/callback")
-    public ResultResponse<?> callback(@PathVariable String socialType, @RequestParam(name="code") String code){
+    @GetMapping("/api/v1/members/auth/{socialType}/callback")
+    public ResultResponse<LoginResponseDTO> callback(@PathVariable String socialType, @RequestParam(name="code") String code){
         return ResultResponse.success(oauthService.socialLogin(socialType, code));
     }
 
-    @GetMapping(value="logout")
+    @GetMapping("/api/v1/members/logout")
     public ResultResponse<?> logout(HttpServletRequest request){
         String accessToken = request.getHeader(HttpHeaders.AUTHORIZATION);
         authService.logout(accessToken);
         return ResultResponse.success(ResponseEntity.noContent().build());
     }
 
 
-    @GetMapping(value="reissue")
+    @GetMapping("/api/v1/members/reissue")
     public ResultResponse<LoginResponseDTO> reissueToken(@CookieValue(value="refreshToken", defaultValue = "0" ) String cookie){
         return ResultResponse.success(authService.reissue(cookie));
     }

src/main/java/com/example/interviewPrep/quiz/member/domain/Member.java

@@ -1,34 +1,21 @@
 package com.example.interviewPrep.quiz.member.domain;
 
-import com.example.interviewPrep.quiz.answer.domain.Answer;
-import com.example.interviewPrep.quiz.notification.domain.Notification;
 import com.example.interviewPrep.quiz.domain.BaseTimeEntity;
 import com.example.interviewPrep.quiz.member.dto.Role;
-import com.example.interviewPrep.quiz.notification.domain.Notification;
 import com.fasterxml.jackson.annotation.*;
 import lombok.*;
 
 import javax.persistence.*;
-import java.util.ArrayList;
-import java.util.List;
 
-@Setter
 @Entity
 @Getter
 @Builder
-@RequiredArgsConstructor
 @AllArgsConstructor
+@NoArgsConstructor
 @Table(indexes = @Index(name= "i_member", columnList = "email"))
 @JsonIdentityInfo(generator = ObjectIdGenerators.IntSequenceGenerator.class)
 public class Member extends BaseTimeEntity {
 
-    public Member(String email, String password, String nickName){
-        this.email = email;
-        this.password = password;
-        this.nickName = nickName;
-        this.role = Role.USER;
-    }
-
     @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name="MEMBER_ID")
     private Long id;
@@ -49,6 +36,29 @@ public Member(String email, String password, String nickName){
     @Enumerated(EnumType.STRING)
     private Role role;
 
+
+    public void setEmail(String email){
+        if(email == null){
+            throw new NullPointerException("email이 없습니다");
+        }
+        this.email = email;
+    }
+    public void setPassword(String password){
+        this.password = password;
+    }
+    public void setType(String type){
+        if(type == null){
+            throw new NullPointerException("type이 없습니다");
+        }
+        this.type = type;
+    }
+    public void setNickName(String nickName){
+        if(nickName == null){
+            throw new NullPointerException("nickName이 없습니다");
+        }
+        this.nickName = nickName;
+    }
+
     public Member update(String name, String picture){
         this.name = name;
         this.picture = picture;

src/main/java/com/example/interviewPrep/quiz/member/domain/RefreshToken.java

@@ -1,14 +1,11 @@
 package com.example.interviewPrep.quiz.member.domain;
 
-import lombok.AllArgsConstructor;
-import lombok.NoArgsConstructor;
-
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
+import lombok.NoArgsConstructor;
 
 @Entity
-@AllArgsConstructor
 @NoArgsConstructor
 public class RefreshToken {
 
@@ -17,4 +14,5 @@ public class RefreshToken {
     private Long memberId;
 
     private String refreshToken;
+
 }

src/main/java/com/example/interviewPrep/quiz/member/dto/LoginRequestDTO.java

@@ -1,16 +1,19 @@
 package com.example.interviewPrep.quiz.member.dto;
 
-import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
 @Builder
 @Getter
-@AllArgsConstructor
 @NoArgsConstructor
 public class LoginRequestDTO {
 
     String email;
     String password;
+
+    public LoginRequestDTO(String email, String password){
+        this.email = email;
+        this.password = password;
+    }
 }

src/main/java/com/example/interviewPrep/quiz/member/dto/LoginResponseDTO.java

@@ -1,13 +1,10 @@
 package com.example.interviewPrep.quiz.member.dto;
 
-
-import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
 
 @Builder
 @Getter
-@AllArgsConstructor
 public class LoginResponseDTO {
 
     private String accessToken;

src/main/java/com/example/interviewPrep/quiz/member/dto/MemberDTO.java

@@ -5,22 +5,34 @@
 import javax.validation.constraints.NotNull;
 
 @Getter
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
 public class MemberDTO {
 
     private Long id;
 
-    @NotNull
     private String email;
-    @NotNull
+
     private String password;
-    @NotNull
+
     private String nickName;
-    @NotNull
+
     private String newPassword;
-    @NotNull
+
     private String type;
 
+    @Builder
+    public MemberDTO(Long id, String email, String password, String nickName, String newPassword, String type) {
+        if (email == null || password == null || nickName == null || newPassword == null || type == null) {
+            throw new NullPointerException();
+        }
+        this.id = id;
+        this.email = email;
+        this.password = password;
+        this.nickName = nickName;
+        this.newPassword = newPassword;
+        this.type = type;
+    }
+
+
+
+
 }

src/main/java/com/example/interviewPrep/quiz/member/dto/Role.java

@@ -1,14 +1,18 @@
 package com.example.interviewPrep.quiz.member.dto;
 
 import lombok.Getter;
-import lombok.RequiredArgsConstructor;
 
 @Getter
-@RequiredArgsConstructor
 public enum Role {
+
     MENTOR("ROLE_MENTOR", "멘토"),
     USER("ROLE_USER", "일반 사용자");
 
     private final String key;
     private final String title;
+
+    Role(String key, String title) {
+        this.key = key;
+        this.title = title;
+    }
 }

src/main/java/com/example/interviewPrep/quiz/member/repository/MemberRepository.java

@@ -10,7 +10,7 @@
 public interface MemberRepository extends JpaRepository<Member, Long> {
 
     Optional<Member> findByEmail(String email);
-
+    Optional<Member> findByNickName(String nickName);
     Optional<Member> findByEmailAndType(String email, String type);
 
     Optional<Member> findById(Long id);