[refactor] User 빌더 패턴 적용 및 유저 서비스 메서드 리팩토링

MathCaptain/weakness/src/main/java/MathCaptain/weakness/TestInit.java

@@ -13,6 +13,7 @@
 import MathCaptain.weakness.domain.Recruitment.enums.RecruitmentStatus;
 import MathCaptain.weakness.domain.Recruitment.repository.CommentRepository;
 import MathCaptain.weakness.domain.Recruitment.repository.RecruitmentRepository;
+import MathCaptain.weakness.domain.User.dto.request.SaveUserRequest;
 import MathCaptain.weakness.domain.User.entity.Users;
 import MathCaptain.weakness.domain.User.repository.UserRepository;
 import jakarta.annotation.PostConstruct;
@@ -52,48 +53,40 @@ public void init() {
 
         String email3 = "test@test.com";
 
+        SaveUserRequest saveUserRequest1 = SaveUserRequest.of(
+                email1, passwordEncoder.encode("password1"),
+                "tester01", "tester01", "01012345678"
+        );
+
+        SaveUserRequest saveUserRequest2 = SaveUserRequest.of(
+                email2, passwordEncoder.encode("password2"),
+                "tester02", "tester02", "01056781234"
+        );
+
+        SaveUserRequest saveUserRequest3 = SaveUserRequest.of(
+                email3, passwordEncoder.encode("test"),
+                "tester", "tester", "01011112111"
+        );
+
         /// 테스트 유저 생성
-        Users users1 = Users.builder()
-                .userId(1L)
-                .email(email1)
-                .password(passwordEncoder.encode("password1"))
-                .name("tester01")
-                .nickname("tester01")
-                .phoneNumber("01012345678")
-                .build();
+        Users users1 = Users.of(saveUserRequest1);
 
-        Users users2 = Users.builder()
-                .userId(2L)
-                .email(email2)
-                .password(passwordEncoder.encode("password2"))
-                .name("tester02")
-                .nickname("tester02")
-                .phoneNumber("01056781234")
-                .build();
+        Users users2 = Users.of(saveUserRequest2);
 
-        Users users3 = Users.builder()
-                .userId(3L)
-                .email(email3)
-                .password(passwordEncoder.encode("test"))
-                .name("tester")
-                .nickname("tester")
-                .phoneNumber("01011111111")
-                .build();
+        Users users3 = Users.of(saveUserRequest3);
 
         userRepository.save(users1);
         userRepository.save(users2);
         userRepository.save(users3);
 
         for (int i = 4; i <= 12; i++) {
-            Users users = Users.builder()
-                    .userId((long) i)
-                    .email("test" + i + "@test.com")
-                    .password(passwordEncoder.encode("test"))
-                    .name("tester" + i)
-                    .nickname("tester" + i)
-                    .phoneNumber("0101111111" + i % 10)
-                    .build();
-            userRepository.save(users);
+            SaveUserRequest saveUserRequest = SaveUserRequest.of(
+                    "test" + i + "@test.com", passwordEncoder.encode("test"),
+                    "tester" + i, "tester" + i, "0101111111" + i % 10
+            );
+
+            Users user = Users.of(saveUserRequest);
+            userRepository.save(user);
         }
 
         log.info("======== 👤테스트 유저 생성 완료 =========");

MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/controller/GroupController.java

@@ -7,7 +7,7 @@
 import MathCaptain.weakness.domain.Group.dto.response.GroupResponseDto;
 import MathCaptain.weakness.domain.Group.dto.response.RelationResponseDto;
 import MathCaptain.weakness.domain.User.entity.Users;
-import MathCaptain.weakness.domain.User.dto.response.UserResponseDto;
+import MathCaptain.weakness.domain.User.dto.response.UserResponse;
 import MathCaptain.weakness.domain.Group.service.GroupService;
 import MathCaptain.weakness.domain.Group.dto.request.GroupCreateRequestDto;
 import MathCaptain.weakness.domain.Group.service.RelationService;
@@ -65,7 +65,7 @@ public ApiResponse<?> deleteGroup(@PathVariable Long groupId) {
 
     // 그룹 멤버 조회
     @GetMapping("/group/members/{groupId}")
-    public ApiResponse<List<UserResponseDto>> groupMembers(@PathVariable Long groupId) {
+    public ApiResponse<List<UserResponse>> groupMembers(@PathVariable Long groupId) {
         return ApiResponse.ok(groupService.getGroupMembers(groupId));
     }
 

MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/dto/response/RelationResponseDto.java

@@ -1,7 +1,7 @@
 package MathCaptain.weakness.domain.Group.dto.response;
 
 import MathCaptain.weakness.domain.Group.enums.GroupRole;
-import MathCaptain.weakness.domain.User.dto.response.UserResponseDto;
+import MathCaptain.weakness.domain.User.dto.response.UserResponse;
 import lombok.Builder;
 import lombok.Data;
 
@@ -13,7 +13,7 @@ public class RelationResponseDto {
 
     private Long id;
 
-    private UserResponseDto member;
+    private UserResponse member;
 
     private GroupResponseDto group;
 

MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/service/GroupService.java

@@ -11,7 +11,7 @@
 import MathCaptain.weakness.domain.Group.enums.CategoryStatus;
 import MathCaptain.weakness.domain.Record.repository.RecordRepository;
 import MathCaptain.weakness.domain.Record.service.RecordService;
-import MathCaptain.weakness.domain.User.dto.response.UserResponseDto;
+import MathCaptain.weakness.domain.User.dto.response.UserResponse;
 import MathCaptain.weakness.domain.Group.repository.GroupRepository;
 import MathCaptain.weakness.domain.Group.repository.RelationRepository;
 import MathCaptain.weakness.domain.User.entity.Users;
@@ -96,7 +96,7 @@ public ApiResponse<GroupResponseDto> updateGroupInfo(Long groupId, GroupUpdateRe
     }
 
     // 그룹 내 멤버 조회
-    public List<UserResponseDto> getGroupMembers(Long groupId) {
+    public List<UserResponse> getGroupMembers(Long groupId) {
         Group group = groupRepository.findById(groupId)
                 .orElseThrow(() -> new ResourceNotFoundException("해당 그룹이 없습니다."));
 
@@ -273,8 +273,8 @@ private GroupDetailResponseDto buildGroupDetailResponseDto(Group group, Long mem
                 .build();
     }
 
-    private static UserResponseDto buildUserResponse(Users user) {
-        return UserResponseDto.builder()
+    private static UserResponse buildUserResponse(Users user) {
+        return UserResponse.builder()
                 .userId(user.getUserId())
                 .name(user.getName())
                 .nickname(user.getNickname())

MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/service/RelationService.java

@@ -8,7 +8,7 @@
 import MathCaptain.weakness.domain.Group.dto.response.RelationResponseDto;
 import MathCaptain.weakness.domain.Group.repository.GroupRepository;
 import MathCaptain.weakness.domain.Record.repository.RecordRepository;
-import MathCaptain.weakness.domain.User.dto.response.UserResponseDto;
+import MathCaptain.weakness.domain.User.dto.response.UserResponse;
 import MathCaptain.weakness.domain.Group.enums.GroupRole;
 import MathCaptain.weakness.domain.Group.repository.RelationRepository;
 import MathCaptain.weakness.domain.User.entity.Users;
@@ -103,7 +103,7 @@ public RelationResponseDto getRelationInfo(Long relationId) {
                 .groupImageUrl(relation.getGroup().getGroupImageUrl())
                 .build();
 
-        UserResponseDto member = UserResponseDto.builder()
+        UserResponse member = UserResponse.builder()
                 .userId(relation.getMember().getUserId())
                 .email(relation.getMember().getEmail())
                 .name(relation.getMember().getName())

MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/Login/LoginFailureHandler.java → MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/Login/LoginFailureHandler.java

@@ -1,4 +1,4 @@
-package MathCaptain.weakness.domain.Group.Login;
+package MathCaptain.weakness.domain.User.Login;
 
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;

MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/Login/LoginSuccessJWTProvideHandler.java → MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/Login/LoginSuccessJWTProvideHandler.java

@@ -1,4 +1,4 @@
-package MathCaptain.weakness.domain.Group.Login;
+package MathCaptain.weakness.domain.User.Login;
 
 import MathCaptain.weakness.domain.Group.repository.RelationRepository;
 import MathCaptain.weakness.domain.Group.service.GroupService;

MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/Login/LoginUserArgumentResolver.java → MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/Login/LoginUserArgumentResolver.java

@@ -1,4 +1,4 @@
-package MathCaptain.weakness.domain.Group.Login;
+package MathCaptain.weakness.domain.User.Login;
 
 import MathCaptain.weakness.domain.User.entity.UserDetailsImpl;
 import MathCaptain.weakness.domain.User.entity.Users;

MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/controller/UserController.java

@@ -3,8 +3,8 @@
 import MathCaptain.weakness.domain.User.dto.request.*;
 import MathCaptain.weakness.domain.User.entity.Users;
 import MathCaptain.weakness.domain.User.dto.response.ChangePwdDto;
-import MathCaptain.weakness.domain.User.dto.response.UserCardResponseDto;
-import MathCaptain.weakness.domain.User.dto.response.UserResponseDto;
+import MathCaptain.weakness.domain.User.dto.response.UserCardResponse;
+import MathCaptain.weakness.domain.User.dto.response.UserResponse;
 import MathCaptain.weakness.domain.User.service.UserService;
 import MathCaptain.weakness.global.Api.ApiResponse;
 import MathCaptain.weakness.global.annotation.LoginUser;
@@ -22,36 +22,36 @@ public class UserController {
 
     // READ
     @GetMapping("/user/{userId}")
-    public ApiResponse<UserResponseDto> userInfo(@PathVariable Long userId) {
+    public ApiResponse<UserResponse> userInfo(@PathVariable Long userId) {
         return userService.getUserInfo(userId);
     }
 
     // CREATE
     @PostMapping("/user/signup")
-    public ApiResponse<UserResponseDto> saveUser(@Valid @RequestBody SaveUserRequestDto user) {
+    public ApiResponse<UserResponse> saveUser(@Valid @RequestBody SaveUserRequest user) {
         return userService.saveUser(user);
     }
 
     // UPDATE
     @PutMapping("/user")
-    public ApiResponse<UserResponseDto> updateUser(@Valid @LoginUser Users loginUser, @RequestBody UpdateUserRequestDto updateUser) {
+    public ApiResponse<UserResponse> updateUser(@Valid @LoginUser Users loginUser, @RequestBody UpdateUserRequest updateUser) {
         return userService.updateUser(loginUser, updateUser);
     }
 
     // DELETE
     @DeleteMapping("/user")
-    public ApiResponse<?> deleteUser(@LoginUser Users loginUser, @RequestBody UserDeleteRequestDto userDeleteRequestDto) {
-        return userService.deleteUser(loginUser, userDeleteRequestDto);
+    public ApiResponse<?> deleteUser(@LoginUser Users loginUser, @RequestBody UserDeleteRequest userDeleteRequest) {
+        return userService.deleteUser(loginUser, userDeleteRequest);
     }
 
     @PostMapping("/user/find/email")
-    public ApiResponse<?> findEmail(@Valid @RequestBody FindEmailRequestDto findEmailRequestDto) {
-        return userService.findEmail(findEmailRequestDto);
+    public ApiResponse<?> findEmail(@Valid @RequestBody FindEmailRequest findEmailRequest) {
+        return userService.findEmail(findEmailRequest);
     }
 
     @PostMapping("/user/find/password")
-    public ApiResponse<?> FindPwd(@Valid @RequestBody FindPwdRequestDto findPwdRequestDto) {
-        userService.findPwdRequest(findPwdRequestDto);
+    public ApiResponse<?> FindPwd(@Valid @RequestBody FindPwdRequest findPwdRequest) {
+        userService.findPwdRequest(findPwdRequest);
         return ApiResponse.ok("이메일로 비밀번호 재설정 링크를 보냈습니다.");
     }
 
@@ -62,7 +62,7 @@ public ApiResponse<?> ChangedPwd(@ModelAttribute ChangePwdDto changePwdDto) {
     }
 
     @GetMapping("/user/mypage")
-    public ApiResponse<UserCardResponseDto> getUserCard(@LoginUser Users loginUser) {
+    public ApiResponse<UserCardResponse> getUserCard(@LoginUser Users loginUser) {
         return userService.getUserCard(loginUser);
     }
 

MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/dto/request/FindEmailRequest.java

@@ -0,0 +1,14 @@
+package MathCaptain.weakness.domain.User.dto.request;
+
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import lombok.*;
+
+@Getter
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class FindEmailRequest {
+
+    private String userName;
+
+    private String phoneNumber;
+}

MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/dto/request/FindPwdRequest.java

@@ -0,0 +1,15 @@
+package MathCaptain.weakness.domain.User.dto.request;
+
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import lombok.*;
+
+@Getter
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class FindPwdRequest {
+
+    private String email;
+
+    private String name;
+}

MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/dto/request/SaveUserRequestDto.java → MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/dto/request/SaveUserRequest.java

@@ -5,29 +5,37 @@
 import jakarta.validation.constraints.Size;
 import lombok.*;
 
-@Data
-@Builder(access = AccessLevel.PUBLIC)
-public class SaveUserRequestDto {
+@Getter
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class SaveUserRequest {
 
     @Email
-    @NotNull(message = "이메일은 필수입니다!")
     private String email;
 
-    @NotNull(message = "비밀번호는 필수입니다!")
     @Size(min = 5, max = 20, message = "비밀번호는 최소 5글자 이상, 20글자 이하입니다.")
     private String password;
 
-    @NotNull(message = "이름은 필수입니다!")
     @Size(min = 3, max = 15, message = "이름은 최소 3글자 이상, 15글자 이하입니다.")
     private String name;
 
-    @NotNull(message = "어플 내에서 사용하실 이름을 지정해주세요.")
     @Size(min = 3, max = 15, message = "별명은 최소 3글자 ~ 15글자 이하입니다.")
     private String nickname;
 
-    @NotNull(message = "전화번호는 필수입니다!")
     @Size(min = 11, max = 13, message = "전화번호를 잘못입력하셨습니다! 다시 입력해주세요.")
     private String phoneNumber;
 
+    private SaveUserRequest(String email, String password, String name, String nickname, String phoneNumber) {
+        this.email = email;
+        this.password = password;
+        this.name = name;
+        this.nickname = nickname;
+        this.phoneNumber = phoneNumber;
+    }
+
+    public static SaveUserRequest of(String email, String password, String name,
+                                     String nickname, String phoneNumber) {
+        return new SaveUserRequest(email, password, name, nickname, phoneNumber);
+    }
+
 }