Skip to content

fix(backend): no-op vinegar throws after same-tick dethrone #169

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

Open
Logiar wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix(backend): no-op vinegar throws after same-tick dethrone #169

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
19 changes: 17 additions & 2 deletions .../src/main/java/de/kaliburg/morefair/game/ladder/services/impl/LadderEventServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,10 @@
import java.time.ZoneOffset;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.EnableScheduling;
Expand Down Expand Up @@ -95,6 +97,7 @@ public void handleEvents() throws InterruptedException {

for (int i = 1; i <= ladderService.findAllByRound(currentRound).size(); i++) {
LadderEntity ladder = ladderService.findCurrentLadderWithNumber(i).orElseThrow();
Set<Long> dethronedTargetAccountIds = new HashSet<>();
List<Event<LadderEventType>> events =
eventMap.computeIfAbsent(ladder.getNumber(), k -> new ArrayList<>());
List<Event<LadderEventType>> eventsToBeRemoved = new ArrayList<>();
Expand All @@ -112,7 +115,7 @@ public void handleEvents() throws InterruptedException {
eventsToBeRemoved.add(e);
}
} else if (THROW_VINEGAR.equals(e.getEventType())) {
if (!throwVinegar(e, ladder)) {
if (!throwVinegar(e, ladder, dethronedTargetAccountIds)) {
eventsToBeRemoved.add(e);
}
} else if (BUY_AUTO_PROMOTE.equals(e.getEventType())) {
Expand Down Expand Up @@ -465,8 +468,19 @@ boolean promote(Event<LadderEventType> event, LadderEntity ladder) {
* @param ladder the ladder the ranker is on
* @return if the ranker can throw vinegar at the rank-1-ranker
*/
boolean throwVinegar(Event<LadderEventType> event, LadderEntity ladder) {
boolean throwVinegar(Event<LadderEventType> event, LadderEntity ladder,
Set<Long> dethronedTargetAccountIds) {
try {
List<RankerEntity> rankers = rankerService.findAllByLadderId(ladder.getId());
if (rankers.isEmpty()) {
return false;
}

Long currentTopAccountId = rankers.get(0).getAccountId();
if (dethronedTargetAccountIds.contains(currentTopAccountId)) {
return false;
}

var optional = vinegarThrowService.throwVinegar(event);
if (optional.isEmpty()) {
return false;
Expand Down Expand Up @@ -500,6 +514,7 @@ boolean throwVinegar(Event<LadderEventType> event, LadderEntity ladder) {
GrapesController.PRIVATE_VINEGAR_DESTINATION, throwRecordResponse);

if (vinegarThrow.isSuccessful()) {
dethronedTargetAccountIds.add(vinegarThrow.getTargetAccountId());
removeMulti(
new Event<>(LadderEventType.REMOVE_MULTI, vinegarThrow.getTargetAccountId()),
ladder
Expand Down
270 changes: 270 additions & 0 deletions .../test/java/de/kaliburg/morefair/game/ladder/services/impl/LadderEventServiceImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,270 @@
package de.kaliburg.morefair.game.ladder.services.impl;

import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

import com.google.gson.Gson;
import de.kaliburg.morefair.FairConfig;
import de.kaliburg.morefair.account.model.AccountEntity;
import de.kaliburg.morefair.account.services.AccountService;
import de.kaliburg.morefair.api.utils.WsUtils;
import de.kaliburg.morefair.chat.services.ChatService;
import de.kaliburg.morefair.chat.services.MessageService;
import de.kaliburg.morefair.events.Event;
import de.kaliburg.morefair.events.data.VinegarData.VinegarSuccessType;
import de.kaliburg.morefair.events.types.LadderEventType;
import de.kaliburg.morefair.game.UpgradeUtils;
import de.kaliburg.morefair.game.ladder.model.LadderEntity;
import de.kaliburg.morefair.game.ladder.services.LadderService;
import de.kaliburg.morefair.game.ranker.model.RankerEntity;
import de.kaliburg.morefair.game.ranker.services.RankerService;
import de.kaliburg.morefair.game.ranker.services.utils.RankerUtilsService;
import de.kaliburg.morefair.game.round.services.RoundService;
import de.kaliburg.morefair.game.round.services.UnlocksService;
import de.kaliburg.morefair.game.round.services.utils.UnlocksUtilsService;
import de.kaliburg.morefair.game.season.services.AchievementsService;
import de.kaliburg.morefair.game.vinegar.model.VinegarThrowEntity;
import de.kaliburg.morefair.game.vinegar.model.dto.ThrowRecordResponse;
import de.kaliburg.morefair.game.vinegar.services.VinegarThrowService;
import de.kaliburg.morefair.game.vinegar.services.mapper.VinegarThrowMapper;
import de.kaliburg.morefair.statistics.services.StatisticsService;
import java.math.BigInteger;
import java.time.OffsetDateTime;
import java.time.ZoneOffset;
import java.util.HashSet;
import java.util.List;
import java.util.Optional;
import java.util.Set;
import java.util.UUID;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;

@ExtendWith(MockitoExtension.class)
class LadderEventServiceImplTest {

@Mock
private AccountService accountService;
@Mock
private ChatService chatService;
@Mock
private MessageService messageService;
@Mock
private RankerService rankerService;
@Mock
private LadderService ladderService;
@Mock
private RankerUtilsService rankerUtilsService;
@Mock
private RoundService roundService;
@Mock
private UnlocksService unlocksService;
@Mock
private UnlocksUtilsService unlocksUtilsService;
@Mock
private AchievementsService achievementsService;
@Mock
private VinegarThrowService vinegarThrowService;
@Mock
private VinegarThrowMapper vinegarThrowMapper;
@Mock
private StatisticsService statisticsService;
@Mock
private WsUtils wsUtils;
@Mock
private UpgradeUtils upgradeUtils;
@Mock
private FairConfig fairConfig;

private LadderEventServiceImpl service;

@BeforeEach
void setUp() {
service = spy(new LadderEventServiceImpl(
accountService,
chatService,
messageService,
rankerService,
ladderService,
rankerUtilsService,
roundService,
unlocksService,
unlocksUtilsService,
achievementsService,
vinegarThrowService,
vinegarThrowMapper,
statisticsService,
wsUtils,
upgradeUtils,
fairConfig,
new Gson()
));
}

@Test
void shouldCallRemoveMultiOnlyOnceForSameTargetAcrossSuccessfulThrowsInOneTick() {
long targetAccountId = 42L;
long firstThrowerAccountId = 7L;
long secondThrowerAccountId = 8L;
Set<Long> dethronedTargetAccountIds = new HashSet<>();
Event<LadderEventType> firstThrowEvent = new Event<>(LadderEventType.THROW_VINEGAR,
firstThrowerAccountId);
Event<LadderEventType> secondThrowEvent = new Event<>(LadderEventType.THROW_VINEGAR,
secondThrowerAccountId);
LadderEntity ladder = new LadderEntity()
.setId(1L)
.setNumber(1)
.setRoundId(1L)
.setBasePointsToPromote(BigInteger.ONE)
.setScaling(1);

VinegarThrowEntity successfulThrow = new VinegarThrowEntity(
null,
UUID.randomUUID(),
OffsetDateTime.now(ZoneOffset.UTC),
firstThrowerAccountId,
targetAccountId,
1L,
BigInteger.ONE,
100,
BigInteger.ZERO,
BigInteger.ZERO,
VinegarSuccessType.SUCCESS,
0,
0
);

AccountEntity account = new AccountEntity().setUuid(UUID.randomUUID());
RankerEntity topRanker = RankerEntity.builder()
.ladderId(ladder.getId())
.accountId(targetAccountId)
.rank(1)
.build();
ThrowRecordResponse throwRecordResponse = new ThrowRecordResponse(
firstThrowerAccountId,
targetAccountId,
0,
1,
1,
"1",
100,
VinegarSuccessType.SUCCESS
);

when(vinegarThrowService.throwVinegar(any())).thenReturn(Optional.of(successfulThrow));
when(vinegarThrowMapper.mapVinegarThrowToThrowRecord(successfulThrow)).thenReturn(throwRecordResponse);
when(accountService.findById(any())).thenReturn(Optional.of(account));
when(rankerService.findAllByLadderId(ladder.getId())).thenReturn(List.of(topRanker), List.of(topRanker));
doNothing().when(service).removeMulti(any(), eq(ladder));

assertTrue(service.throwVinegar(firstThrowEvent, ladder, dethronedTargetAccountIds));
assertFalse(service.throwVinegar(secondThrowEvent, ladder, dethronedTargetAccountIds));

verify(service, times(1)).removeMulti(any(), eq(ladder));
verify(vinegarThrowService, times(1)).throwVinegar(any());
}

@Test
void shouldCallRemoveMultiTwiceForSameTargetAcrossDifferentTickSets() {
long firstThrowerAccountId = 7L;
long secondThrowerAccountId = 8L;
long targetAccountId = 42L;
Set<Long> firstTickDethronedTargetIds = new HashSet<>();
Set<Long> secondTickDethronedTargetIds = new HashSet<>();
Event<LadderEventType> firstThrowEvent = new Event<>(LadderEventType.THROW_VINEGAR,
firstThrowerAccountId);
Event<LadderEventType> secondThrowEvent = new Event<>(LadderEventType.THROW_VINEGAR,
secondThrowerAccountId);
LadderEntity ladder = new LadderEntity()
.setId(1L)
.setNumber(1)
.setRoundId(1L)
.setBasePointsToPromote(BigInteger.ONE)
.setScaling(1);

VinegarThrowEntity firstTargetThrow = new VinegarThrowEntity(
null,
UUID.randomUUID(),
OffsetDateTime.now(ZoneOffset.UTC),
firstThrowerAccountId,
targetAccountId,
1L,
BigInteger.ONE,
100,
BigInteger.ZERO,
BigInteger.ZERO,
VinegarSuccessType.SUCCESS,
0,
0
);

VinegarThrowEntity secondTargetThrow = new VinegarThrowEntity(
null,
UUID.randomUUID(),
OffsetDateTime.now(ZoneOffset.UTC),
secondThrowerAccountId,
targetAccountId,
1L,
BigInteger.ONE,
100,
BigInteger.ZERO,
BigInteger.ZERO,
VinegarSuccessType.SUCCESS,
0,
0
);

AccountEntity account = new AccountEntity().setUuid(UUID.randomUUID());
RankerEntity topRanker = RankerEntity.builder()
.ladderId(ladder.getId())
.accountId(targetAccountId)
.rank(1)
.build();
ThrowRecordResponse firstThrowRecordResponse = new ThrowRecordResponse(
firstThrowerAccountId,
targetAccountId,
0,
1,
1,
"1",
100,
VinegarSuccessType.SUCCESS
);
ThrowRecordResponse secondThrowRecordResponse = new ThrowRecordResponse(
secondThrowerAccountId,
targetAccountId,
0,
1,
1,
"1",
100,
VinegarSuccessType.SUCCESS
);

when(vinegarThrowService.throwVinegar(any())).thenReturn(Optional.of(firstTargetThrow),
Optional.of(secondTargetThrow));
when(vinegarThrowMapper.mapVinegarThrowToThrowRecord(firstTargetThrow)).thenReturn(
firstThrowRecordResponse);
when(vinegarThrowMapper.mapVinegarThrowToThrowRecord(secondTargetThrow)).thenReturn(
secondThrowRecordResponse);
when(accountService.findById(any())).thenReturn(Optional.of(account));
when(rankerService.findAllByLadderId(ladder.getId())).thenReturn(
List.of(topRanker),
List.of(topRanker));
doNothing().when(service).removeMulti(any(), eq(ladder));

assertTrue(service.throwVinegar(firstThrowEvent, ladder, firstTickDethronedTargetIds));
assertTrue(service.throwVinegar(secondThrowEvent, ladder, secondTickDethronedTargetIds));

verify(service, times(2)).removeMulti(any(), eq(ladder));
}
}