Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/com/wayble/server/auth/service/AuthService.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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());


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
7 changes: 3 additions & 4 deletions src/main/java/com/wayble/server/user/entity/User.java
Original file line number Diff line number Diff line change
Expand Up @@ -52,20 +52,20 @@ 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")
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> 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> mobilityAid = new ArrayList<>(); // 이동보조수단 (안내견,지팡이,휠체어,없음)
Expand All @@ -89,7 +89,6 @@ public static User createUser(
.email(email)
.password(password)
.loginType(loginType)
.userType(UserType.GENERAL) // 기본값
.build();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import com.wayble.server.common.exception.ErrorCase;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;

@Getter
@RequiredArgsConstructor
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down