Skip to content

Commit 4b23435

Browse files
joyewon0705joyewon0705
committed
Rename: UserService -> AuthService
# Conflicts: # src/main/java/com/back/domain/user/controller/AuthController.java # src/test/java/com/back/domain/user/service/AuthServiceTest.java
1 parent 5c7222a commit 4b23435

File tree

3 files changed

+34
-35
lines changed

3 files changed

+34
-35
lines changed

‎src/main/java/com/back/domain/user/controller/AuthController.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import com.back.domain.user.dto.LoginResponse;
55
import com.back.domain.user.dto.UserRegisterRequest;
66
import com.back.domain.user.dto.UserResponse;
7-
import com.back.domain.user.service.UserService;
7+
import com.back.domain.user.service.AuthService;
88
import com.back.global.common.dto.RsData;
99
import jakarta.servlet.http.HttpServletRequest;
1010
import jakarta.servlet.http.HttpServletResponse;
@@ -23,14 +23,14 @@
2323
@RequestMapping("/api/auth")
2424
@RequiredArgsConstructor
2525
public class AuthController implements AuthControllerDocs {
26-
private final UserService userService;
26+
private final AuthService authService;
2727

2828
// 회원가입
2929
@PostMapping("/register")
3030
public ResponseEntity<RsData<UserResponse>> register(
3131
@Valid @RequestBody UserRegisterRequest request
3232
) {
33-
UserResponse response = userService.register(request);
33+
UserResponse response = authService.register(request);
3434
return ResponseEntity
3535
.status(HttpStatus.CREATED)
3636
.body(RsData.success(
@@ -45,7 +45,7 @@ public ResponseEntity<RsData<LoginResponse>> login(
4545
@Valid @RequestBody LoginRequest request,
4646
HttpServletResponse response
4747
) {
48-
LoginResponse loginResponse = userService.login(request, response);
48+
LoginResponse loginResponse = authService.login(request, response);
4949
return ResponseEntity
5050
.ok(RsData.success(
5151
"로그인에 성공했습니다.",
@@ -59,7 +59,7 @@ public ResponseEntity<RsData<Void>> logout(
5959
HttpServletRequest request,
6060
HttpServletResponse response
6161
) {
62-
userService.logout(request, response);
62+
authService.logout(request, response);
6363
return ResponseEntity
6464
.ok(RsData.success(
6565
"로그아웃 되었습니다.",
@@ -73,7 +73,7 @@ public ResponseEntity<RsData<Map<String, String>>> refreshToken(
7373
HttpServletRequest request,
7474
HttpServletResponse response
7575
) {
76-
String newAccessToken = userService.refreshToken(request, response);
76+
String newAccessToken = authService.refreshToken(request, response);
7777
return ResponseEntity.ok(RsData.success(
7878
"토큰이 재발급되었습니다.",
7979
Map.of("accessToken", newAccessToken)

src/main/java/com/back/domain/user/service/UserService.java renamed to src/main/java/com/back/domain/user/service/AuthService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
@Service
2929
@RequiredArgsConstructor
3030
@Transactional
31-
public class UserService {
31+
public class AuthService {
3232
private final UserRepository userRepository;
3333
private final UserProfileRepository userProfileRepository;
3434
private final UserTokenRepository userTokenRepository;

src/test/java/com/back/domain/user/service/UserServiceTest.java renamed to src/test/java/com/back/domain/user/service/AuthServiceTest.java

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@
2828
@SpringBootTest
2929
@Transactional
3030
@ActiveProfiles("test")
31-
class UserServiceTest {
31+
class AuthServiceTest {
3232

3333
@Autowired
34-
private UserService userService;
34+
private AuthService authService;
3535

3636
@Autowired
3737
private UserRepository userRepository;
@@ -47,7 +47,7 @@ class UserServiceTest {
4747

4848
private User setupUser(String username, String email, String password, String nickname, UserStatus status) {
4949
UserRegisterRequest request = new UserRegisterRequest(username, email, password, nickname);
50-
UserResponse response = userService.register(request);
50+
UserResponse response = authService.register(request);
5151

5252
User saved = userRepository.findById(response.userId()).orElseThrow();
5353
saved.setUserStatus(status); // 상태 변경 (PENDING, SUSPENDED, DELETED)
@@ -63,7 +63,7 @@ void register_success() {
6363
);
6464

6565
// when: 회원가입 실행
66-
UserResponse response = userService.register(request);
66+
UserResponse response = authService.register(request);
6767

6868
// then: 반환된 값 검증
6969
assertThat(response.username()).isEqualTo("testuser");
@@ -84,13 +84,13 @@ void register_success() {
8484
@DisplayName("중복된 username이면 예외 발생")
8585
void register_duplicateUsername() {
8686
// given: 동일 username으로 첫 번째 가입
87-
userService.register(new UserRegisterRequest(
87+
authService.register(new UserRegisterRequest(
8888
"dupuser", "[email protected]", "P@ssw0rd!", "닉네임"
8989
));
9090

9191
// when & then: 같은 username으로 가입 시 예외 발생
9292
assertThatThrownBy(() ->
93-
userService.register(new UserRegisterRequest(
93+
authService.register(new UserRegisterRequest(
9494
"dupuser", "[email protected]", "P@ssw0rd!", "다른닉네임"
9595
))
9696
).isInstanceOf(CustomException.class)
@@ -101,13 +101,13 @@ void register_duplicateUsername() {
101101
@DisplayName("중복된 email이면 예외 발생")
102102
void register_duplicateEmail() {
103103
// given: 동일 email로 첫 번째 가입
104-
userService.register(new UserRegisterRequest(
104+
authService.register(new UserRegisterRequest(
105105
"user1", "[email protected]", "P@ssw0rd!", "닉네임"
106106
));
107107

108108
// when & then: 같은 email로 가입 시 예외 발생
109109
assertThatThrownBy(() ->
110-
userService.register(new UserRegisterRequest(
110+
authService.register(new UserRegisterRequest(
111111
"user2", "[email protected]", "P@ssw0rd!", "다른닉네임"
112112
))
113113
).isInstanceOf(CustomException.class)
@@ -118,13 +118,13 @@ void register_duplicateEmail() {
118118
@DisplayName("중복된 nickname이면 예외 발생")
119119
void register_duplicateNickname() {
120120
// given: 동일 nickname으로 첫 번째 가입
121-
userService.register(new UserRegisterRequest(
121+
authService.register(new UserRegisterRequest(
122122
"user1", "[email protected]", "P@ssw0rd!", "dupnick"
123123
));
124124

125125
// when & then: 같은 nickname으로 가입 시 예외 발생
126126
assertThatThrownBy(() ->
127-
userService.register(new UserRegisterRequest(
127+
authService.register(new UserRegisterRequest(
128128
"user2", "[email protected]", "P@ssw0rd!", "dupnick"
129129
))
130130
).isInstanceOf(CustomException.class)
@@ -140,7 +140,7 @@ void register_invalidPassword_noNumberOrSpecial() {
140140
);
141141

142142
// when & then: 정책 위반으로 예외 발생
143-
assertThatThrownBy(() -> userService.register(request))
143+
assertThatThrownBy(() -> authService.register(request))
144144
.isInstanceOf(CustomException.class)
145145
.hasMessage(ErrorCode.INVALID_PASSWORD.getMessage());
146146
}
@@ -154,7 +154,7 @@ void register_invalidPassword_tooShort() {
154154
);
155155

156156
// when & then: 정책 위반으로 예외 발생
157-
assertThatThrownBy(() -> userService.register(request))
157+
assertThatThrownBy(() -> authService.register(request))
158158
.isInstanceOf(CustomException.class)
159159
.hasMessage(ErrorCode.INVALID_PASSWORD.getMessage());
160160
}
@@ -168,7 +168,7 @@ void register_validPassword() {
168168
);
169169

170170
// when: 회원가입 실행
171-
UserResponse response = userService.register(request);
171+
UserResponse response = authService.register(request);
172172

173173
// then: username과 비밀번호 인코딩 검증
174174
assertThat(response.username()).isEqualTo("user3");
@@ -185,7 +185,7 @@ void login_success() {
185185
MockHttpServletResponse response = new MockHttpServletResponse();
186186

187187
// when: 로그인 요청 실행
188-
LoginResponse loginResponse = userService.login(
188+
LoginResponse loginResponse = authService.login(
189189
new LoginRequest("loginuser", rawPassword), response);
190190

191191
// then: 응답에 username과 토큰/쿠키가 포함됨
@@ -197,7 +197,6 @@ void login_success() {
197197
assertThat(refreshCookie.isHttpOnly()).isTrue();
198198
}
199199

200-
201200
@Test
202201
@DisplayName("잘못된 비밀번호 → INVALID_CREDENTIALS 예외 발생")
203202
void login_invalidPassword() {
@@ -206,7 +205,7 @@ void login_invalidPassword() {
206205
MockHttpServletResponse response = new MockHttpServletResponse();
207206

208207
// when & then: 로그인 시도 시 INVALID_CREDENTIALS 예외 발생
209-
assertThatThrownBy(() -> userService.login(
208+
assertThatThrownBy(() -> authService.login(
210209
new LoginRequest("loginuser", "wrongPassword"), response
211210
))
212211
.isInstanceOf(CustomException.class)
@@ -220,7 +219,7 @@ void login_userNotFound() {
220219
MockHttpServletResponse response = new MockHttpServletResponse();
221220

222221
// when & then: 로그인 시도 시 INVALID_CREDENTIALS 예외 발생
223-
assertThatThrownBy(() -> userService.login(
222+
assertThatThrownBy(() -> authService.login(
224223
new LoginRequest("nouser", "P@ssw0rd!"), response
225224
))
226225
.isInstanceOf(CustomException.class)
@@ -235,7 +234,7 @@ void login_pendingUser() {
235234
MockHttpServletResponse response = new MockHttpServletResponse();
236235

237236
// when & then: 로그인 시도 시 USER_EMAIL_NOT_VERIFIED 예외 발생
238-
assertThatThrownBy(() -> userService.login(
237+
assertThatThrownBy(() -> authService.login(
239238
new LoginRequest(user.getUsername(), "P@ssw0rd!"), response
240239
))
241240
.isInstanceOf(CustomException.class)
@@ -250,7 +249,7 @@ void login_suspendedUser() {
250249
MockHttpServletResponse response = new MockHttpServletResponse();
251250

252251
// when & then: 로그인 시도 시 USER_SUSPENDED 예외 발생
253-
assertThatThrownBy(() -> userService.login(
252+
assertThatThrownBy(() -> authService.login(
254253
new LoginRequest(user.getUsername(), "P@ssw0rd!"), response
255254
))
256255
.isInstanceOf(CustomException.class)
@@ -265,7 +264,7 @@ void login_deletedUser() {
265264
MockHttpServletResponse response = new MockHttpServletResponse();
266265

267266
// when & then: 로그인 시도 시 USER_DELETED 예외 발생
268-
assertThatThrownBy(() -> userService.login(
267+
assertThatThrownBy(() -> authService.login(
269268
new LoginRequest(user.getUsername(), "P@ssw0rd!"), response
270269
))
271270
.isInstanceOf(CustomException.class)
@@ -279,7 +278,7 @@ void logout_success() {
279278
User user = setupUser("logoutuser", "[email protected]", rawPassword, "닉네임", UserStatus.ACTIVE);
280279
MockHttpServletResponse loginResponse = new MockHttpServletResponse();
281280

282-
userService.login(new LoginRequest("logoutuser", rawPassword), loginResponse);
281+
authService.login(new LoginRequest("logoutuser", rawPassword), loginResponse);
283282
Cookie refreshCookie = loginResponse.getCookie("refreshToken");
284283
assertThat(refreshCookie).isNotNull();
285284

@@ -288,7 +287,7 @@ void logout_success() {
288287
request.setCookies(refreshCookie); // 쿠키를 요청에 실어줌
289288

290289
// when: 로그아웃 실행
291-
userService.logout(request, logoutResponse);
290+
authService.logout(request, logoutResponse);
292291

293292
// then: DB에서 refreshToken 삭제됨
294293
assertThat(userTokenRepository.findByRefreshToken(refreshCookie.getValue())).isEmpty();
@@ -308,7 +307,7 @@ void logout_noToken() {
308307
MockHttpServletResponse response = new MockHttpServletResponse();
309308

310309
// when & then
311-
assertThatThrownBy(() -> userService.logout(request, response))
310+
assertThatThrownBy(() -> authService.logout(request, response))
312311
.isInstanceOf(CustomException.class)
313312
.hasMessage(ErrorCode.BAD_REQUEST.getMessage());
314313
}
@@ -322,7 +321,7 @@ void logout_invalidToken() {
322321
MockHttpServletResponse response = new MockHttpServletResponse();
323322

324323
// when & then
325-
assertThatThrownBy(() -> userService.logout(request, response))
324+
assertThatThrownBy(() -> authService.logout(request, response))
326325
.isInstanceOf(CustomException.class)
327326
.hasMessage(ErrorCode.INVALID_TOKEN.getMessage());
328327
}
@@ -335,7 +334,7 @@ void refreshToken_success() throws InterruptedException {
335334
User user = setupUser("refreshuser", "[email protected]", rawPassword, "닉네임", UserStatus.ACTIVE);
336335
MockHttpServletResponse loginResponse = new MockHttpServletResponse();
337336

338-
LoginResponse loginRes = userService.login(new LoginRequest("refreshuser", rawPassword), loginResponse);
337+
LoginResponse loginRes = authService.login(new LoginRequest("refreshuser", rawPassword), loginResponse);
339338
String oldAccessToken = loginRes.accessToken();
340339
Cookie refreshCookie = loginResponse.getCookie("refreshToken");
341340
assertThat(refreshCookie).isNotNull();
@@ -349,7 +348,7 @@ void refreshToken_success() throws InterruptedException {
349348
// Thread.sleep(1000);
350349

351350
// when: 토큰 재발급 실행
352-
String newAccessToken = userService.refreshToken(request, response);
351+
String newAccessToken = authService.refreshToken(request, response);
353352

354353
// then: 반환값 및 응답 헤더 검증
355354
assertThat(newAccessToken).isNotBlank();
@@ -365,7 +364,7 @@ void refreshToken_noToken() {
365364
MockHttpServletResponse response = new MockHttpServletResponse();
366365

367366
// when & then
368-
assertThatThrownBy(() -> userService.refreshToken(request, response))
367+
assertThatThrownBy(() -> authService.refreshToken(request, response))
369368
.isInstanceOf(CustomException.class)
370369
.hasMessage(ErrorCode.BAD_REQUEST.getMessage());
371370
}
@@ -379,7 +378,7 @@ void refreshToken_invalidToken() {
379378
MockHttpServletResponse response = new MockHttpServletResponse();
380379

381380
// when & then
382-
assertThatThrownBy(() -> userService.refreshToken(request, response))
381+
assertThatThrownBy(() -> authService.refreshToken(request, response))
383382
.isInstanceOf(CustomException.class)
384383
.hasMessage(ErrorCode.INVALID_TOKEN.getMessage());
385384
}

0 commit comments

Comments
 (0)