Skip to content

Commit 09e1de8

Browse files
committed
chore : spotless 적용
1 parent e28fdda commit 09e1de8

8 files changed

Lines changed: 84 additions & 86 deletions

File tree

src/main/java/com/example/cp_main_be/global/GlobalExceptionHandler.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
@RestControllerAdvice
1111
public class GlobalExceptionHandler {
1212

13-
@ExceptionHandler(UserNotFoundException.class)
14-
public ResponseEntity<ApiResponse<Object>> handleUserNotFoundException(UserNotFoundException e) {
15-
ApiResponse<Object> response = ApiResponse.failure("USER_NOT_FOUND", e.getMessage());
13+
@ExceptionHandler(UserNotFoundException.class)
14+
public ResponseEntity<ApiResponse<Object>> handleUserNotFoundException(UserNotFoundException e) {
15+
ApiResponse<Object> response = ApiResponse.failure("USER_NOT_FOUND", e.getMessage());
1616

17-
return new ResponseEntity<>(response, HttpStatus.NOT_FOUND);
18-
}
17+
return new ResponseEntity<>(response, HttpStatus.NOT_FOUND);
18+
}
1919
}
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.example.cp_main_be.global.exception;
22

33
public class UserNotFoundException extends RuntimeException {
4-
public UserNotFoundException(String message) {
5-
super(message);
6-
}
4+
public UserNotFoundException(String message) {
5+
super(message);
6+
}
77
}

src/main/java/com/example/cp_main_be/user/domain/User.java

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import jakarta.persistence.*;
44
import java.time.LocalDateTime;
55
import java.util.UUID;
6-
76
import lombok.*;
87

