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
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import com.swyp.picke.domain.oauth.repository.AuthRefreshTokenRepository;
import com.swyp.picke.domain.oauth.repository.UserSocialAccountRepository;
import com.swyp.picke.domain.user.enums.CharacterType;
import com.swyp.picke.domain.user.enums.CreditType;
import com.swyp.picke.domain.user.enums.UserRole;
import com.swyp.picke.domain.user.entity.User;
import com.swyp.picke.domain.user.entity.UserProfile;
Expand All @@ -24,6 +25,7 @@
import com.swyp.picke.domain.user.repository.UserSettingsRepository;
import com.swyp.picke.domain.user.repository.UserTendencyScoreRepository;
import com.swyp.picke.domain.user.repository.UserWithdrawalRepository;
import com.swyp.picke.domain.user.service.CreditService;
import com.swyp.picke.global.common.exception.CustomException;
import com.swyp.picke.global.common.exception.ErrorCode;
import lombok.RequiredArgsConstructor;
Expand Down Expand Up @@ -84,6 +86,7 @@ public class AuthService {
private final UserTendencyScoreRepository userTendencyScoreRepository;
private final UserWithdrawalRepository userWithdrawalRepository;
private final JwtProvider jwtProvider;
private final CreditService creditService;

public LoginResponse login(String provider, LoginRequest request) {

Expand Down Expand Up @@ -119,6 +122,9 @@ public LoginResponse login(String provider, LoginRequest request) {
.providerEmail(oAuthUserInfo.getEmail())
.build();
socialAccountRepository.save(socialAccount);

// 크레딧 지급 (30 크레딧)
creditService.addCredit(user.getId(), CreditType.DEFAULT_CREDIT, user.getId());
isNewUser = true;
} else {
user = socialAccount.getUser();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

@Getter
public enum CreditType {
DEFAULT_CREDIT(30), // 기본 크레딧: 회원가입 시 기본 지급
BATTLE_VOTE(5), // 배틀 참여 보상: 사후 투표 완료 시 즉시 지급
BATTLE_ENTRY(-10), // 지난 배틀 이용 비용: 사전 투표 최초 진입 시 차감
MAJORITY_WIN(10), // 다수결 보상: 월요일 배치, 2주 전 배틀 TOP≥10 대상
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import com.swyp.picke.domain.user.repository.UserSettingsRepository;
import com.swyp.picke.domain.user.repository.UserTendencyScoreRepository;
import com.swyp.picke.domain.user.repository.UserWithdrawalRepository;
import com.swyp.picke.domain.user.service.CreditService;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
Expand Down Expand Up @@ -48,6 +49,7 @@ class OAuthServiceTest {
@Mock private UserTendencyScoreRepository userTendencyScoreRepository;
@Mock private UserWithdrawalRepository userWithdrawalRepository;
@Mock private JwtProvider jwtProvider;
@Mock private CreditService creditService;

private AuthService authService;

Expand All @@ -59,7 +61,7 @@ void setUp() {
socialAccountRepository, refreshTokenRepository,
userProfileRepository, userSettingsRepository, userTendencyScoreRepository,
userWithdrawalRepository,
jwtProvider
jwtProvider, creditService
);
}

Expand Down