Max/MewoLab_AquaDX
1
0
Fork 0
mirror of https://github.com/MewoLab/AquaDX.git synced 2026-09-29 18:27:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

[ongeki] Fix event ranking query incompatibility with MySQL/MariaDB

Browse Source
This commit is contained in:
Mikira Sora
2023-03-24 17:51:27 +00:00
committed by Dom Eori
parent 35f0c000bf
commit 447ddd99b0
4 changed files with 47 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/icu/samnyan/aqua/sega/ongeki/dao/userdata/OngekiRepositoryTest.java
+20 -5
View File
@@ -181,19 +181,28 @@ class OngekiRepositoryTest {
var u1 = getNewRandomValidUser();
var u2 = getNewRandomValidUser();
var u3 = getNewRandomValidUser();
var u4 = getNewRandomValidUser();
final var eventId = 2857;
final var eventId2 = 2858;
userEventPointRepository.saveAll(List.of(
getEventPoint(u1, eventId, 500),
getEventPoint(u3, eventId, 2857),
getEventPoint(u2, eventId, 600),
getEventPoint(u3, eventId, 2857)
getEventPoint(u4, eventId, 600),
getEventPoint(u1, eventId, 500),
getEventPoint(u3, eventId2, 2857),
getEventPoint(u4, eventId2, 600),
getEventPoint(u2, eventId2, 25)
));
var eventPointData = userEventPointRepository.findByUser_Card_ExtId(u1.getCard().getExtId()).get(0);
assertThat(calculateEventPointRank(u1, eventId)).isEqualTo(4);
assertThat(calculateEventPointRank(u4, eventId)).isEqualTo(2);
assertThat(calculateEventPointRank(u3, eventId)).isEqualTo(1);
var rank = userEventPointRepository.calculateRankByUserAndEventId(eventPointData.getUser().getId(), eventPointData.getEventId());
assertThat(rank).isEqualTo(3);
assertThat(calculateEventPointRank(u4, eventId2)).isEqualTo(2);
assertThat(calculateEventPointRank(u2, eventId2)).isEqualTo(3);
}
@Test
@@ -418,6 +427,12 @@ class OngekiRepositoryTest {
return new UserCharacter(-1, u, characterId, 0, 0, 10, 1, 1, 1, "2020", false);
}
private int calculateEventPointRank(UserData user, int eventId) {
var eventPointData = userEventPointRepository.findByUserAndEventId(user, eventId).get();
var rank = userEventPointRepository.calculateRankByUserAndEventId(eventPointData.getUser().getId(), eventPointData.getEventId());
return rank;
}
private UserDeck getDeck(UserData u, Integer deckId) {
return new UserDeck(-1, u, deckId, 1, 1, 1);
}