Skip to content

Commit bd37cba

Browse files
JayongLeeJayongLee
authored
[refactor] User 빌더 패턴 적용 및 유저 서비스 메서드 리팩토링
[refactor] User 빌더 패턴 적용 및 유저 서비스 메서드 리팩토링
2 parents 8665b6a + 91e2cb1 commit bd37cba

27 files changed

Lines changed: 320 additions & 327 deletions

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

Lines changed: 26 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import MathCaptain.weakness.domain.Recruitment.enums.RecruitmentStatus;
1414
import MathCaptain.weakness.domain.Recruitment.repository.CommentRepository;
1515
import MathCaptain.weakness.domain.Recruitment.repository.RecruitmentRepository;
16+
import MathCaptain.weakness.domain.User.dto.request.SaveUserRequest;
1617
import MathCaptain.weakness.domain.User.entity.Users;
1718
import MathCaptain.weakness.domain.User.repository.UserRepository;
1819
import jakarta.annotation.PostConstruct;
@@ -52,48 +53,40 @@ public void init() {
5253

5354
String email3 = "test@test.com";
5455

56+
SaveUserRequest saveUserRequest1 = SaveUserRequest.of(
57+
email1, passwordEncoder.encode("password1"),
58+
"tester01", "tester01", "01012345678"
59+
);
60+
61+
SaveUserRequest saveUserRequest2 = SaveUserRequest.of(
62+
email2, passwordEncoder.encode("password2"),
63+
"tester02", "tester02", "01056781234"
64+
);
65+
66+
SaveUserRequest saveUserRequest3 = SaveUserRequest.of(
67+
email3, passwordEncoder.encode("test"),
68+
"tester", "tester", "01011112111"
69+
);
70+
5571
/// 테스트 유저 생성
56-
Users users1 = Users.builder()
57-
.userId(1L)
58-
.email(email1)
59-
.password(passwordEncoder.encode("password1"))
60-
.name("tester01")
61-
.nickname("tester01")
62-
.phoneNumber("01012345678")
63-
.build();
72+
Users users1 = Users.of(saveUserRequest1);
6473

65-
Users users2 = Users.builder()
66-
.userId(2L)
67-
.email(email2)
68-
.password(passwordEncoder.encode("password2"))
69-
.name("tester02")
70-
.nickname("tester02")
71-
.phoneNumber("01056781234")
72-
.build();
74+
Users users2 = Users.of(saveUserRequest2);
7375

74-
Users users3 = Users.builder()
75-
.userId(3L)
76-
.email(email3)
77-
.password(passwordEncoder.encode("test"))
78-
.name("tester")
79-
.nickname("tester")
80-
.phoneNumber("01011111111")
81-
.build();
76+
Users users3 = Users.of(saveUserRequest3);
8277

8378
userRepository.save(users1);
8479
userRepository.save(users2);
8580
userRepository.save(users3);
8681

8782
for (int i = 4; i <= 12; i++) {
88-
Users users = Users.builder()
89-
.userId((long) i)
90-
.email("test" + i + "@test.com")
91-
.password(passwordEncoder.encode("test"))
92-
.name("tester" + i)
93-
.nickname("tester" + i)
94-
.phoneNumber("0101111111" + i % 10)
95-
.build();
96-
userRepository.save(users);
83+
SaveUserRequest saveUserRequest = SaveUserRequest.of(
84+
"test" + i + "@test.com", passwordEncoder.encode("test"),
85+
"tester" + i, "tester" + i, "0101111111" + i % 10
86+
);
87+
88+
Users user = Users.of(saveUserRequest);
89+
userRepository.save(user);
9790
}
9891

9992
log.info("======== 👤테스트 유저 생성 완료 =========");

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import MathCaptain.weakness.domain.Group.dto.response.GroupResponseDto;
88
import MathCaptain.weakness.domain.Group.dto.response.RelationResponseDto;
99
import MathCaptain.weakness.domain.User.entity.Users;
10-
import MathCaptain.weakness.domain.User.dto.response.UserResponseDto;
10+
import MathCaptain.weakness.domain.User.dto.response.UserResponse;
1111
import MathCaptain.weakness.domain.Group.service.GroupService;
1212
import MathCaptain.weakness.domain.Group.dto.request.GroupCreateRequestDto;
1313
import MathCaptain.weakness.domain.Group.service.RelationService;
@@ -65,7 +65,7 @@ public ApiResponse<?> deleteGroup(@PathVariable Long groupId) {
6565

6666
// 그룹 멤버 조회
6767
@GetMapping("/group/members/{groupId}")
68-
public ApiResponse<List<UserResponseDto>> groupMembers(@PathVariable Long groupId) {
68+
public ApiResponse<List<UserResponse>> groupMembers(@PathVariable Long groupId) {
6969
return ApiResponse.ok(groupService.getGroupMembers(groupId));
7070
}
7171

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package MathCaptain.weakness.domain.Group.dto.response;
22

33
import MathCaptain.weakness.domain.Group.enums.GroupRole;
4-
import MathCaptain.weakness.domain.User.dto.response.UserResponseDto;
4+
import MathCaptain.weakness.domain.User.dto.response.UserResponse;
55
import lombok.Builder;
66
import lombok.Data;
77

@@ -13,7 +13,7 @@ public class RelationResponseDto {
1313

1414
private Long id;
1515

16-
private UserResponseDto member;
16+
private UserResponse member;
1717

1818
private GroupResponseDto group;
1919

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import MathCaptain.weakness.domain.Group.enums.CategoryStatus;
1212
import MathCaptain.weakness.domain.Record.repository.RecordRepository;
1313
import MathCaptain.weakness.domain.Record.service.RecordService;
14-
import MathCaptain.weakness.domain.User.dto.response.UserResponseDto;
14+
import MathCaptain.weakness.domain.User.dto.response.UserResponse;
1515
import MathCaptain.weakness.domain.Group.repository.GroupRepository;
1616
import MathCaptain.weakness.domain.Group.repository.RelationRepository;
1717
import MathCaptain.weakness.domain.User.entity.Users;
@@ -96,7 +96,7 @@ public ApiResponse<GroupResponseDto> updateGroupInfo(Long groupId, GroupUpdateRe
9696
}
9797

9898
// 그룹 내 멤버 조회
99-
public List<UserResponseDto> getGroupMembers(Long groupId) {
99+
public List<UserResponse> getGroupMembers(Long groupId) {
100100
Group group = groupRepository.findById(groupId)
101101
.orElseThrow(() -> new ResourceNotFoundException("해당 그룹이 없습니다."));
102102

@@ -273,8 +273,8 @@ private GroupDetailResponseDto buildGroupDetailResponseDto(Group group, Long mem
273273
.build();
274274
}
275275

276-
private static UserResponseDto buildUserResponse(Users user) {
277-
return UserResponseDto.builder()
276+
private static UserResponse buildUserResponse(Users user) {
277+
return UserResponse.builder()
278278
.userId(user.getUserId())
279279
.name(user.getName())
280280
.nickname(user.getNickname())

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import MathCaptain.weakness.domain.Group.dto.response.RelationResponseDto;
99
import MathCaptain.weakness.domain.Group.repository.GroupRepository;
1010
import MathCaptain.weakness.domain.Record.repository.RecordRepository;
11-
import MathCaptain.weakness.domain.User.dto.response.UserResponseDto;
11+
import MathCaptain.weakness.domain.User.dto.response.UserResponse;
1212
import MathCaptain.weakness.domain.Group.enums.GroupRole;
1313
import MathCaptain.weakness.domain.Group.repository.RelationRepository;
1414
import MathCaptain.weakness.domain.User.entity.Users;
@@ -103,7 +103,7 @@ public RelationResponseDto getRelationInfo(Long relationId) {
103103
.groupImageUrl(relation.getGroup().getGroupImageUrl())
104104
.build();
105105

106-
UserResponseDto member = UserResponseDto.builder()
106+
UserResponse member = UserResponse.builder()
107107
.userId(relation.getMember().getUserId())
108108
.email(relation.getMember().getEmail())
109109
.name(relation.getMember().getName())

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package MathCaptain.weakness.domain.Group.Login;
1+
package MathCaptain.weakness.domain.User.Login;
22

33
import jakarta.servlet.ServletException;
44
import jakarta.servlet.http.HttpServletRequest;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package MathCaptain.weakness.domain.Group.Login;
1+
package MathCaptain.weakness.domain.User.Login;
22

33
import MathCaptain.weakness.domain.Group.repository.RelationRepository;
44
import MathCaptain.weakness.domain.Group.service.GroupService;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package MathCaptain.weakness.domain.Group.Login;
1+
package MathCaptain.weakness.domain.User.Login;
22

33
import MathCaptain.weakness.domain.User.entity.UserDetailsImpl;
44
import MathCaptain.weakness.domain.User.entity.Users;

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import MathCaptain.weakness.domain.User.dto.request.*;
44
import MathCaptain.weakness.domain.User.entity.Users;
55
import MathCaptain.weakness.domain.User.dto.response.ChangePwdDto;
6-
import MathCaptain.weakness.domain.User.dto.response.UserCardResponseDto;
7-
import MathCaptain.weakness.domain.User.dto.response.UserResponseDto;
6+
import MathCaptain.weakness.domain.User.dto.response.UserCardResponse;
7+
import MathCaptain.weakness.domain.User.dto.response.UserResponse;
88
import MathCaptain.weakness.domain.User.service.UserService;
99
import MathCaptain.weakness.global.Api.ApiResponse;
1010
import MathCaptain.weakness.global.annotation.LoginUser;
@@ -22,36 +22,36 @@ public class UserController {
2222

2323
// READ
2424
@GetMapping("/user/{userId}")
25-
public ApiResponse<UserResponseDto> userInfo(@PathVariable Long userId) {
25+
public ApiResponse<UserResponse> userInfo(@PathVariable Long userId) {
2626
return userService.getUserInfo(userId);
2727
}
2828

2929
// CREATE
3030
@PostMapping("/user/signup")
31-
public ApiResponse<UserResponseDto> saveUser(@Valid @RequestBody SaveUserRequestDto user) {
31+
public ApiResponse<UserResponse> saveUser(@Valid @RequestBody SaveUserRequest user) {
3232
return userService.saveUser(user);
3333
}
3434

3535
// UPDATE
3636
@PutMapping("/user")
37-
public ApiResponse<UserResponseDto> updateUser(@Valid @LoginUser Users loginUser, @RequestBody UpdateUserRequestDto updateUser) {
37+
public ApiResponse<UserResponse> updateUser(@Valid @LoginUser Users loginUser, @RequestBody UpdateUserRequest updateUser) {
3838
return userService.updateUser(loginUser, updateUser);
3939
}
4040

4141
// DELETE
4242
@DeleteMapping("/user")
43-
public ApiResponse<?> deleteUser(@LoginUser Users loginUser, @RequestBody UserDeleteRequestDto userDeleteRequestDto) {
44-
return userService.deleteUser(loginUser, userDeleteRequestDto);
43+
public ApiResponse<?> deleteUser(@LoginUser Users loginUser, @RequestBody UserDeleteRequest userDeleteRequest) {
44+
return userService.deleteUser(loginUser, userDeleteRequest);
4545
}
4646

4747
@PostMapping("/user/find/email")
48-
public ApiResponse<?> findEmail(@Valid @RequestBody FindEmailRequestDto findEmailRequestDto) {
49-
return userService.findEmail(findEmailRequestDto);
48+
public ApiResponse<?> findEmail(@Valid @RequestBody FindEmailRequest findEmailRequest) {
49+
return userService.findEmail(findEmailRequest);
5050
}
5151

5252
@PostMapping("/user/find/password")
53-
public ApiResponse<?> FindPwd(@Valid @RequestBody FindPwdRequestDto findPwdRequestDto) {
54-
userService.findPwdRequest(findPwdRequestDto);
53+
public ApiResponse<?> FindPwd(@Valid @RequestBody FindPwdRequest findPwdRequest) {
54+
userService.findPwdRequest(findPwdRequest);
5555
return ApiResponse.ok("이메일로 비밀번호 재설정 링크를 보냈습니다.");
5656
}
5757

@@ -62,7 +62,7 @@ public ApiResponse<?> ChangedPwd(@ModelAttribute ChangePwdDto changePwdDto) {
6262
}
6363

6464
@GetMapping("/user/mypage")
65-
public ApiResponse<UserCardResponseDto> getUserCard(@LoginUser Users loginUser) {
65+
public ApiResponse<UserCardResponse> getUserCard(@LoginUser Users loginUser) {
6666
return userService.getUserCard(loginUser);
6767
}
6868

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package MathCaptain.weakness.domain.User.dto.request;
2+
3+
import jakarta.validation.constraints.NotNull;
4+
import jakarta.validation.constraints.Size;
5+
import lombok.*;
6+
7+
@Getter
8+
@NoArgsConstructor(access = AccessLevel.PRIVATE)
9+
public class FindEmailRequest {
10+
11+
private String userName;
12+
13+
private String phoneNumber;
14+
}

0 commit comments

Comments
 (0)