Skip to content

#173 [Fix] 채택 시 지급 포인트 변경 #174

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
si-zero merged 2 commits into from
Apr 15, 2026
Merged

#173 [Fix] 채택 시 지급 포인트 변경 #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b53b23f
feat: 크레딧 enum 파일 추가
si-zero Apr 15, 2026
32ad5cf
fix: 배틀 제안 서비스 크레딧 관련 수정
si-zero Apr 15, 2026
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
16 changes: 6 additions & 10 deletions src/main/java/com/swyp/picke/domain/battle/service/BattleProposalService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,20 +30,17 @@ public class BattleProposalService {
private final CreditService creditService;
private final UserService userService;

private static final int PROPOSAL_COST = 30;
private static final int PROPOSAL_REWARD = 100;

@Transactional
public BattleProposalResponse propose(BattleProposalRequest request) {
User user = userService.findCurrentUser();

// 크레딧 잔액 확인
int cost = CreditType.TOPIC_SUGGEST.getDefaultAmount();

int totalCredits = creditService.getTotalPoints(user.getId());
if (totalCredits < PROPOSAL_COST) {
if (totalCredits < cost) {
throw new CustomException(ErrorCode.CREDIT_NOT_ENOUGH);
}

// 제안 저장
BattleProposal proposal = BattleProposal.builder()
.user(user)
.category(request.getCategory())
Expand All @@ -55,8 +52,7 @@ public BattleProposalResponse propose(BattleProposalRequest request) {

battleProposalRepository.save(proposal);

// 30크레딧 차감 (음수로 저장)
creditService.addCredit(user.getId(), CreditType.TOPIC_SUGGEST, -PROPOSAL_COST, proposal.getId());
creditService.addCredit(user.getId(), CreditType.TOPIC_SUGGEST, -cost, proposal.getId());

return new BattleProposalResponse(proposal);
}
Expand Down Expand Up @@ -87,8 +83,8 @@ public BattleProposalResponse review(Long proposalId, BattleProposalReviewReques

if (request.getAction() == BattleProposalReviewRequest.Action.ACCEPT) {
proposal.accept();
// 100크레딧 지급
creditService.addCredit(proposal.getUser().getId(), CreditType.TOPIC_ADOPTED, PROPOSAL_REWARD, proposalId);
int reward = CreditType.TOPIC_ADOPTED.getDefaultAmount();
creditService.addCredit(proposal.getUser().getId(), CreditType.TOPIC_ADOPTED, reward, proposalId);
} else {
proposal.reject();
}
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/com/swyp/picke/domain/user/enums/CreditType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ public enum CreditType {
MAJORITY_WIN(10), // 다수결 보상: 월요일 배치, 2주 전 배틀 TOP≥10 대상
BEST_COMMENT(50), // 베댓 보상: 월요일 배치, 2주 전 배틀 좋아요 1위
WEEKLY_CHARGE(40), // 주간 자동 충전: 매주 월요일 00:00 활성 사용자 전체
FREE_CHARGE(0); // 광고/자유 충전: 가변 금액
FREE_CHARGE(0), // 광고/자유 충전: 가변 금액
TOPIC_SUGGEST(30), // 주제 제안
TOPIC_ADOPTED(100); // 주제 채택

private final int defaultAmount;

Expand Down