Skip to content

feat :: new user mission #104

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.

Sign up for GitHub

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

Merged
tlsalsco41122 merged 1 commit into from
Nov 27, 2025
Merged

feat :: new user mission #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions src/main/java/com/olympus/uga/domain/auth/usecase/AuthUseCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import com.olympus.uga.domain.auth.presentation.dto.request.SignInReq;
import com.olympus.uga.domain.auth.presentation.dto.response.RefreshRes;
import com.olympus.uga.domain.auth.presentation.dto.response.SignInRes;
import com.olympus.uga.domain.mission.service.MissionAssignService;
import com.olympus.uga.domain.sms.error.SmsErrorCode;
import com.olympus.uga.domain.user.domain.User;
import com.olympus.uga.domain.auth.error.AuthErrorCode;
Expand All @@ -30,6 +31,7 @@ public class AuthUseCase {
private final JwtProvider jwtProvider;
private final BCryptPasswordEncoder passwordEncoder;
private final StringRedisTemplate redisTemplate;
private final MissionAssignService missionAssignService;

@Transactional
public Response signUp(SignUpReq req) {
Expand All @@ -42,8 +44,8 @@ public Response signUp(SignUpReq req) {
throw new CustomException(SmsErrorCode.PHONE_NUM_NOT_VERIFIED);
}

// TODO: 미션 할당
userJpaRepo.save(SignUpReq.fromSignUpReq(req, passwordEncoder.encode(req.password())));
User savedUser = userJpaRepo.save(SignUpReq.fromSignUpReq(req, passwordEncoder.encode(req.password())));
missionAssignService.assignMissionsToNewUser(savedUser); // 미션 부여
redisTemplate.delete("sms:verified:" + req.phoneNum());

return Response.created("회원가입에 성공하였습니다.");
Expand Down
17 changes: 11 additions & 6 deletions src/main/java/com/olympus/uga/domain/oauth/usecase/OAuthUseCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,12 @@
import com.olympus.uga.domain.user.domain.repo.UserJpaRepo;
import com.olympus.uga.global.common.ResponseData;
import com.olympus.uga.global.security.jwt.util.JwtProvider;
import com.olympus.uga.domain.mission.service.MissionAssignService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.Optional;

import static com.olympus.uga.domain.oauth.presentation.dto.response.GoogleUserInfoDto.registerGoogleUser;
import static com.olympus.uga.domain.oauth.presentation.dto.response.KakaoUserInfoDto.registerKakaoUser;

Expand All @@ -30,6 +29,7 @@ public class OAuthUseCase {
private final GoogleOAuthService googleOAuthService;
private final AppleOAuthService appleOAuthService;
private final JwtProvider jwtProvider;
private final MissionAssignService missionAssignService;

@Transactional
public ResponseData<SignInRes> loginWithKakaoToken(String accessToken) {
Expand All @@ -38,7 +38,9 @@ public ResponseData<SignInRes> loginWithKakaoToken(String accessToken) {
User user = userJpaRepo.findByOauthIdAndLoginType(userInfo.id(), LoginType.KAKAO)
.orElseGet(() -> {
User newUser = registerKakaoUser(userInfo);
return userJpaRepo.save(newUser);
User saved = userJpaRepo.save(newUser);
missionAssignService.assignMissionsToNewUser(saved); // 미션부여
return saved;
});

return ResponseData.ok("카카오 로그인에 성공하였습니다.", jwtProvider.createToken(user.getId()));
Expand All @@ -51,7 +53,9 @@ public ResponseData<SignInRes> loginWithGoogleToken(String accessToken) {
User user = userJpaRepo.findByOauthIdAndLoginType(userInfo.id(), LoginType.GOOGLE)
.orElseGet(() -> {
User newUser = registerGoogleUser(userInfo);
return userJpaRepo.save(newUser);
User saved = userJpaRepo.save(newUser);
missionAssignService.assignMissionsToNewUser(saved);
return saved;
});

return ResponseData.ok("구글 로그인에 성공하였습니다.", jwtProvider.createToken(user.getId()));
Expand All @@ -65,8 +69,9 @@ public ResponseData<SignInRes> appleLogin(String code) {
// 2. 기존 회원 확인 및 처리
User user = userJpaRepo.findByOauthIdAndLoginType(appleUser.getOauthId(), LoginType.APPLE)
.orElseGet(() -> {
User newUser = appleUser;
return userJpaRepo.save(newUser);
User saved = userJpaRepo.save(appleUser);
missionAssignService.assignMissionsToNewUser(saved);
return saved;
});

// 기존 회원인 경우 로그인 시간 업데이트
Expand Down