From d7497daf11e03929320d59765275e79be5d9332e Mon Sep 17 00:00:00 2001 From: "jy030506@naver.com" Date: Fri, 8 May 2026 12:47:32 +0900 Subject: [PATCH 01/20] =?UTF-8?q?LV=200=20:=20application.yml=20=ED=8C=8C?= =?UTF-8?q?=EC=9D=BC=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 src/main/resources/application.yml diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml new file mode 100644 index 000000000..8234ac847 --- /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 : asdlkfjovicxne.m,njsalhzxclvkenmzxlcmvlwaieholiufhlckm \ No newline at end of file From 7a33bda947eb4da741c3cddb7db972ab0df44aee Mon Sep 17 00:00:00 2001 From: "jy030506@naver.com" Date: Fri, 8 May 2026 12:59:03 +0900 Subject: [PATCH 02/20] =?UTF-8?q?LV=200=20:=20secretKey=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=20base64=EB=A1=9C=20=EC=9D=B8=EC=BD=94=EB=94=A9?= =?UTF-8?q?=EB=90=9C=20=ED=82=A4=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 8234ac847..70ce7249f 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -15,4 +15,4 @@ spring: jwt : secret : - key : asdlkfjovicxne.m,njsalhzxclvkenmzxlcmvlwaieholiufhlckm \ No newline at end of file + key : dGhpc0lzVmVyeUxvbmdTZWNyZXRLZXlGb3JKd3RUb2tlblNpZ25pbmcxMjM0NTY= \ No newline at end of file From 9b016e00cfb9276bc63d768849cda4118e20fbdb Mon Sep 17 00:00:00 2001 From: "jy030506@naver.com" Date: Fri, 8 May 2026 14:34:41 +0900 Subject: [PATCH 03/20] =?UTF-8?q?LV=201=20:=20ArgumentResolver=20WebMvcCon?= =?UTF-8?q?fig.java=20=ED=8C=8C=EC=9D=BC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/expert/config/WebMvcConfig.java | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 src/main/java/org/example/expert/config/WebMvcConfig.java 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..db2ea20b6 --- /dev/null +++ b/src/main/java/org/example/expert/config/WebMvcConfig.java @@ -0,0 +1,21 @@ +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 From 60c22579a1463c18d3fa9f51eecc88fa33c3cd07 Mon Sep 17 00:00:00 2001 From: "jy030506@naver.com" Date: Fri, 8 May 2026 14:35:45 +0900 Subject: [PATCH 04/20] =?UTF-8?q?LV=201=20:=20ArgumentResolver=20AuthUserA?= =?UTF-8?q?rgumentResolver.java=20=ED=8C=8C=EC=9D=BC=EC=97=90=20=EC=96=B4?= =?UTF-8?q?=EB=85=B8=ED=85=8C=EC=9D=B4=EC=85=98=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/example/expert/config/AuthUserArgumentResolver.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/org/example/expert/config/AuthUserArgumentResolver.java b/src/main/java/org/example/expert/config/AuthUserArgumentResolver.java index db00211de..c2eda0459 100644 --- a/src/main/java/org/example/expert/config/AuthUserArgumentResolver.java +++ b/src/main/java/org/example/expert/config/AuthUserArgumentResolver.java @@ -1,17 +1,22 @@ package org.example.expert.config; import jakarta.servlet.http.HttpServletRequest; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.example.expert.domain.auth.exception.AuthException; import org.example.expert.domain.common.annotation.Auth; import org.example.expert.domain.common.dto.AuthUser; 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; +@Slf4j +@RequiredArgsConstructor public class AuthUserArgumentResolver implements HandlerMethodArgumentResolver { @Override From d73b82186a6d471fc823551fd39c821dc710c4f6 Mon Sep 17 00:00:00 2001 From: "jy030506@naver.com" Date: Fri, 8 May 2026 14:41:25 +0900 Subject: [PATCH 05/20] =?UTF-8?q?LV=201=20:=20ArgumentResolver=20=EB=B6=88?= =?UTF-8?q?=ED=95=84=EC=9A=94=ED=95=9C=20=EC=96=B4=EB=85=B8=ED=85=8C?= =?UTF-8?q?=EC=9D=B4=EC=85=98=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/example/expert/config/AuthUserArgumentResolver.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/java/org/example/expert/config/AuthUserArgumentResolver.java b/src/main/java/org/example/expert/config/AuthUserArgumentResolver.java index c2eda0459..5c56648f4 100644 --- a/src/main/java/org/example/expert/config/AuthUserArgumentResolver.java +++ b/src/main/java/org/example/expert/config/AuthUserArgumentResolver.java @@ -2,20 +2,17 @@ import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; import org.example.expert.domain.auth.exception.AuthException; import org.example.expert.domain.common.annotation.Auth; import org.example.expert.domain.common.dto.AuthUser; 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; -@Slf4j @RequiredArgsConstructor public class AuthUserArgumentResolver implements HandlerMethodArgumentResolver { From fec0dee0e4f80a1853f5a39506380b8fc0fe620d Mon Sep 17 00:00:00 2001 From: "jy030506@naver.com" Date: Fri, 8 May 2026 14:50:21 +0900 Subject: [PATCH 06/20] =?UTF-8?q?LV=201=20:=20ArgumentResolver=20=EB=B6=88?= =?UTF-8?q?=ED=95=84=EC=9A=94=ED=95=9C=20=EC=96=B4=EB=85=B8=ED=85=8C?= =?UTF-8?q?=EC=9D=B4=EC=85=98=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/example/expert/config/AuthUserArgumentResolver.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/example/expert/config/AuthUserArgumentResolver.java b/src/main/java/org/example/expert/config/AuthUserArgumentResolver.java index 5c56648f4..a60772a9c 100644 --- a/src/main/java/org/example/expert/config/AuthUserArgumentResolver.java +++ b/src/main/java/org/example/expert/config/AuthUserArgumentResolver.java @@ -1,19 +1,19 @@ package org.example.expert.config; import jakarta.servlet.http.HttpServletRequest; -import lombok.RequiredArgsConstructor; import org.example.expert.domain.auth.exception.AuthException; import org.example.expert.domain.common.annotation.Auth; import org.example.expert.domain.common.dto.AuthUser; 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; -@RequiredArgsConstructor +@Component public class AuthUserArgumentResolver implements HandlerMethodArgumentResolver { @Override From 3854395a4a37087ba84a1e3d8a5001b9c71b35c1 Mon Sep 17 00:00:00 2001 From: "jy030506@naver.com" Date: Fri, 8 May 2026 15:22:19 +0900 Subject: [PATCH 07/20] =?UTF-8?q?LV=202=20:=20RefactoringQuiz=20-=201=20ea?= =?UTF-8?q?rly=20return=20=EC=9D=B4=EB=AF=B8=20=EC=A1=B4=EC=9E=AC=ED=95=98?= =?UTF-8?q?=EB=8A=94=20=EC=9D=B4=EB=A9=94=EC=9D=BC=EC=9D=B8=20=EA=B2=BD?= =?UTF-8?q?=EC=9A=B0=20=EB=B0=94=EB=A1=9C=20=EB=A6=AC=ED=84=B4=ED=95=98?= =?UTF-8?q?=EA=B2=8C=20=ED=95=98=EC=97=AC=20=EB=B6=88=ED=95=84=EC=9A=94?= =?UTF-8?q?=ED=95=9C=20=EA=B3=BC=EC=A0=95=EC=9D=B4=20=EC=88=98=ED=96=89?= =?UTF-8?q?=EB=90=98=EB=8A=94=20=EA=B2=83=EC=9D=84=20=EB=B0=A9=EC=A7=80,?= =?UTF-8?q?=20=EB=B6=88=ED=95=84=EC=9A=94=ED=95=9C=20import=EB=AC=B8=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/org/example/expert/config/WebMvcConfig.java | 1 - .../example/expert/domain/auth/service/AuthService.java | 8 +++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/example/expert/config/WebMvcConfig.java b/src/main/java/org/example/expert/config/WebMvcConfig.java index db2ea20b6..0d124f03e 100644 --- a/src/main/java/org/example/expert/config/WebMvcConfig.java +++ b/src/main/java/org/example/expert/config/WebMvcConfig.java @@ -1,6 +1,5 @@ package org.example.expert.config; - import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Configuration; import org.springframework.web.method.support.HandlerMethodArgumentResolver; 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(), From d05f39e2643575f43f510e18fce9a547762a879d Mon Sep 17 00:00:00 2001 From: "jy030506@naver.com" Date: Fri, 8 May 2026 15:41:19 +0900 Subject: [PATCH 08/20] =?UTF-8?q?LV=202=20:=20RefactoringQuiz=20-=202=20?= =?UTF-8?q?=EB=B6=88=ED=95=84=EC=9A=94=ED=95=9C=20if-else=20=EA=B5=AC?= =?UTF-8?q?=EB=AC=B8=20if-else=EC=9D=98=20else=EB=AC=B8=EC=97=90=20?= =?UTF-8?q?=EB=8B=A4=EC=8B=9C=20if=EB=AC=B8=EC=9D=84=20=EB=84=A3=EC=96=B4?= =?UTF-8?q?=20=EA=B0=80=EB=8F=85=EC=84=B1=EC=9D=B4=20=EB=96=A8=EC=96=B4?= =?UTF-8?q?=EC=A7=80=EB=8A=94=20=EA=B2=83=EC=9D=84=20=ED=94=84=EB=A1=9C?= =?UTF-8?q?=EA=B7=B8=EB=9E=A8=20=ED=9D=90=EB=A6=84=EC=97=90=20=EB=A7=9E?= =?UTF-8?q?=EC=B6=B0=20if=EB=AC=B8=EB=A7=8C=20=EC=82=AC=EC=9A=A9=ED=95=98?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EB=A6=AC=ED=8C=A9=ED=86=A0=EB=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/example/expert/client/WeatherClient.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/example/expert/client/WeatherClient.java b/src/main/java/org/example/expert/client/WeatherClient.java index d8ec223e7..d6ae4a6ea 100644 --- a/src/main/java/org/example/expert/client/WeatherClient.java +++ b/src/main/java/org/example/expert/client/WeatherClient.java @@ -26,13 +26,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(); From 32be086c76a811f8fec15325262dd07f1ad58ecc Mon Sep 17 00:00:00 2001 From: "jy030506@naver.com" Date: Fri, 8 May 2026 15:41:43 +0900 Subject: [PATCH 09/20] =?UTF-8?q?LV=202=20:=20RefactoringQuiz=20-=202=20?= =?UTF-8?q?=EB=B6=88=ED=95=84=EC=9A=94=ED=95=9C=20if-else=20=EA=B5=AC?= =?UTF-8?q?=EB=AC=B8=20=EB=B6=88=ED=95=84=EC=9A=94=ED=95=9C=20import?= =?UTF-8?q?=EB=AC=B8=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/org/example/expert/client/WeatherClient.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/org/example/expert/client/WeatherClient.java b/src/main/java/org/example/expert/client/WeatherClient.java index d6ae4a6ea..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; From 9a47406ac34f8768df29c96dd1b801fd23ea11da Mon Sep 17 00:00:00 2001 From: "jy030506@naver.com" Date: Fri, 8 May 2026 15:57:08 +0900 Subject: [PATCH 10/20] =?UTF-8?q?LV=202=20:=20RefactoringQuiz=20-=203=20va?= =?UTF-8?q?lidation=20=EB=B9=84=EB=B0=80=EB=B2=88=ED=98=B8=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=20request=20DTO=EC=97=90=20=EC=A0=95=EA=B7=9C?= =?UTF-8?q?=EC=8B=9D=EC=9D=84=20=EC=9D=B4=EC=9A=A9=ED=95=9C=20validation?= =?UTF-8?q?=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/user/dto/request/UserChangePasswordRequest.java | 6 ++++++ 1 file changed, 6 insertions(+) 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; } From 03366dbfb88a0f0104373ec2d2cde6f5b4e4f20c Mon Sep 17 00:00:00 2001 From: "jy030506@naver.com" Date: Fri, 8 May 2026 16:00:13 +0900 Subject: [PATCH 11/20] =?UTF-8?q?LV=202=20:=20RefactoringQuiz=20-=203=20va?= =?UTF-8?q?lidation=20=EC=BB=A8=ED=8A=B8=EB=A1=A4=EB=9F=AC=EC=97=90=20@Val?= =?UTF-8?q?id=20=EC=96=B4=EB=85=B8=ED=85=8C=EC=9D=B4=EC=85=98=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/expert/domain/user/controller/UserController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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); } } From 5372dd0eadf187fd52a2a5ebd07106b5851fdf81 Mon Sep 17 00:00:00 2001 From: "jy030506@naver.com" Date: Fri, 8 May 2026 16:00:44 +0900 Subject: [PATCH 12/20] =?UTF-8?q?LV=202=20:=20RefactoringQuiz=20-=203=20va?= =?UTF-8?q?lidation=20UserService=EC=97=90=20=EC=9E=91=EC=84=B1=EB=90=9C?= =?UTF-8?q?=20=EB=B9=84=EB=B0=80=EB=B2=88=ED=98=B8=20=EA=B2=80=EC=A6=9D=20?= =?UTF-8?q?=EB=A1=9C=EC=A7=81=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/example/expert/domain/user/service/UserService.java | 6 ------ 1 file changed, 6 deletions(-) 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")); From e5ac6cc2aca2a3df171676831d04489c219ab69d Mon Sep 17 00:00:00 2001 From: "jy030506@naver.com" Date: Fri, 8 May 2026 16:58:09 +0900 Subject: [PATCH 13/20] =?UTF-8?q?LV=203=20:=20RefactoringQuiz=20-=203=20va?= =?UTF-8?q?lidation=20@EntityGraph=20=EC=8B=9D=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../expert/domain/todo/repository/TodoRepository.java | 5 +++++ 1 file changed, 5 insertions(+) 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..b2ccab304 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,10 +3,12 @@ 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.List; import java.util.Optional; public interface TodoRepository extends JpaRepository { @@ -19,5 +21,8 @@ public interface TodoRepository extends JpaRepository { "WHERE t.id = :todoId") Optional findByIdWithUser(@Param("todoId") Long todoId); + @EntityGraph(attributePaths = {"user"}) + Optional findTodoById(Long todoId); + int countById(Long todoId); } From 1d5a57009a8a2381119cdc570b420a77765f035e Mon Sep 17 00:00:00 2001 From: "jy030506@naver.com" Date: Fri, 8 May 2026 16:59:22 +0900 Subject: [PATCH 14/20] =?UTF-8?q?LV=203=20:=20validation=20=EA=B5=90?= =?UTF-8?q?=EC=B2=B4=ED=95=98=EB=A9=B4=EC=84=9C=20=EC=82=AC=EC=9A=A9?= =?UTF-8?q?=EB=90=98=EC=A7=80=20=EC=95=8A=EB=8A=94=20=EB=A9=94=EC=84=9C?= =?UTF-8?q?=EB=93=9C=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../expert/domain/todo/repository/TodoRepository.java | 6 ------ 1 file changed, 6 deletions(-) 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 b2ccab304..e6d4658d8 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 @@ -8,7 +8,6 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import java.util.List; import java.util.Optional; public interface TodoRepository extends JpaRepository { @@ -16,11 +15,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); - @EntityGraph(attributePaths = {"user"}) Optional findTodoById(Long todoId); From 5521f605b01cf308954d224c3b4438b56bf12b85 Mon Sep 17 00:00:00 2001 From: "jy030506@naver.com" Date: Fri, 8 May 2026 17:00:13 +0900 Subject: [PATCH 15/20] =?UTF-8?q?LV=203=20:=20validation=20=EC=84=9C?= =?UTF-8?q?=EB=B9=84=EC=8A=A4=EC=97=90=EC=84=9C=20=EB=B3=80=EA=B2=BD?= =?UTF-8?q?=EB=90=9C=20=EB=A9=94=EC=84=9C=EB=93=9C=EB=A5=BC=20=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/example/expert/domain/todo/service/TodoService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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(); From 43113bef2384c8cea40d48c89edf3510a8f1c721 Mon Sep 17 00:00:00 2001 From: "jy030506@naver.com" Date: Fri, 8 May 2026 17:00:36 +0900 Subject: [PATCH 16/20] =?UTF-8?q?LV=203=20:=20validation=20=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=ED=95=98=EC=A7=80=20=EC=95=8A=EB=8A=94=20import?= =?UTF-8?q?=EB=AC=B8,=20=EB=A9=94=EC=84=9C=EB=93=9C=20=EC=B6=94=EA=B0=80?= =?UTF-8?q?=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/expert/domain/todo/repository/TodoRepository.java | 3 --- 1 file changed, 3 deletions(-) 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 e6d4658d8..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 @@ -6,7 +6,6 @@ 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; @@ -17,6 +16,4 @@ public interface TodoRepository extends JpaRepository { @EntityGraph(attributePaths = {"user"}) Optional findTodoById(Long todoId); - - int countById(Long todoId); } From c7ac151160f28b952d65c2afb8ea53c724181c29 Mon Sep 17 00:00:00 2001 From: "jy030506@naver.com" Date: Fri, 8 May 2026 17:55:03 +0900 Subject: [PATCH 17/20] =?UTF-8?q?LV=204=20:=20PasswordEncoderTest=20matche?= =?UTF-8?q?s=EC=9D=98=20=ED=8C=8C=EB=9D=BC=EB=AF=B8=ED=84=B0=EA=B0=80=20?= =?UTF-8?q?=EB=B0=98=EB=8C=80=EB=A1=9C=20=EB=93=A4=EC=96=B4=EA=B0=80?= =?UTF-8?q?=EC=9E=88=EB=8A=94=20=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/example/expert/config/PasswordEncoderTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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); From bc56aaa5e490916564f30ff3a032709a71258efa Mon Sep 17 00:00:00 2001 From: "jy030506@naver.com" Date: Fri, 8 May 2026 19:26:38 +0900 Subject: [PATCH 18/20] =?UTF-8?q?LV=204=20:=20=EB=A7=A4=EB=8B=88=EC=A0=80?= =?UTF-8?q?=20=EB=AA=A9=EB=A1=9D=20=EC=A1=B0=ED=9A=8C=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=20=EC=88=98=EC=A0=95=20NPE=20=EC=97=90=EB=9F=AC?= =?UTF-8?q?=EB=A5=BC=20=EB=8D=98=EC=A7=84=EB=8B=A4=20->=20InvalidRequestEx?= =?UTF-8?q?ception=20=EC=97=90=EB=9F=AC=EB=A5=BC=20=EB=8D=98=EC=A7=84?= =?UTF-8?q?=EB=8B=A4=20=EB=A1=9C=20=EC=88=98=EC=A0=95=20Manager=20Not=20fo?= =?UTF-8?q?und=20->=20Todo=20not=20found?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/manager/service/ManagerServiceTest.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) 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 From 658dc8dd7b1801ffec43de737407aab4d61066b4 Mon Sep 17 00:00:00 2001 From: "jy030506@naver.com" Date: Fri, 8 May 2026 19:42:42 +0900 Subject: [PATCH 19/20] =?UTF-8?q?LV=204=20:=20comment=20=EB=93=B1=EB=A1=9D?= =?UTF-8?q?=20=EC=A4=91=20=EC=97=90=EB=9F=AC=20=EB=B0=9C=EC=83=9D=20?= =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=88=98=EC=A0=95=20SeverExcepti?= =?UTF-8?q?on=20->=20InvalidRequestException=20=EC=97=90=EB=9F=AC=EB=A5=BC?= =?UTF-8?q?=20=EB=8D=98=EC=A7=80=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.yml | 2 +- .../expert/domain/comment/service/CommentServiceTest.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 70ce7249f..6f2436aee 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -15,4 +15,4 @@ spring: jwt : secret : - key : dGhpc0lzVmVyeUxvbmdTZWNyZXRLZXlGb3JKd3RUb2tlblNpZ25pbmcxMjM0NTY= \ No newline at end of file + key : c3ByaW5nc2VjcmV0S2V5c3ByaW5nc2VjcmV0S2V5c3ByaW5nc2VjcmV0S2V5 \ No newline at end of file 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); }); From 7fb63e5ff82df692779983ada0c98f21843df770 Mon Sep 17 00:00:00 2001 From: "jy030506@naver.com" Date: Fri, 8 May 2026 19:58:14 +0900 Subject: [PATCH 20/20] =?UTF-8?q?LV=204=20:=20ManagerService=20=EB=A9=94?= =?UTF-8?q?=EC=84=9C=EB=93=9C=20=EC=88=98=EC=A0=95=20if(todo.getUser()=20?= =?UTF-8?q?=3D=3D=20null)=20=EA=B2=80=EC=82=AC=20=EB=A1=9C=EC=A7=81?= =?UTF-8?q?=EC=9D=84=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/expert/domain/manager/service/ManagerService.java | 4 ++++ 1 file changed, 4 insertions(+) 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("일정을 생성한 유저만 담당자를 지정할 수 있습니다."); }