Skip to content

feat: battle reward/#688 #689

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
Finefinee merged 3 commits into from
Apr 15, 2026
Merged

feat: battle reward/#688 #689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9d4a280
feat: 배틀 승리, 무승부, 패배시 쿠키 지급
hjbin-25 Apr 15, 2026
7587280
feat: 출석에 따른 쿠키 지급 기록 추가
hjbin-25 Apr 15, 2026
9ab1f2a
fix: 배틀 보상 지급 시 동시성 이슈 수정
hjbin-25 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
120 changes: 120 additions & 0 deletions .../java/com/process/clash/application/compete/rival/battle/service/BattleFinishService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,14 @@

import com.process.clash.application.compete.rival.battle.port.out.BattleRepositoryPort;
import com.process.clash.application.compete.rival.rival.port.out.RivalRepositoryPort;
import com.process.clash.application.user.user.port.out.UserRepositoryPort;
import com.process.clash.application.user.userexphistory.port.out.UserExpHistoryRepositoryPort;
import com.process.clash.application.user.usergoodshistory.port.out.UserGoodsHistoryRepositoryPort;
import com.process.clash.domain.common.enums.GoodsActingCategory;
import com.process.clash.domain.rival.battle.entity.Battle;
import com.process.clash.domain.rival.rival.entity.Rival;
import com.process.clash.domain.user.user.entity.User;
import com.process.clash.domain.user.usergoodshistory.entity.UserGoodsHistory;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
Expand All @@ -14,6 +19,7 @@
import java.time.Instant;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Optional;
Expand All @@ -26,9 +32,17 @@
@Slf4j
public class BattleFinishService {

private static final Map<Integer, Integer> WINNER_COOKIE_BY_DURATION = Map.of(
3, 300,
5, 500,
7, 700
);

private final BattleRepositoryPort battleRepositoryPort;
private final RivalRepositoryPort rivalRepositoryPort;
private final UserExpHistoryRepositoryPort userExpHistoryRepositoryPort;
private final UserRepositoryPort userRepositoryPort;
private final UserGoodsHistoryRepositoryPort userGoodsHistoryRepositoryPort;

public void finishExpiredBattles() {
List<Battle> expiredInProgress = battleRepositoryPort.findExpiredInProgressBattles();
Expand Down Expand Up @@ -76,6 +90,7 @@ public void finishExpiredBattles() {

if (!battlesToUpdate.isEmpty()) {
battleRepositoryPort.saveAll(battlesToUpdate);
grantBatchBattleRewards(battlesToUpdate, rivalMap);
}
log.info("Expired battles processed. done={}", battlesToUpdate.size());
}
Expand Down Expand Up @@ -114,6 +129,12 @@ public Battle finishSingleIfExpired(Battle battle) {
Long winnerId = determineWinner(latest.id(), rival.firstUserId(), rival.secondUserId(), avgExpByUserAndBattle);
Battle finished = latest.finishWithWinner(winnerId);
Battle saved = battleRepositoryPort.save(finished);
if (winnerId != null) {
Long loserId = rival.firstUserId().equals(winnerId) ? rival.secondUserId() : rival.firstUserId();
grantBattleRewards(saved.duration(), winnerId, loserId);
} else {
grantDrawRewards(saved.duration(), rival.firstUserId(), rival.secondUserId());
}
log.info("Battle lazily finished on query. battleId={}, winnerId={}", saved.id(), winnerId);
return saved;
} catch (Exception e) {
Expand All @@ -131,4 +152,103 @@ private Long determineWinner(Long battleId, Long firstUserId, Long secondUserId,
if (secondExp > firstExp) return secondUserId;
return null; // 무승부
}

private void grantBatchBattleRewards(List<Battle> finishedBattles, Map<Long, Rival> rivalMap) {
Set<Long> userIds = new HashSet<>();
for (Battle battle : finishedBattles) {
Rival rival = rivalMap.get(battle.rivalId());
if (rival == null) continue;
userIds.add(rival.firstUserId());
userIds.add(rival.secondUserId());
}
if (userIds.isEmpty()) return;

Map<Long, User> userMap = userRepositoryPort.findByIdIn(userIds).stream()
.collect(Collectors.toMap(User::id, u -> u));
Comment thread
hjbin-25 marked this conversation as resolved.

List<UserGoodsHistory> historyToSave = new ArrayList<>();

for (Battle battle : finishedBattles) {
Rival rival = rivalMap.get(battle.rivalId());
if (rival == null) continue;

int winnerCookie = WINNER_COOKIE_BY_DURATION.getOrDefault(battle.duration(), 0);
int loserCookie = winnerCookie / 2;

if (battle.winnerId() != null) {
Long loserId = rival.firstUserId().equals(battle.winnerId())
? rival.secondUserId()
: rival.firstUserId();

User winner = userMap.get(battle.winnerId());
User loser = userMap.get(loserId);

if (winner != null) {
userMap.put(winner.id(), winner.addCookie(winnerCookie));
historyToSave.add(new UserGoodsHistory(null, null, GoodsActingCategory.BATTLE_WIN_REWARD, winnerCookie, null, winner.id()));
}
if (loser != null) {
userMap.put(loser.id(), loser.addCookie(loserCookie));
historyToSave.add(new UserGoodsHistory(null, null, GoodsActingCategory.BATTLE_LOSE_REWARD, loserCookie, null, loser.id()));
}
} else {
int drawCookie = (winnerCookie + loserCookie) / 2;
User first = userMap.get(rival.firstUserId());
User second = userMap.get(rival.secondUserId());

if (first != null) {
userMap.put(first.id(), first.addCookie(drawCookie));
historyToSave.add(new UserGoodsHistory(null, null, GoodsActingCategory.BATTLE_DRAW_REWARD, drawCookie, null, first.id()));
}
if (second != null) {
userMap.put(second.id(), second.addCookie(drawCookie));
historyToSave.add(new UserGoodsHistory(null, null, GoodsActingCategory.BATTLE_DRAW_REWARD, drawCookie, null, second.id()));
}
}
}

userRepositoryPort.saveAll(new ArrayList<>(userMap.values()));
userGoodsHistoryRepositoryPort.saveAll(historyToSave);
}

private void grantBattleRewards(int duration, Long winnerId, Long loserId) {
int winnerCookie = WINNER_COOKIE_BY_DURATION.getOrDefault(duration, 0);
int loserCookie = winnerCookie / 2;

List<User> usersToSave = new ArrayList<>();
List<UserGoodsHistory> historyToSave = new ArrayList<>();

userRepositoryPort.findByIdForUpdate(winnerId).ifPresent(winner -> {
usersToSave.add(winner.addCookie(winnerCookie));
historyToSave.add(new UserGoodsHistory(null, null, GoodsActingCategory.BATTLE_WIN_REWARD, winnerCookie, null, winnerId));
});
userRepositoryPort.findByIdForUpdate(loserId).ifPresent(loser -> {
usersToSave.add(loser.addCookie(loserCookie));
historyToSave.add(new UserGoodsHistory(null, null, GoodsActingCategory.BATTLE_LOSE_REWARD, loserCookie, null, loserId));
});

userRepositoryPort.saveAll(usersToSave);
userGoodsHistoryRepositoryPort.saveAll(historyToSave);
}

private void grantDrawRewards(int duration, Long firstUserId, Long secondUserId) {
int winnerCookie = WINNER_COOKIE_BY_DURATION.getOrDefault(duration, 0);
int loserCookie = winnerCookie / 2;
int drawCookie = (winnerCookie + loserCookie) / 2;

List<User> usersToSave = new ArrayList<>();
List<UserGoodsHistory> historyToSave = new ArrayList<>();

userRepositoryPort.findByIdForUpdate(firstUserId).ifPresent(user -> {
usersToSave.add(user.addCookie(drawCookie));
historyToSave.add(new UserGoodsHistory(null, null, GoodsActingCategory.BATTLE_DRAW_REWARD, drawCookie, null, firstUserId));
});
userRepositoryPort.findByIdForUpdate(secondUserId).ifPresent(user -> {
usersToSave.add(user.addCookie(drawCookie));
historyToSave.add(new UserGoodsHistory(null, null, GoodsActingCategory.BATTLE_DRAW_REWARD, drawCookie, null, secondUserId));
});

userRepositoryPort.saveAll(usersToSave);
userGoodsHistoryRepositoryPort.saveAll(historyToSave);
}
}
13 changes: 10 additions & 3 deletions ...java/com/process/clash/application/user/userattendance/service/MarkAttendanceService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,11 @@
import com.process.clash.application.user.userattendance.exception.exception.conflict.AlreadyAttendedException;
import com.process.clash.application.user.userattendance.port.in.MarkAttendanceUseCase;
import com.process.clash.application.user.userattendance.port.out.UserAttendanceRepositoryPort;
import com.process.clash.application.user.usergoodshistory.port.out.UserGoodsHistoryRepositoryPort;
import com.process.clash.domain.common.enums.GoodsActingCategory;
import com.process.clash.domain.user.user.entity.User;
import com.process.clash.domain.user.userattendance.entity.UserAttendance;
import com.process.clash.domain.user.usergoodshistory.entity.UserGoodsHistory;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
Expand All @@ -26,6 +29,7 @@ public class MarkAttendanceService implements MarkAttendanceUseCase {

private final UserAttendanceRepositoryPort userAttendanceRepositoryPort;
private final UserRepositoryPort userRepositoryPort;
private final UserGoodsHistoryRepositoryPort userGoodsHistoryRepositoryPort;

@Override
public MarkAttendanceData.Result execute(MarkAttendanceData.Command command) {
Expand All @@ -45,12 +49,15 @@ public MarkAttendanceData.Result execute(MarkAttendanceData.Command command) {
User user = userRepositoryPort.findByIdForUpdate(userId)
.orElseThrow(UserNotFoundException::new);

int earnedCookies = isFullWeekCompleted(userId, attendanceDate)
? WEEKLY_COOKIE_REWARD
: DAILY_COOKIE_REWARD;
boolean isFullWeek = isFullWeekCompleted(userId, attendanceDate);
int earnedCookies = isFullWeek ? WEEKLY_COOKIE_REWARD : DAILY_COOKIE_REWARD;
GoodsActingCategory category = isFullWeek
? GoodsActingCategory.ATTENDANCE_WEEKLY_REWARD
: GoodsActingCategory.ATTENDANCE_DAILY_REWARD;

User updated = user.incrementAttendanceStreak().addCookie(earnedCookies);
userRepositoryPort.save(updated);
userGoodsHistoryRepositoryPort.save(new UserGoodsHistory(null, null, category, earnedCookies, null, userId));

return new MarkAttendanceData.Result(updated.currentAttendanceStreak(), earnedCookies);
}
Expand Down
7 changes: 6 additions & 1 deletion src/main/java/com/process/clash/domain/common/enums/GoodsActingCategory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,10 @@ public enum GoodsActingCategory {
PURCHASE,
SEASON_REWARD,
ROADMAP_V2_CHAPTER_REWARD,
ROADMAP_V2_SECTION_REWARD
ROADMAP_V2_SECTION_REWARD,
BATTLE_WIN_REWARD,
BATTLE_LOSE_REWARD,
BATTLE_DRAW_REWARD,
ATTENDANCE_DAILY_REWARD,
ATTENDANCE_WEEKLY_REWARD
}
2 changes: 1 addition & 1 deletion ...ash/adapter/persistence/roadmap/sectionprogress/UserSectionProgressJpaRepositoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ void findRankingsWithMyRank_keepsSameRankWhenTied() {
private UserJpaEntity persistUser(String username, String name) {
Instant now = Instant.now();
User user = new User(null, now, now, username, username + "@gmail.com", name, "password",
Role.USER, "", 0, 0, Major.NONE, UserStatus.PENDING, null, false, RankTier.NONE, ExpTier.UNRANKED);
Role.USER, "", 0, 0, Major.NONE, UserStatus.PENDING, null, false, RankTier.NONE, ExpTier.UNRANKED, 0);
UserJpaEntity entity = userJpaMapper.toJpaEntity(user);
em.persist(entity);
return entity;
Expand Down
Loading
Loading