Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[feat] 스플래쉬 분기 처리 API 구현 #72

Merged
merged 2 commits into from
Jan 11, 2024
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
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,12 @@
public class UserApiController {
private final UserService userService;

@GetMapping("/splash")
public ResponseEntity<ApiResponse<?>> splash(@UserId final Long userId) {
userService.splash(userId);
return ApiResponseUtil.success(SuccessMessage.OK);
}

@PostMapping("/signin")
public ResponseEntity<ApiResponse<?>> signIn(@RequestHeader(AUTHORIZATION) final String token,
@RequestBody final UserSignInRequest request) {
Expand Down
60 changes: 34 additions & 26 deletions doorip-api/src/main/java/org/doorip/user/service/UserService.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,12 @@

import static org.doorip.user.domain.Platform.APPLE;
import static org.doorip.user.domain.Platform.getEnumPlatformFromStringPlatform;
import static org.doorip.user.domain.RefreshToken.createRefreshToken;
import static org.doorip.user.domain.User.createUser;

@RequiredArgsConstructor
@Service
@Transactional
@Service
public class UserService {
private final UserRepository userRepository;
private final RefreshTokenRepository refreshTokenRepository;
Expand All @@ -39,14 +40,19 @@ public class UserService {
private final AppleOAuthProvider appleOAuthProvider;
private final KakaoOAuthProvider kakaoOAuthProvider;

@Transactional(readOnly = true)
public void splash(Long userId) {
User findUser = getUser(userId);
validateCompletedPropensityTest(findUser);
}

public UserSignInResponse signIn(String token, UserSignInRequest request) {
Platform enumPlatform = getEnumPlatformFromStringPlatform(request.platform());
String platformId = getPlatformId(token, enumPlatform);
User findUser = getUser(enumPlatform, platformId);
boolean isResult = hasResult(findUser);
Token issueToken = jwtProvider.issueToken(findUser.getId());
updateRefreshToken(issueToken.refreshToken(), findUser);

return UserSignInResponse.of(issueToken, isResult);
}

Expand All @@ -57,7 +63,6 @@ public UserResponse signUp(String token, UserSignUpRequest request) {
User savedUser = saveUser(request, platformId, enumPlatform);
Token issueToken = jwtProvider.issueToken(savedUser.getId());
updateRefreshToken(issueToken.refreshToken(), savedUser);

return UserResponse.of(issueToken);
}

Expand All @@ -77,25 +82,18 @@ public UserResponse reissue(String refreshToken, UserReissueRequest request) {
User findUser = getUser(userId);
Token issueToken = jwtProvider.issueToken(userId);
updateRefreshToken(issueToken.refreshToken(), findUser);

return UserResponse.of(issueToken);
}

@Transactional(readOnly = true)
public ProfileGetResponse getProfile(Long userId) {
User findUser = getUser(userId);
return ProfileGetResponse.of(findUser);
}

private String getPlatformId(String token, Platform platform) {
if (platform == APPLE) {
return appleOAuthProvider.getApplePlatformId(token);
}
return kakaoOAuthProvider.getKakaoPlatformId(token);
}

private void validateDuplicateUser(Platform platform, String platformId) {
if (userRepository.existsUserByPlatformAndPlatformId(platform, platformId)) {
throw new ConflictException(ErrorMessage.DUPLICATE_USER);
private void validateCompletedPropensityTest(User findUser) {
if (findUser.getResult() == null) {
throw new EntityNotFoundException(ErrorMessage.RESULT_NOT_FOUND);
}
}

Expand All @@ -104,28 +102,28 @@ private User getUser(Platform platform, String platformId) {
.orElseThrow(() -> new EntityNotFoundException(ErrorMessage.USER_NOT_FOUND));
}

private void updateRefreshToken(String refreshToken, User user) {
user.updateRefreshToken(refreshToken);
refreshTokenRepository.save(RefreshToken.createRefreshToken(user.getId(), refreshToken));
private boolean hasResult(User user) {
return user.getResult() != null;
}

private boolean hasResult(User user) {
if (user.getResult() == null) {
return false;
private String getPlatformId(String token, Platform platform) {
if (platform == APPLE) {
return appleOAuthProvider.getApplePlatformId(token);
}
return kakaoOAuthProvider.getKakaoPlatformId(token);
}

private void validateDuplicateUser(Platform platform, String platformId) {
if (userRepository.existsUserByPlatformAndPlatformId(platform, platformId)) {
throw new ConflictException(ErrorMessage.DUPLICATE_USER);
}
return true;
}

private User saveUser(UserSignUpRequest request, String platformId, Platform enumPlatform) {
User user = createUser(request.name(), request.intro(), platformId, enumPlatform);
return userRepository.save(user);
}

private User getUser(Long userId) {
return userRepository.findById(userId)
.orElseThrow(() -> new EntityNotFoundException(ErrorMessage.USER_NOT_FOUND));
}

private void deleteRefreshToken(User user) {
user.updateRefreshToken(null);
refreshTokenRepository.deleteById(user.getId());
Expand All @@ -142,6 +140,11 @@ private void validateRefreshToken(String refreshToken, Long userId) {
}
}

private void updateRefreshToken(String refreshToken, User user) {
user.updateRefreshToken(refreshToken);
refreshTokenRepository.save(createRefreshToken(user.getId(), refreshToken));
}

private String getRefreshToken(Long userId) {
try {
return getRefreshTokenFromRedis(userId);
Expand All @@ -151,6 +154,11 @@ private String getRefreshToken(Long userId) {
}
}

private User getUser(Long userId) {
return userRepository.findById(userId)
.orElseThrow(() -> new EntityNotFoundException(ErrorMessage.USER_NOT_FOUND));
}

private String getRefreshTokenFromRedis(Long userId) {
RefreshToken storedRefreshToken = refreshTokenRepository.findById(userId)
.orElseThrow(() -> new EntityNotFoundException(ErrorMessage.REFRESH_TOKEN_NOT_FOUND));
Expand Down