Thibaut/ffsaf-site
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

Compare commits

base: Thibaut:a1e5006e952f30e93983f5f86411c1e937015fcf
Branches Tags
Thibaut:master
Thibaut:dev
Thibaut:dev-comp
Thibaut:theme
Thibaut:Avon1
..
compare: Thibaut:d357328e4817d5290e8ed9c6f3ce65ee0ee27b4a
Branches Tags
Thibaut:master
Thibaut:dev
Thibaut:dev-comp
Thibaut:theme
Thibaut:Avon1

No commits in common. "a1e5006e952f30e93983f5f86411c1e937015fcf" and "d357328e4817d5290e8ed9c6f3ce65ee0ee27b4a" have entirely different histories.
a1e5006e95 ... d357328e48

1 changed files with 80 additions and 73 deletions
Show Stats Expand all files Collapse all files

37
src/main/java/fr/titionfire/ffsaf/domain/service/ResultService.java
View File

@ -755,10 +755,13 @@ public class ResultService {
List<CardModel> cards = new java.util.ArrayList<>(); List<CardModel> cards = new java.util.ArrayList<>();
//noinspection unchecked //noinspection unchecked
return cacheClubClassement.invalidateIf( cacheClubClassement.invalidateIf(
(p) -> ((Pair<Long, List<ClubClassement>>) p).getKey() > System.currentTimeMillis()) (p) -> ((Pair<Long, List<ClubClassement>>) p).getKey() > System.currentTimeMillis());
.chain(__ -> cache ? Uni.createFrom().voidItem() : cacheClubClassement.invalidate(uuid))
.chain(o -> cacheClubClassement.getAsync(uuid, k -> cardRepository.list("competition.uuid = ?1", uuid) if (!cache)
cacheClubClassement.invalidate(uuid);
return cacheClubClassement.getAsync(uuid, k -> cardRepository.list("competition.uuid = ?1", uuid)
.invoke(__ -> System.out.println("Cache miss for club classement with uuid " + uuid)) .invoke(__ -> System.out.println("Cache miss for club classement with uuid " + uuid))
.invoke(cards::addAll) .invoke(cards::addAll)
.chain(__ -> matchRepository.list("category.compet.uuid = ?1", uuid)) .chain(__ -> matchRepository.list("category.compet.uuid = ?1", uuid))
@ -775,8 +778,7 @@ public class ResultService {
.map(entry -> { .map(entry -> {
ResultCategoryData tmp = new ResultCategoryData(); ResultCategoryData tmp = new ResultCategoryData();
getArray2(entry.getValue().stream().map(m -> new MatchModelExtend(m, cards)) getArray2(entry.getValue().stream().map(m -> new MatchModelExtend(m, cards)).toList(),
.toList(),
null, tmp); null, tmp);
getClassementArray(entry.getKey(), null, cards, tmp); getClassementArray(entry.getKey(), null, cards, tmp);
@ -787,14 +789,12 @@ public class ResultService {
.map(categoryData -> { .map(categoryData -> {
HashMap<String, ClubClassement> clubMap = new HashMap<>(); HashMap<String, ClubClassement> clubMap = new HashMap<>();
categoryData.forEach( categoryData.forEach(c -> c.getClassement().stream().map(ResultCategoryData.ClassementData::comb)
c -> c.getClassement().stream().map(ResultCategoryData.ClassementData::comb)
.filter(Objects::nonNull) .filter(Objects::nonNull)
.distinct() .distinct()
.map(comb -> { .map(comb -> {
if (comb instanceof MembreModel membreModel2) { if (comb instanceof MembreModel membreModel2) {
return (membreModel2.getClub() != null) ? membreModel2.getClub() return (membreModel2.getClub() != null) ? membreModel2.getClub().getName() : "";
.getName() : "";
} else if (comb instanceof CompetitionGuestModel guestModel) { } else if (comb instanceof CompetitionGuestModel guestModel) {
return guestModel.getClub(); return guestModel.getClub();
} }
@ -802,21 +802,28 @@ public class ResultService {
}) })
.filter(s -> s != null && !s.isBlank() && !s.equals("Team")) .filter(s -> s != null && !s.isBlank() && !s.equals("Team"))
.distinct() .distinct()
.forEach(clubName -> clubMap.putIfAbsent(clubName, .forEach(clubName -> clubMap.putIfAbsent(clubName, new ClubClassement(clubName))));
new ClubClassement(clubName))));
System.out.println(clubMap.keySet());
categoryData.forEach(c -> c.getClassement().forEach(classementData -> { categoryData.forEach(c -> c.getClassement().forEach(classementData -> {
System.out.println("Classement data for " + c.getName() + ": " + classementData.name() + " - " +
classementData.comb() + " - " + classementData.rank());
if (classementData.rank() > 3) if (classementData.rank() > 3)
return; return;
System.out.println(
"Processing classement data for " + c.getName() + ": " + classementData.name());
if (classementData.comb() != null) { if (classementData.comb() != null) {
String clubName = ""; String clubName = "";
if (classementData.comb() instanceof MembreModel membreModel2) { if (classementData.comb() instanceof MembreModel membreModel2) {
clubName = (membreModel2.getClub() != null) ? membreModel2.getClub() clubName = (membreModel2.getClub() != null) ? membreModel2.getClub().getName() : "";
.getName() : "";
} else if (classementData.comb() instanceof CompetitionGuestModel guestModel) { } else if (classementData.comb() instanceof CompetitionGuestModel guestModel) {
clubName = guestModel.getClub(); clubName = guestModel.getClub();
} }
System.out.println("-> " + clubName + "- " + (clubName != null && !clubName.isBlank()
&& !clubName.equals("Team") && clubMap.containsKey(clubName)));
if (clubName != null && !clubName.isBlank() if (clubName != null && !clubName.isBlank()
&& !clubName.equals("Team") && clubMap.containsKey(clubName)) { && !clubName.equals("Team") && clubMap.containsKey(clubName)) {
@ -835,7 +842,7 @@ public class ResultService {
.toList(); .toList();
}) })
.map(l -> new Pair<>(System.currentTimeMillis() + 60 * 1000L, l)) .map(l -> new Pair<>(System.currentTimeMillis() + 60 * 1000L, l))
).map(Pair::getValue)); ).map(Pair::getValue);
} }
@Data @Data