diff --git a/src/main/java/org/example/expert/client/WeatherClient.java b/src/main/java/org/example/expert/client/WeatherClient.java index d8ec223e7..a4fefc2bd 100644 --- a/src/main/java/org/example/expert/client/WeatherClient.java +++ b/src/main/java/org/example/expert/client/WeatherClient.java @@ -3,7 +3,6 @@ import org.example.expert.client.dto.WeatherDto; import org.example.expert.domain.common.exception.ServerException; import org.springframework.boot.web.client.RestTemplateBuilder; -import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Component; import org.springframework.web.client.RestTemplate; @@ -26,13 +25,16 @@ public String getTodayWeather() { ResponseEntity responseEntity = restTemplate.getForEntity(buildWeatherApiUri(), WeatherDto[].class); + if (!responseEntity.getStatusCode().is2xxSuccessful()) { + throw new ServerException( + "날씨 데이터를 가져오는데 실패했습니다. 상태 코드: " + responseEntity.getStatusCode() + ); + } + WeatherDto[] weatherArray = responseEntity.getBody(); - if (!HttpStatus.OK.equals(responseEntity.getStatusCode())) { - throw new ServerException("날씨 데이터를 가져오는데 실패했습니다. 상태 코드: " + responseEntity.getStatusCode()); - } else { - if (weatherArray == null || weatherArray.length == 0) { - throw new ServerException("날씨 데이터가 없습니다."); - } + + if (weatherArray == null || weatherArray.length == 0) { + throw new ServerException("날씨 데이터가 없습니다."); } String today = getCurrentDate(); diff --git a/src/main/java/org/example/expert/config/AuthUserArgumentResolver.java b/src/main/java/org/example/expert/config/AuthUserArgumentResolver.java index db00211de..a60772a9c 100644 --- a/src/main/java/org/example/expert/config/AuthUserArgumentResolver.java +++ b/src/main/java/org/example/expert/config/AuthUserArgumentResolver.java @@ -7,11 +7,13 @@ import org.example.expert.domain.user.enums.UserRole; import org.springframework.core.MethodParameter; import org.springframework.lang.Nullable; +import org.springframework.stereotype.Component; import org.springframework.web.bind.support.WebDataBinderFactory; import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.method.support.HandlerMethodArgumentResolver; import org.springframework.web.method.support.ModelAndViewContainer; +@Component public class AuthUserArgumentResolver implements HandlerMethodArgumentResolver { @Override diff --git a/src/main/java/org/example/expert/config/WebMvcConfig.java b/src/main/java/org/example/expert/config/WebMvcConfig.java new file mode 100644 index 000000000..0d124f03e --- /dev/null +++ b/src/main/java/org/example/expert/config/WebMvcConfig.java @@ -0,0 +1,20 @@ +package org.example.expert.config; + +import lombok.RequiredArgsConstructor; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.method.support.HandlerMethodArgumentResolver; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +import java.util.List; + +@Configuration +@RequiredArgsConstructor +public class WebMvcConfig implements WebMvcConfigurer { + + private final AuthUserArgumentResolver authUserArgumentResolver; + + @Override + public void addArgumentResolvers(List resolvers) { + resolvers.add(authUserArgumentResolver); + } +} \ No newline at end of file diff --git a/src/main/java/org/example/expert/domain/auth/service/AuthService.java b/src/main/java/org/example/expert/domain/auth/service/AuthService.java index 3dd3bb7c1..1b1757d57 100644 --- a/src/main/java/org/example/expert/domain/auth/service/AuthService.java +++ b/src/main/java/org/example/expert/domain/auth/service/AuthService.java @@ -26,13 +26,15 @@ public class AuthService { @Transactional public SignupResponse signup(SignupRequest signupRequest) { + if (userRepository.existsByEmail(signupRequest.getEmail())) { + throw new InvalidRequestException("이미 존재하는 이메일입니다."); + } + String encodedPassword = passwordEncoder.encode(signupRequest.getPassword()); UserRole userRole = UserRole.of(signupRequest.getUserRole()); - if (userRepository.existsByEmail(signupRequest.getEmail())) { - throw new InvalidRequestException("이미 존재하는 이메일입니다."); - } + User newUser = new User( signupRequest.getEmail(), diff --git a/src/main/java/org/example/expert/domain/manager/service/ManagerService.java b/src/main/java/org/example/expert/domain/manager/service/ManagerService.java index ad3c08ce4..fee150c72 100644 --- a/src/main/java/org/example/expert/domain/manager/service/ManagerService.java +++ b/src/main/java/org/example/expert/domain/manager/service/ManagerService.java @@ -35,6 +35,10 @@ public ManagerSaveResponse saveManager(AuthUser authUser, long todoId, ManagerSa Todo todo = todoRepository.findById(todoId) .orElseThrow(() -> new InvalidRequestException("Todo not found")); + if(todo.getUser() == null) { + throw new InvalidRequestException("일정을 생성한 유저만 담당자를 지정할 수 있습니다."); + } + if (!ObjectUtils.nullSafeEquals(user.getId(), todo.getUser().getId())) { throw new InvalidRequestException("일정을 생성한 유저만 담당자를 지정할 수 있습니다."); } diff --git a/src/main/java/org/example/expert/domain/todo/repository/TodoRepository.java b/src/main/java/org/example/expert/domain/todo/repository/TodoRepository.java index 064e74f9a..e31c4976c 100644 --- a/src/main/java/org/example/expert/domain/todo/repository/TodoRepository.java +++ b/src/main/java/org/example/expert/domain/todo/repository/TodoRepository.java @@ -3,9 +3,9 @@ import org.example.expert.domain.todo.entity.Todo; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; +import org.springframework.data.jpa.repository.EntityGraph; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; import java.util.Optional; @@ -14,10 +14,6 @@ public interface TodoRepository extends JpaRepository { @Query("SELECT t FROM Todo t LEFT JOIN FETCH t.user u ORDER BY t.modifiedAt DESC") Page findAllByOrderByModifiedAtDesc(Pageable pageable); - @Query("SELECT t FROM Todo t " + - "LEFT JOIN FETCH t.user " + - "WHERE t.id = :todoId") - Optional findByIdWithUser(@Param("todoId") Long todoId); - - int countById(Long todoId); + @EntityGraph(attributePaths = {"user"}) + Optional findTodoById(Long todoId); } diff --git a/src/main/java/org/example/expert/domain/todo/service/TodoService.java b/src/main/java/org/example/expert/domain/todo/service/TodoService.java index cc63523d1..031e10359 100644 --- a/src/main/java/org/example/expert/domain/todo/service/TodoService.java +++ b/src/main/java/org/example/expert/domain/todo/service/TodoService.java @@ -66,7 +66,7 @@ public Page getTodos(int page, int size) { @Transactional(readOnly = true) public TodoResponse getTodo(long todoId) { - Todo todo = todoRepository.findByIdWithUser(todoId) + Todo todo = todoRepository.findTodoById(todoId) .orElseThrow(() -> new InvalidRequestException("Todo not found")); User user = todo.getUser(); diff --git a/src/main/java/org/example/expert/domain/user/controller/UserController.java b/src/main/java/org/example/expert/domain/user/controller/UserController.java index bb1ef7a95..5ae291070 100644 --- a/src/main/java/org/example/expert/domain/user/controller/UserController.java +++ b/src/main/java/org/example/expert/domain/user/controller/UserController.java @@ -1,5 +1,6 @@ package org.example.expert.domain.user.controller; +import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.example.expert.domain.common.annotation.Auth; import org.example.expert.domain.common.dto.AuthUser; @@ -21,7 +22,7 @@ public ResponseEntity getUser(@PathVariable long userId) { } @PutMapping("/users") - public void changePassword(@Auth AuthUser authUser, @RequestBody UserChangePasswordRequest userChangePasswordRequest) { + public void changePassword(@Auth AuthUser authUser, @Valid @RequestBody UserChangePasswordRequest userChangePasswordRequest) { userService.changePassword(authUser.getId(), userChangePasswordRequest); } } diff --git a/src/main/java/org/example/expert/domain/user/dto/request/UserChangePasswordRequest.java b/src/main/java/org/example/expert/domain/user/dto/request/UserChangePasswordRequest.java index 3ba93dde5..334e245f4 100644 --- a/src/main/java/org/example/expert/domain/user/dto/request/UserChangePasswordRequest.java +++ b/src/main/java/org/example/expert/domain/user/dto/request/UserChangePasswordRequest.java @@ -1,6 +1,7 @@ package org.example.expert.domain.user.dto.request; import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Pattern; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; @@ -12,6 +13,11 @@ public class UserChangePasswordRequest { @NotBlank private String oldPassword; + @NotBlank + @Pattern( + regexp = "^(?=.*[A-Z])(?=.*[a-z])(?=.*\\d).{8,}$", + message = "비밀번호는 8자 이상이며, 대문자/소문자/숫자를 포함해야 합니다." + ) private String newPassword; } diff --git a/src/main/java/org/example/expert/domain/user/service/UserService.java b/src/main/java/org/example/expert/domain/user/service/UserService.java index 565c213f9..3ca0c117b 100644 --- a/src/main/java/org/example/expert/domain/user/service/UserService.java +++ b/src/main/java/org/example/expert/domain/user/service/UserService.java @@ -25,12 +25,6 @@ public UserResponse getUser(long userId) { @Transactional public void changePassword(long userId, UserChangePasswordRequest userChangePasswordRequest) { - if (userChangePasswordRequest.getNewPassword().length() < 8 || - !userChangePasswordRequest.getNewPassword().matches(".*\\d.*") || - !userChangePasswordRequest.getNewPassword().matches(".*[A-Z].*")) { - throw new InvalidRequestException("새 비밀번호는 8자 이상이어야 하고, 숫자와 대문자를 포함해야 합니다."); - } - User user = userRepository.findById(userId) .orElseThrow(() -> new InvalidRequestException("User not found")); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml new file mode 100644 index 000000000..6f2436aee --- /dev/null +++ b/src/main/resources/application.yml @@ -0,0 +1,18 @@ +spring: + datasource: + url: jdbc:mysql://localhost:3306/nbcam + username: root + password: 12345678 + driver-class-name: com.mysql.cj.jdbc.Driver + jpa: + show-sql: true + hibernate: + ddl-auto: create-drop + properties: + hibernate: + format_sql: true + defer-datasource-initialization: true + +jwt : + secret : + key : c3ByaW5nc2VjcmV0S2V5c3ByaW5nc2VjcmV0S2V5c3ByaW5nc2VjcmV0S2V5 \ No newline at end of file diff --git a/src/test/java/org/example/expert/config/PasswordEncoderTest.java b/src/test/java/org/example/expert/config/PasswordEncoderTest.java index 694643d7e..d73b436fa 100644 --- a/src/test/java/org/example/expert/config/PasswordEncoderTest.java +++ b/src/test/java/org/example/expert/config/PasswordEncoderTest.java @@ -16,11 +16,11 @@ class PasswordEncoderTest { @Test void matches_메서드가_정상적으로_동작한다() { // given - String rawPassword = "testPassword"; + String rawPassword = "springsecretKeyspringsecretKeyspringsecretKey"; String encodedPassword = passwordEncoder.encode(rawPassword); // when - boolean matches = passwordEncoder.matches(encodedPassword, rawPassword); + boolean matches = passwordEncoder.matches(rawPassword, encodedPassword); // then assertTrue(matches); diff --git a/src/test/java/org/example/expert/domain/comment/service/CommentServiceTest.java b/src/test/java/org/example/expert/domain/comment/service/CommentServiceTest.java index ba6797dcd..af14002d2 100644 --- a/src/test/java/org/example/expert/domain/comment/service/CommentServiceTest.java +++ b/src/test/java/org/example/expert/domain/comment/service/CommentServiceTest.java @@ -5,6 +5,7 @@ import org.example.expert.domain.comment.entity.Comment; import org.example.expert.domain.comment.repository.CommentRepository; import org.example.expert.domain.common.dto.AuthUser; +import org.example.expert.domain.common.exception.InvalidRequestException; import org.example.expert.domain.common.exception.ServerException; import org.example.expert.domain.todo.entity.Todo; import org.example.expert.domain.todo.repository.TodoRepository; @@ -43,7 +44,7 @@ class CommentServiceTest { given(todoRepository.findById(anyLong())).willReturn(Optional.empty()); // when - ServerException exception = assertThrows(ServerException.class, () -> { + InvalidRequestException exception = assertThrows(InvalidRequestException.class, () -> { commentService.saveComment(authUser, todoId, request); }); diff --git a/src/test/java/org/example/expert/domain/manager/service/ManagerServiceTest.java b/src/test/java/org/example/expert/domain/manager/service/ManagerServiceTest.java index 47ddd6205..9480bf7b1 100644 --- a/src/test/java/org/example/expert/domain/manager/service/ManagerServiceTest.java +++ b/src/test/java/org/example/expert/domain/manager/service/ManagerServiceTest.java @@ -12,6 +12,7 @@ import org.example.expert.domain.user.entity.User; import org.example.expert.domain.user.enums.UserRole; import org.example.expert.domain.user.repository.UserRepository; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; @@ -38,15 +39,22 @@ class ManagerServiceTest { @InjectMocks private ManagerService managerService; + @BeforeEach + void init() { + todoRepository.save(new Todo()); + } + @Test - public void manager_목록_조회_시_Todo가_없다면_NPE_에러를_던진다() { + public void manager_목록_조회_시_Todo가_없다면_InvalidRequestException_에러를_던진다() { // given long todoId = 1L; given(todoRepository.findById(todoId)).willReturn(Optional.empty()); // when & then - InvalidRequestException exception = assertThrows(InvalidRequestException.class, () -> managerService.getManagers(todoId)); - assertEquals("Manager not found", exception.getMessage()); + InvalidRequestException exception = assertThrows( + InvalidRequestException.class, + () -> managerService.getManagers(todoId)); + assertEquals("Todo not found", exception.getMessage()); } @Test