diff --git a/src/main/java/fr/titionfire/ffsaf/data/model/CardboardModel.java b/src/main/java/fr/titionfire/ffsaf/data/model/CardboardModel.java deleted file mode 100644 index 255f83e..0000000 --- a/src/main/java/fr/titionfire/ffsaf/data/model/CardboardModel.java +++ /dev/null @@ -1,42 +0,0 @@ -package fr.titionfire.ffsaf.data.model; - -import io.quarkus.runtime.annotations.RegisterForReflection; -import jakarta.persistence.*; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -@Getter -@Setter -@AllArgsConstructor -@NoArgsConstructor -@RegisterForReflection - -@Entity -@Table(name = "cardboard") -public class CardboardModel { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - Long id; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "comb", referencedColumnName = "id") - MembreModel comb; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "guest_comb", referencedColumnName = "id") - CompetitionGuestModel guestComb; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "match", referencedColumnName = "id") - MatchModel match; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "compet", referencedColumnName = "id") - CompetitionModel compet; - - int red; - int yellow; -} diff --git a/src/main/java/fr/titionfire/ffsaf/data/model/MatchModel.java b/src/main/java/fr/titionfire/ffsaf/data/model/MatchModel.java index e017810..c5a6c2f 100644 --- a/src/main/java/fr/titionfire/ffsaf/data/model/MatchModel.java +++ b/src/main/java/fr/titionfire/ffsaf/data/model/MatchModel.java @@ -63,10 +63,6 @@ public class MatchModel { char poule = 'A'; - @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER) - @JoinColumn(name = "match", referencedColumnName = "id") - List cardboard = new ArrayList<>(); - public String getC1Name(MembreModel model, ResultPrivacy privacy) { if (c1_id != null) return c1_id.getName(model, privacy); diff --git a/src/main/java/fr/titionfire/ffsaf/data/repository/CardboardRepository.java b/src/main/java/fr/titionfire/ffsaf/data/repository/CardboardRepository.java deleted file mode 100644 index 11fc320..0000000 --- a/src/main/java/fr/titionfire/ffsaf/data/repository/CardboardRepository.java +++ /dev/null @@ -1,9 +0,0 @@ -package fr.titionfire.ffsaf.data.repository; - -import fr.titionfire.ffsaf.data.model.CardboardModel; -import io.quarkus.hibernate.reactive.panache.PanacheRepositoryBase; -import jakarta.enterprise.context.ApplicationScoped; - -@ApplicationScoped -public class CardboardRepository implements PanacheRepositoryBase { -} diff --git a/src/main/java/fr/titionfire/ffsaf/domain/entity/CardboardEntity.java b/src/main/java/fr/titionfire/ffsaf/domain/entity/CardboardEntity.java deleted file mode 100644 index ca15a38..0000000 --- a/src/main/java/fr/titionfire/ffsaf/domain/entity/CardboardEntity.java +++ /dev/null @@ -1,26 +0,0 @@ -package fr.titionfire.ffsaf.domain.entity; - -import fr.titionfire.ffsaf.data.model.CardboardModel; -import io.quarkus.runtime.annotations.RegisterForReflection; -import lombok.AllArgsConstructor; -import lombok.Data; - -@Data -@AllArgsConstructor -@RegisterForReflection -public class CardboardEntity { - long comb_id; - long match_id; - long compet_id; - - int red; - int yellow; - - public static CardboardEntity fromModel(CardboardModel model) { - return new CardboardEntity( - model.getComb() != null ? model.getComb().getId() : model.getGuestComb().getId() * -1, - model.getMatch().getId(), - model.getCompet().getId(), - model.getRed(), model.getYellow()); - } -} diff --git a/src/main/java/fr/titionfire/ffsaf/domain/entity/MatchEntity.java b/src/main/java/fr/titionfire/ffsaf/domain/entity/MatchEntity.java index 49b7e77..cde3669 100644 --- a/src/main/java/fr/titionfire/ffsaf/domain/entity/MatchEntity.java +++ b/src/main/java/fr/titionfire/ffsaf/domain/entity/MatchEntity.java @@ -6,7 +6,6 @@ import io.quarkus.runtime.annotations.RegisterForReflection; import lombok.AllArgsConstructor; import lombok.Data; -import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -23,7 +22,6 @@ public class MatchEntity { private Date date; private List scores; private char poule; - private List cardboard; public static MatchEntity fromModel(MatchModel model) { if (model == null) @@ -35,22 +33,6 @@ public class MatchEntity { model.getC2_id()), model.getCategory_ord(), model.isEnd(), model.getCategory().getId(), model.getDate(), model.getScores(), - model.getPoule(), - (model.getCardboard() == null) ? new ArrayList<>() : model.getCardboard().stream() - .map(CardboardEntity::fromModel).toList()); - } - - public int win() { - int sum = 0; - for (ScoreEmbeddable score : scores) { - if (score.getS1() == -1000 || score.getS2() == -1000) - continue; - - if (score.getS1() > score.getS2()) - sum++; - else if (score.getS1() < score.getS2()) - sum--; - } - return sum; + model.getPoule()); } } diff --git a/src/main/java/fr/titionfire/ffsaf/ws/recv/RCategorie.java b/src/main/java/fr/titionfire/ffsaf/ws/recv/RCategorie.java index c6088b9..568373d 100644 --- a/src/main/java/fr/titionfire/ffsaf/ws/recv/RCategorie.java +++ b/src/main/java/fr/titionfire/ffsaf/ws/recv/RCategorie.java @@ -46,9 +46,6 @@ public class RCategorie { @Inject TreeRepository treeRepository; - @Inject - CardboardRepository cardboardRepository; - @Inject CardService cardService; @@ -221,7 +218,6 @@ public class RCategorie { public Uni deleteCategory(WebSocketConnection connection, Long id) { return getById(id, connection) .call(cat -> Panache.withTransaction(() -> treeRepository.delete("category = ?1", cat.getId()) - .call(__ -> cardboardRepository.delete("match.category = ?1", cat)) .call(__ -> matchRepository.delete("category = ?1", cat)))) .chain(cat -> Panache.withTransaction(() -> categoryRepository.delete(cat))) .invoke(__ -> SSCategorie.sendDelCategory(connection, id)) diff --git a/src/main/java/fr/titionfire/ffsaf/ws/recv/RMatch.java b/src/main/java/fr/titionfire/ffsaf/ws/recv/RMatch.java index aa99262..3490f56 100644 --- a/src/main/java/fr/titionfire/ffsaf/ws/recv/RMatch.java +++ b/src/main/java/fr/titionfire/ffsaf/ws/recv/RMatch.java @@ -45,9 +45,6 @@ public class RMatch { @Inject CompetitionGuestRepository competitionGuestRepository; - @Inject - CardboardRepository cardboardRepository; - @Inject TradService trad; @@ -289,9 +286,7 @@ public class RMatch { public Uni deleteMatch(WebSocketConnection connection, Long idMatch) { return getById(idMatch, connection) .map(__ -> idMatch) - .chain(l -> Panache.withTransaction(() -> - cardboardRepository.delete("match.id = ?1", l) - .chain(__ -> matchRepository.delete("id = ?1", l)))) + .chain(l -> Panache.withTransaction(() -> matchRepository.delete("id = ?1", l))) .invoke(__ -> SSMatch.sendDeleteMatch(connection, idMatch)) .replaceWithVoid(); } diff --git a/src/main/java/fr/titionfire/ffsaf/ws/recv/RState.java b/src/main/java/fr/titionfire/ffsaf/ws/recv/RState.java index 88c3ffb..047dd94 100644 --- a/src/main/java/fr/titionfire/ffsaf/ws/recv/RState.java +++ b/src/main/java/fr/titionfire/ffsaf/ws/recv/RState.java @@ -117,20 +117,6 @@ public class RState { } } - public List getAllCategories(String uuid) { - return tableStates.values().stream() - .filter(s -> s.getCompetitionUuid() - .equals(uuid) && s.getSelectedCategory() != null && s.getSelectedCategory() != -1) - .map(TableState::getSelectedCategory).distinct().toList(); - } - - public List getAllMatchActive(String uuid) { - return tableStates.values().stream() - .filter(s -> s.getCompetitionUuid() - .equals(uuid) && s.getState() == MatchState.IN_PROGRESS && s.getSelectedMatch() != null && s.getSelectedMatch() != -1) - .map(TableState::getSelectedMatch).distinct().toList(); - } - @RegisterForReflection public record ChronoState(long time, long startTime, long configTime, long configPause, int state) { public boolean isRunning() {