deepcrayon
/
lila
1
0
Fork 0
Code Releases Activity

fix tournament TV selector

pull/1524/head
Thibault Duplessis 2016-01-26 13:28:56 +07:00
parent 2cedd9313c
commit 342a443b9f
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/tournament/src/main/TournamentApi.scala
View File

@ -86,10 +86,14 @@ private[tournament] final class TournamentApi(
private def featureOneOf(tour: Tournament, pairings: Pairings, ranking: Ranking): Funit =
tour.featuredId.ifTrue(pairings.nonEmpty) ?? PairingRepo.byId map2
RankedPairing(ranking) map (_.flatten) flatMap { curOption =>
val candidates = pairings flatMap RankedPairing(ranking)
if (curOption.exists(_.pairing.playing)) funit
else candidates.sortBy(_.bestRank).headOption ?? { best =>
TournamentRepo.setFeaturedGameId(tour.id, best.pairing.gameId)
val bestCandidate = pairings.flatMap(RankedPairing(ranking)).sortBy(_.bestRank).headOption
def select(rp: RankedPairing) = TournamentRepo.setFeaturedGameId(tour.id, rp.pairing.gameId)
curOption.filter(_.pairing.playing) match {
case Some(current) =>
if (current.pairing.playing)
bestCandidate.filter(_.bestRank < current.bestRank) ?? select
else bestCandidate ?? select
case None => bestCandidate ?? select
}
}

2
modules/tournament/src/main/model.scala
View File

@ -29,7 +29,7 @@ case class TourAndRanks(
case class RankedPairing(pairing: Pairing, rank1: Int, rank2: Int) {
def bestRank = rank1 min rank2
def rankSum = rank1 + rank2
// def rankSum = rank1 + rank2
def bestColor = chess.Color(rank1 < rank2)
}