From c233e448858bb3519b995bd40f3562b9286764e0 Mon Sep 17 00:00:00 2001 From: seungin Date: Tue, 5 Aug 2025 16:50:54 +0900 Subject: [PATCH 1/4] =?UTF-8?q?[refactor]=20=EC=9C=A0=EC=A0=80=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=20=EB=A8=BC=EC=A0=80=20=EA=B0=80=EB=8A=A5=ED=95=98?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20null=20=EC=9D=BC=EB=95=8C=20=EC=97=90?= =?UTF-8?q?=EB=9F=AC=20=EC=B2=98=EB=A6=AC=20=EB=A1=9C=EC=A7=81=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/wayble/server/user/service/UserInfoService.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/com/wayble/server/user/service/UserInfoService.java b/src/main/java/com/wayble/server/user/service/UserInfoService.java index 0c0b2c32..f07a449e 100644 --- a/src/main/java/com/wayble/server/user/service/UserInfoService.java +++ b/src/main/java/com/wayble/server/user/service/UserInfoService.java @@ -108,9 +108,7 @@ public void updateUserInfo(Long userId, UserInfoUpdateRequestDto dto) { public UserInfoResponseDto getUserInfo(Long userId) { User user = userRepository.findById(userId) .orElseThrow(() -> new ApplicationException(UserErrorCase.USER_NOT_FOUND)); - if (user.getNickname() == null || user.getBirthDate() == null || user.getGender() == null) { - throw new ApplicationException(UserErrorCase.USER_INFO_NOT_EXISTS); - } + return UserInfoResponseDto.builder() .nickname(user.getNickname()) .birthDate(user.getBirthDate() != null ? user.getBirthDate().toString() : null) From f2368cb839927f1cfbab2fa036bb02c48244210c Mon Sep 17 00:00:00 2001 From: seungin Date: Tue, 5 Aug 2025 17:02:50 +0900 Subject: [PATCH 2/4] =?UTF-8?q?[refactor]=20=EC=9C=A0=EC=A0=80=ED=83=80?= =?UTF-8?q?=EC=9E=85=20=EA=B4=80=EB=A0=A8=20null=20=EA=B0=80=EB=8A=A5?= =?UTF-8?q?=ED=95=98=EB=8F=84=EB=A1=9D=20=EA=B8=B0=EB=B3=B8=EA=B0=92=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/com/wayble/server/user/entity/User.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/wayble/server/user/entity/User.java b/src/main/java/com/wayble/server/user/entity/User.java index 9098803b..c7d6076a 100644 --- a/src/main/java/com/wayble/server/user/entity/User.java +++ b/src/main/java/com/wayble/server/user/entity/User.java @@ -52,7 +52,7 @@ public class User extends BaseEntity { private LoginType loginType; @Enumerated(EnumType.STRING) - @Column(name = "user_type", nullable = false) + @Column(name = "user_type", nullable = true) private UserType userType; // DISABLED,COMPANION,GENERAL @Column(name = "profile_image_url") @@ -89,7 +89,6 @@ public static User createUser( .email(email) .password(password) .loginType(loginType) - .userType(UserType.GENERAL) // 기본값 .build(); } From 18dd220eade0d32e35f61bd394f906cccc4cbf33 Mon Sep 17 00:00:00 2001 From: seungin Date: Tue, 5 Aug 2025 17:47:12 +0900 Subject: [PATCH 3/4] =?UTF-8?q?[fix]=20=EC=9C=A0=EC=A0=80=ED=83=80?= =?UTF-8?q?=EC=9E=85=20=EA=B4=80=EB=A0=A8=20null=20=ED=97=88=EC=9A=A9?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20NPE=20=EC=98=A4=EB=A5=98=20=ED=95=B4?= =?UTF-8?q?=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/wayble/server/auth/service/AuthService.java | 4 ++-- .../com/wayble/server/auth/service/KakaoLoginService.java | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/wayble/server/auth/service/AuthService.java b/src/main/java/com/wayble/server/auth/service/AuthService.java index 3a1e4ae2..a8143ab5 100644 --- a/src/main/java/com/wayble/server/auth/service/AuthService.java +++ b/src/main/java/com/wayble/server/auth/service/AuthService.java @@ -29,7 +29,7 @@ public TokenResponseDto login(UserLoginRequestDto req) { if (!encoder.matches(req.password(), user.getPassword())) { throw new ApplicationException(UserErrorCase.INVALID_CREDENTIALS); } - String accessToken = jwtProvider.generateToken(user.getId(), user.getUserType().name()); + String accessToken = jwtProvider.generateToken(user.getId(),user.getUserType() != null ? user.getUserType().name() : null); String refreshToken = jwtProvider.generateRefreshToken(user.getId()); Long expiry = jwtProvider.getTokenExpiry(refreshToken); @@ -72,7 +72,7 @@ public TokenResponseDto reissue(String refreshToken) { saved.setExpiry(newExpiry); refreshTokenRepository.save(saved); - String newAccessToken = jwtProvider.generateToken(userId, user.getUserType().name()); + String newAccessToken = jwtProvider.generateToken(userId, user.getUserType() != null ? user.getUserType().name() : null); return new TokenResponseDto(newAccessToken, newRefreshToken); } diff --git a/src/main/java/com/wayble/server/auth/service/KakaoLoginService.java b/src/main/java/com/wayble/server/auth/service/KakaoLoginService.java index 922766b3..4d032a7c 100644 --- a/src/main/java/com/wayble/server/auth/service/KakaoLoginService.java +++ b/src/main/java/com/wayble/server/auth/service/KakaoLoginService.java @@ -60,7 +60,10 @@ public KakaoLoginResponseDto kakaoLogin(KakaoLoginRequestDto request) { } // JWT 토큰 발급 - String accessToken = jwtProvider.generateToken(user.getId(), user.getUserType().name()); + String accessToken = jwtProvider.generateToken( + user.getId(), + user.getUserType() != null ? user.getUserType().name() : null + ); String refreshToken = jwtProvider.generateRefreshToken(user.getId()); From 6ba090a4a035ad64dd806855b4d837285521b03f Mon Sep 17 00:00:00 2001 From: seungin Date: Tue, 5 Aug 2025 17:58:32 +0900 Subject: [PATCH 4/4] =?UTF-8?q?[refactor]=20=EC=9C=A0=EC=A0=80=20=EB=8B=89?= =?UTF-8?q?=EB=84=A4=EC=9E=84=20=EC=A4=91=EB=B3=B5=20=ED=99=95=EC=9D=B8=20?= =?UTF-8?q?=EA=B4=80=EB=A0=A8=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 --- .../com/wayble/server/user/controller/UserController.java | 6 +++++- .../wayble/server/user/dto/UserInfoRegisterRequestDto.java | 1 - .../wayble/server/user/dto/UserInfoUpdateRequestDto.java | 1 - src/main/java/com/wayble/server/user/entity/User.java | 4 ++-- .../com/wayble/server/user/exception/UserErrorCase.java | 1 - 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/wayble/server/user/controller/UserController.java b/src/main/java/com/wayble/server/user/controller/UserController.java index 87dab34b..62959f01 100644 --- a/src/main/java/com/wayble/server/user/controller/UserController.java +++ b/src/main/java/com/wayble/server/user/controller/UserController.java @@ -2,7 +2,11 @@ import com.wayble.server.common.exception.ApplicationException; import com.wayble.server.common.response.CommonResponse; -import com.wayble.server.user.dto.*; +import com.wayble.server.user.dto.UserInfoRegisterRequestDto; +import com.wayble.server.user.dto.UserInfoUpdateRequestDto; +import com.wayble.server.user.dto.UserInfoResponseDto; +import com.wayble.server.user.dto.NicknameCheckResponse; +import com.wayble.server.user.dto.UserRegisterRequestDto; import com.wayble.server.user.exception.UserErrorCase; import com.wayble.server.user.service.UserInfoService; import com.wayble.server.user.service.UserService; diff --git a/src/main/java/com/wayble/server/user/dto/UserInfoRegisterRequestDto.java b/src/main/java/com/wayble/server/user/dto/UserInfoRegisterRequestDto.java index 58c5a6a7..88c9acf0 100644 --- a/src/main/java/com/wayble/server/user/dto/UserInfoRegisterRequestDto.java +++ b/src/main/java/com/wayble/server/user/dto/UserInfoRegisterRequestDto.java @@ -7,7 +7,6 @@ import com.wayble.server.user.entity.UserType; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Pattern; import jakarta.validation.constraints.Size; import lombok.Getter; diff --git a/src/main/java/com/wayble/server/user/dto/UserInfoUpdateRequestDto.java b/src/main/java/com/wayble/server/user/dto/UserInfoUpdateRequestDto.java index cbde96d0..920e0917 100644 --- a/src/main/java/com/wayble/server/user/dto/UserInfoUpdateRequestDto.java +++ b/src/main/java/com/wayble/server/user/dto/UserInfoUpdateRequestDto.java @@ -4,7 +4,6 @@ import com.wayble.server.user.entity.Gender; import com.wayble.server.user.entity.MobilityAid; import com.wayble.server.user.entity.UserType; -import jakarta.validation.constraints.Pattern; import lombok.Getter; import java.util.List; diff --git a/src/main/java/com/wayble/server/user/entity/User.java b/src/main/java/com/wayble/server/user/entity/User.java index c7d6076a..ef0764cd 100644 --- a/src/main/java/com/wayble/server/user/entity/User.java +++ b/src/main/java/com/wayble/server/user/entity/User.java @@ -59,13 +59,13 @@ public class User extends BaseEntity { private String profileImageUrl; @ElementCollection(fetch = FetchType.LAZY) - @CollectionTable(name = "user_disability_type", joinColumns = @JoinColumn(name = "user_id")) + @CollectionTable(name = "user_disability_type_mapping", joinColumns = @JoinColumn(name = "user_id")) @Enumerated(EnumType.STRING) @Column(name = "disability_type") private List disabilityType = new ArrayList<>(); // 장애 유형 (발달장애,시각장애,지체장애,청각장애) @ElementCollection(fetch = FetchType.LAZY) - @CollectionTable(name = "user_mobility_aid", joinColumns = @JoinColumn(name = "user_id")) + @CollectionTable(name = "user_mobility_aid_mapping", joinColumns = @JoinColumn(name = "user_id")) @Enumerated(EnumType.STRING) @Column(name = "mobility_aid") private List mobilityAid = new ArrayList<>(); // 이동보조수단 (안내견,지팡이,휠체어,없음) diff --git a/src/main/java/com/wayble/server/user/exception/UserErrorCase.java b/src/main/java/com/wayble/server/user/exception/UserErrorCase.java index de6ff3fb..762393b9 100644 --- a/src/main/java/com/wayble/server/user/exception/UserErrorCase.java +++ b/src/main/java/com/wayble/server/user/exception/UserErrorCase.java @@ -3,7 +3,6 @@ import com.wayble.server.common.exception.ErrorCase; import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.springframework.http.HttpStatus; @Getter @RequiredArgsConstructor