98
@Entity
@@ -32,14 +31,11 @@ public class User {
3231

3332
private String profileImageUrl;
3433

35-
@Builder.Default
36-
private Long level = 1L; // 기본 레벨 설정
34+
@Builder.Default private Long level = 1L; // 기본 레벨 설정
3735

38-
@Builder.Default
39-
private Integer experiencePoints = 0; // 기본 경험치 설정
36+
@Builder.Default private Integer experiencePoints = 0; // 기본 경험치 설정
4037

41-
@Builder.Default
42-
private Integer temperatureScore = 0; // 기본 온도 점수 설정
38+
@Builder.Default private Integer temperatureScore = 0; // 기본 온도 점수 설정
4339

4440
@Column(nullable = false)
4541
private LocalDateTime createdAt;

src/main/java/com/example/cp_main_be/user/domain/repository/UserRepository.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
import com.example.cp_main_be.user.domain.User;
44
import java.util.Optional;
55
import java.util.UUID;
6-
76
import org.springframework.data.jpa.repository.JpaRepository;
87

98
public interface UserRepository extends JpaRepository<User, Long> {
109

1110
Optional<User> findByUsername(String username);
11+
1212
Optional<User> findByUuid(UUID uuid);
1313
}

src/main/java/com/example/cp_main_be/user/dto/request/UserRequest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
package com.example.cp_main_be.user.dto.request;
22

3+
import java.util.UUID;
34
import lombok.Getter;
45
import lombok.RequiredArgsConstructor;
56

6-
import java.util.UUID;
7-
87
@Getter
98
@RequiredArgsConstructor
109
public class UserRequest {

src/main/java/com/example/cp_main_be/user/presentation/UserController.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@
66
import com.example.cp_main_be.user.service.UserService;
77
import com.example.cp_main_be.util.ApiResponse;
88
import jakarta.validation.Valid;
9+
import java.util.UUID;
910
import lombok.RequiredArgsConstructor;
1011
import org.springframework.http.ResponseEntity;
1112
import org.springframework.web.bind.annotation.*;
1213

13-
import java.util.UUID;
14-
1514
@RestController
1615
@RequiredArgsConstructor
1716
@RequestMapping("/api/v1")

src/main/java/com/example/cp_main_be/user/service/UserService.java

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,11 @@
33
import com.example.cp_main_be.global.exception.UserNotFoundException;
44
import com.example.cp_main_be.user.domain.User;
55
import com.example.cp_main_be.user.domain.repository.UserRepository;
6+
import java.util.UUID;
67
import lombok.RequiredArgsConstructor;
78
import org.springframework.stereotype.Service;
89
import org.springframework.transaction.annotation.Transactional;
910

10-
import java.util.UUID;
11-
1211
@Service
1312
@RequiredArgsConstructor
1413
@Transactional
@@ -21,10 +20,16 @@ public void saveUser(User user) {
2120
}
2221

2322
public User findUserById(Long id) {
24-
return this.userRepository.findById(id).orElseThrow(()->new UserNotFoundException("해당 ID의 사용자를 찾을 수 없습니다 : " + id));
23+
return this.userRepository
24+
.findById(id)
25+
.orElseThrow(() -> new UserNotFoundException("해당 ID의 사용자를 찾을 수 없습니다 : " + id));
2526
}
2627

27-
public User findUserByUuid(UUID uuid) {return this.userRepository.findByUuid(uuid).orElseThrow(()->new UserNotFoundException("해당 UUID의 사용자를 찾을 수 없습니다 : " + uuid));}
28+
public User findUserByUuid(UUID uuid) {
29+
return this.userRepository
30+
.findByUuid(uuid)
31+
.orElseThrow(() -> new UserNotFoundException("해당 UUID의 사용자를 찾을 수 없습니다 : " + uuid));
32+
}
2833

2934
// 실험용
3035
public void deleteUser(Long userId) {
Lines changed: 61 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
package com.example.cp_main_be.user.presentation;
22

3+
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
4+
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
5+
import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
6+
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
7+
38
import com.example.cp_main_be.config.AbstractContainerBaseTest;
49
import com.example.cp_main_be.user.domain.User;
510
import com.example.cp_main_be.user.domain.repository.UserRepository;
611
import com.example.cp_main_be.user.dto.request.UserRequest;
712
import com.fasterxml.jackson.databind.ObjectMapper;
13+
import java.util.UUID;
814
import org.junit.jupiter.api.DisplayName;
915
import org.junit.jupiter.api.Test;
1016
import org.springframework.beans.factory.annotation.Autowired;
@@ -15,77 +21,70 @@
1521
import org.springframework.test.web.servlet.ResultActions;
1622
import org.springframework.transaction.annotation.Transactional;
1723

18-
import java.util.UUID;
19-
20-
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
21-
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
22-
import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
23-
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
24-
2524
@SpringBootTest
2625
@AutoConfigureMockMvc
2726
@Transactional
2827
class UserControllerTest extends AbstractContainerBaseTest {
2928

30-
@Autowired
31-
private MockMvc mockMvc;
29+
@Autowired private MockMvc mockMvc;
3230

33-
@Autowired
34-
private ObjectMapper objectMapper;
31+
@Autowired private ObjectMapper objectMapper;
3532

36-
@Autowired
37-
private UserRepository userRepository;
33+
@Autowired private UserRepository userRepository;
3834

39-
@DisplayName("닉네임을 받아 유저를 등록한다.")
40-
@Test
41-
void register() throws Exception {
42-
// given
43-
UserRequest userRequest = new UserRequest(UUID.randomUUID(),1L,"test");
44-
String requestBody = objectMapper.writeValueAsString(userRequest);
35+
@DisplayName("닉네임을 받아 유저를 등록한다.")
36+
@Test
37+
void register() throws Exception {
38+
// given
39+
UserRequest userRequest = new UserRequest(UUID.randomUUID(), 1L, "test");
40+
String requestBody = objectMapper.writeValueAsString(userRequest);
4541

46-
// when
47-
ResultActions result = mockMvc.perform(post("/api/v1/register/nickname")
42+
// when
43+
ResultActions result =
44+
mockMvc.perform(
45+
post("/api/v1/register/nickname")
4846
.contentType(MediaType.APPLICATION_JSON)
4947
.content(requestBody));
5048

51-
// then
52-
result.andDo(print())
53-
.andExpect(status().isOk())
54-
.andExpect(jsonPath("$.success").value(true))
55-
.andExpect(jsonPath("$.data.username").value("test"))
56-
.andExpect(jsonPath("$.data.uuid").isNotEmpty());
57-
}
58-
59-
@DisplayName("UUID로 유저 정보를 조회한다.")
60-
@Test
61-
void getUserInfo_success() throws Exception {
62-
// given
63-
// 테스트를 위해 미리 유저를 한 명 저장
64-
User savedUser = userRepository.save(User.builder().username("existing-user").build());
65-
UUID userUuid = savedUser.getUuid();
66-
67-
// when
68-
ResultActions result = mockMvc.perform(get("/api/v1/users/{uuid}", userUuid));
69-
70-
// then
71-
result.andDo(print())
72-
.andExpect(status().isOk())
73-
.andExpect(jsonPath("$.success").value(true))
74-
.andExpect(jsonPath("$.data.username").value("existing-user"))
75-
.andExpect(jsonPath("$.data.uuid").value(userUuid.toString()));
76-
}
77-
78-
@DisplayName("존재하지 않는 UUID로 유저 정보를 조회하면 404 에러가 발생한다.")
79-
@Test
80-
void getUserInfo_fail_whenUserNotFound() throws Exception {
81-
// given
82-
UUID nonExistentUuid = UUID.randomUUID();
83-
84-
// when
85-
ResultActions result = mockMvc.perform(get("/api/v1/users/{uuid}", nonExistentUuid));
86-
87-
// then
88-
result.andDo(print())
89-
.andExpect(status().isNotFound()); // UserNotFoundException이 404로 변환되는지 확인
90-
}
91-
}
49+
// then
50+
result
51+
.andDo(print())
52+
.andExpect(status().isOk())
53+
.andExpect(jsonPath("$.success").value(true))
54+
.andExpect(jsonPath("$.data.username").value("test"))
55+
.andExpect(jsonPath("$.data.uuid").isNotEmpty());
56+
}
57+
58+
@DisplayName("UUID로 유저 정보를 조회한다.")
59+
@Test
60+
void getUserInfo_success() throws Exception {
61+
// given
62+
// 테스트를 위해 미리 유저를 한 명 저장
63+
User savedUser = userRepository.save(User.builder().username("existing-user").build());
64+
UUID userUuid = savedUser.getUuid();
65+
66+
// when
67+
ResultActions result = mockMvc.perform(get("/api/v1/users/{uuid}", userUuid));
68+
69+
// then
70+
result
71+
.andDo(print())
72+
.andExpect(status().isOk())
73+
.andExpect(jsonPath("$.success").value(true))
74+
.andExpect(jsonPath("$.data.username").value("existing-user"))
75+
.andExpect(jsonPath("$.data.uuid").value(userUuid.toString()));
76+
}
77+
78+
@DisplayName("존재하지 않는 UUID로 유저 정보를 조회하면 404 에러가 발생한다.")
79+
@Test
80+
void getUserInfo_fail_whenUserNotFound() throws Exception {
81+
// given
82+
UUID nonExistentUuid = UUID.randomUUID();
83+
84+
// when
85+
ResultActions result = mockMvc.perform(get("/api/v1/users/{uuid}", nonExistentUuid));
86+
87+
// then
88+
result.andDo(print()).andExpect(status().isNotFound()); // UserNotFoundException이 404로 변환되는지 확인
89+
}
90+
}

0 commit comments

Comments
 (0)