Fix team win achievements for Golf & Dartzee

src/main/kotlin/dartzee/core/util/ExtensionFunctions.kt

@@ -6,8 +6,8 @@ fun <E> MutableList<E>.addUnique(element: E) {
     }
 }
 
-fun <K : Comparable<K>, V> Map<K, V>.getSortedValues(): List<V> =
-    entries.sortedBy { it.key }.map { it.value }
+fun <K : Comparable<K>, V> Map<K, V>.getSortedValues(descending: Boolean = false): List<V> =
+    entries.sortedBy(descending) { it.key }.map { it.value }
 
 fun List<Int>.minOrZero() = minOrNull() ?: 0
 

src/main/kotlin/dartzee/db/IParticipant.kt

@@ -17,9 +17,4 @@ interface IParticipant {
     fun isActive() = isEndOfTime(dtFinished)
 
     fun getFinishingPositionDesc(): String = StringUtil.convertOrdinalToText(finishingPosition)
-
-    fun saveFinishingPosition(game: GameEntity, position: Int) {
-        this.finishingPosition = position
-        this.saveToDatabase()
-    }
 }

src/main/kotlin/dartzee/db/ParticipantEntity.kt

@@ -1,6 +1,5 @@
 package dartzee.db
 
-import dartzee.achievements.getWinAchievementType
 import dartzee.core.util.DateStatics
 import dartzee.core.util.getSqlDateNow
 import dartzee.utils.Database
@@ -46,15 +45,6 @@ class ParticipantEntity(database: Database = mainDatabase) :
 
     override fun saveToDatabase() = saveToDatabase(getSqlDateNow())
 
-    override fun saveFinishingPosition(game: GameEntity, position: Int) {
-        super.saveFinishingPosition(game, position)
-
-        if (position == 1) {
-            val type = getWinAchievementType(game.gameType)
-            AchievementEntity.insertAchievement(type, playerId, game.rowId, "$finalScore")
-        }
-    }
-
     /** Helpers */
     fun isAi() = getPlayer().isAi()
 

src/main/kotlin/dartzee/game/state/IWrappedParticipant.kt

@@ -20,6 +20,8 @@ sealed interface IWrappedParticipant {
 
     fun ordinal() = participant.ordinal
 
+    fun getPlayerIds() = individuals.map { it.playerId }
+
     fun getIndividual(roundNumber: Int): ParticipantEntity
 
     fun getUniqueParticipantName() =

src/main/kotlin/dartzee/screen/game/DartsGamePanel.kt

@@ -408,41 +408,43 @@ abstract class DartsGamePanel<
         val numberOfDarts = state.getScoreSoFar()
         state.participantFinished(finishingPosition, numberOfDarts)
 
-        updateAchievementsForFinish(getCurrentPlayerState(), finishingPosition, numberOfDarts)
+        updateAchievementsForFinish(getCurrentPlayerState(), numberOfDarts)
 
         return finishingPosition
     }
 
-    open fun updateAchievementsForFinish(
-        playerState: PlayerState,
-        finishingPosition: Int,
-        score: Int
-    ) {
-        if (playerState.hasMultiplePlayers()) {
-            if (finishingPosition == 1) {
-                val type = getTeamWinAchievementType(gameEntity.gameType)
-                playerState.getPlayerIds().forEach { playerId ->
-                    AchievementEntity.insertAchievement(type, playerId, gameEntity.rowId, "$score")
-                }
-            }
-        } else {
-            val playerId = playerState.lastIndividual().playerId
-            if (finishingPosition == 1) {
-                val type = getWinAchievementType(gameEntity.gameType)
-                AchievementEntity.insertAchievement(type, playerId, gameEntity.rowId, "$score")
-            }
+    open fun updateAchievementsForFinish(playerState: PlayerState, score: Int) {
+        updateWinAchievement(playerState.wrappedParticipant)
 
-            // Update the 'best game' achievement
-            val aa = getBestGameAchievement(gameEntity.gameType) ?: return
-            val gameParams = aa.gameParams
-            if (gameParams == gameEntity.gameParams) {
-                AchievementEntity.updateAchievement(
-                    aa.achievementType,
-                    playerId,
-                    gameEntity.rowId,
-                    score
-                )
+        // Update the 'best game' achievement
+        val playerId = playerState.lastIndividual().playerId
+        val aa = getBestGameAchievement(gameEntity.gameType) ?: return
+        val gameParams = aa.gameParams
+        if (gameParams == gameEntity.gameParams && !playerState.hasMultiplePlayers()) {
+            AchievementEntity.updateAchievement(
+                aa.achievementType,
+                playerId,
+                gameEntity.rowId,
+                score
+            )
+        }
+    }
+
+    protected fun updateWinAchievement(participant: IWrappedParticipant) {
+        if (participant.participant.finishingPosition != 1) {
+            return
+        }
+
+        val playerIds = participant.getPlayerIds()
+        val score = participant.participant.finalScore
+        if (playerIds.size > 1) {
+            val type = getTeamWinAchievementType(gameEntity.gameType)
+            playerIds.forEach { playerId ->
+                AchievementEntity.insertAchievement(type, playerId, gameEntity.rowId, "$score")
             }
+        } else {
+            val type = getWinAchievementType(gameEntity.gameType)
+            AchievementEntity.insertAchievement(type, playerIds.first(), gameEntity.rowId, "$score")
         }
     }
 

src/main/kotlin/dartzee/screen/game/GamePanelFixedLength.kt

@@ -35,6 +35,8 @@ abstract class GamePanelFixedLength<
         // Get the participants sorted by score so we can assign finishing positions
         setFinishingPositions(getParticipants().map { it.participant }, gameEntity)
 
+        getPlayerStates().forEach { updateWinAchievement(it.wrappedParticipant) }
+
         allPlayersFinished()
 
         parentWindow.startNextGameIfNecessary()

src/main/kotlin/dartzee/screen/game/dartzee/GamePanelDartzee.kt

@@ -157,12 +157,8 @@ class GamePanelDartzee(
         updateCarousel()
     }
 
-    override fun updateAchievementsForFinish(
-        playerState: DartzeePlayerState,
-        finishingPosition: Int,
-        score: Int
-    ) {
-        super.updateAchievementsForFinish(playerState, finishingPosition, score)
+    override fun updateAchievementsForFinish(playerState: DartzeePlayerState, score: Int) {
+        super.updateAchievementsForFinish(playerState, score)
         if (totalRounds < DARTZEE_ACHIEVEMENT_MIN_ROUNDS) {
             return
         }

src/main/kotlin/dartzee/screen/game/golf/GamePanelGolf.kt

@@ -57,12 +57,8 @@ class GamePanelGolf(parent: AbstractDartsGameScreen, game: GameEntity, totalPlay
         finishRound()
     }
 
-    override fun updateAchievementsForFinish(
-        playerState: GolfPlayerState,
-        finishingPosition: Int,
-        score: Int
-    ) {
-        super.updateAchievementsForFinish(playerState, finishingPosition, score)
+    override fun updateAchievementsForFinish(playerState: GolfPlayerState, score: Int) {
+        super.updateAchievementsForFinish(playerState, score)
 
         if (!playerState.hasMultiplePlayers()) {
             val scores = playerState.completedRounds.map { it.last().getGolfScore() }

src/main/kotlin/dartzee/screen/game/x01/GamePanelX01.kt

@@ -112,12 +112,8 @@ class GamePanelX01(parent: AbstractDartsGameScreen, game: GameEntity, totalPlaye
 
     override fun currentPlayerHasFinished() = getCurrentPlayerState().getRemainingScore() == 0
 
-    override fun updateAchievementsForFinish(
-        playerState: X01PlayerState,
-        finishingPosition: Int,
-        score: Int
-    ) {
-        super.updateAchievementsForFinish(playerState, finishingPosition, score)
+    override fun updateAchievementsForFinish(playerState: X01PlayerState, score: Int) {
+        super.updateAchievementsForFinish(playerState, score)
 
         val playerId = playerState.lastIndividual().playerId
         val finalRound = getCurrentPlayerState().getLastRound()

src/main/kotlin/dartzee/utils/GameUtil.kt

@@ -4,7 +4,7 @@ import dartzee.bean.GameParamFilterPanelDartzee
 import dartzee.bean.GameParamFilterPanelGolf
 import dartzee.bean.GameParamFilterPanelRoundTheClock
 import dartzee.bean.GameParamFilterPanelX01
-import dartzee.core.util.sortedBy
+import dartzee.core.util.getSortedValues
 import dartzee.db.GameEntity
 import dartzee.db.IParticipant
 import dartzee.game.GameType
@@ -32,16 +32,18 @@ fun setFinishingPositions(participants: List<IParticipant>, game: GameEntity) {
         return
     }
 
-    val entries =
+    val sortedParticipants =
         participants
             .filterNot { it.resigned }
             .groupBy { it.finalScore }
-            .entries
-            .sortedBy(doesHighestWin(game.gameType)) { it.key }
+            .getSortedValues(doesHighestWin(game.gameType))
 
-    var finishPos = 1
-    entries.forEach { (_, participants) ->
-        participants.forEach { it.saveFinishingPosition(game, finishPos) }
-        finishPos += participants.size
+    sortedParticipants.fold(1) { finishPos, participantGroup ->
+        participantGroup.forEach { pt ->
+            pt.finishingPosition = finishPos
+            pt.saveToDatabase()
+        }
+
+        finishPos + participantGroup.size
     }
 }

src/main/resources/ChangeLog

@@ -6,10 +6,11 @@
 + Leaderboards for best/worst games now include teams
 + AI will now use checkout suggestions in X01 where they exist (so e.g. on 81 will aim for T19 not T20)
 = Normalised audio assets so they all play at a similar volume
+- Fix bug where "team win" achievements did not unlock properly in Golf and Dartzee modes
 = Fixed game report to display teams properly, and to display players in throw order
 = Dartzee "total divisible by" rule no longer treats 0 as a pass
 - Manual setup configuration per AI (never used, and superseded by checkout suggestion improvement)
-= 93.3% test coverage (14163 / 15173 lines covered by 2425 tests)
+= 93.5% test coverage (14153 / 15139 lines covered by 2442 tests)
 
 --------- v7.0.1 ---------
 

src/test/kotlin/dartzee/core/util/TestExtensionFunctions.kt

@@ -132,6 +132,7 @@ class TestExtensionFunctions : AbstractTest() {
         map[4] = "Fourth"
 
         map.getSortedValues().shouldContainExactly("First", "Second", "Third", "Fourth")
+        map.getSortedValues(true).shouldContainExactly("Fourth", "Third", "Second", "First")
     }
 
     @Test

src/test/kotlin/dartzee/screen/game/GameTestFactory.kt

@@ -10,6 +10,7 @@ import dartzee.game.ClockType
 import dartzee.game.GameType
 import dartzee.game.RoundTheClockConfig
 import dartzee.game.X01Config
+import dartzee.game.prepareParticipants
 import dartzee.game.state.AbstractPlayerState
 import dartzee.game.state.IWrappedParticipant
 import dartzee.game.state.SingleParticipant
@@ -48,9 +49,18 @@ fun makeGolfGamePanel(currentPlayerId: String = randomGuid(), gameParams: String
         )
         .apply { testInit(currentPlayerId) }
 
-fun makeGolfGamePanel(pt: IWrappedParticipant) =
-    GamePanelGolf(FakeDartsScreen(), insertGame(gameType = GameType.GOLF, gameParams = "18"), 1)
-        .apply { testInit(pt) }
+fun makeGolfGamePanel(
+    players: List<PlayerEntity>,
+    teamMode: Boolean,
+    gameParams: String
+): GamePanelGolf {
+    val g = insertGame(gameType = GameType.GOLF, gameParams = gameParams)
+    val participants = prepareParticipants(g.rowId, players, teamMode)
+
+    val panel = GamePanelGolf(FakeDartsScreen(), g, participants.size)
+    panel.startNewGame(participants)
+    return panel
+}
 
 fun makeX01GamePanel(
     currentPlayerId: String = randomGuid(),
@@ -119,7 +129,9 @@ fun DartsGamePanel<*, *>.addCompletedRound(dartsThrown: List<Dart>) {
 
 fun <PlayerState : AbstractPlayerState<PlayerState>> DartsGamePanel<*, PlayerState>
     .updateAchievementsForFinish(finishingPosition: Int, score: Int) {
-    updateAchievementsForFinish(getPlayerStates().first(), finishingPosition, score)
+    val state = getPlayerStates().first()
+    state.participantFinished(finishingPosition, score)
+    updateAchievementsForFinish(state, score)
 }
 
 fun DartsGamePanel<*, *>.doAiTurn(model: DartsAiModel) {

src/test/kotlin/dartzee/screen/game/TestDartsGamePanel.kt

@@ -93,6 +93,7 @@ class TestDartsGamePanel : AbstractTest() {
         val team = makeTeam(p1, p2)
         val panel = TestGamePanel()
         panel.startNewGame(listOf(team))
+        panel.addCompletedRound(Dart(20, 1))
 
         panel.updateAchievementsForFinish(1, 50)
 
@@ -123,6 +124,7 @@ class TestDartsGamePanel : AbstractTest() {
         val team = makeTeam(p1, p2)
         val panel = TestGamePanel()
         panel.startNewGame(listOf(team))
+        panel.addCompletedRound(Dart(20, 1))
 
         panel.updateAchievementsForFinish(2, 50)
 
@@ -134,6 +136,7 @@ class TestDartsGamePanel : AbstractTest() {
         val panel = TestGamePanel()
         val pt = makeSingleParticipant(insertPlayer(), panel.gameEntity.rowId)
         panel.startNewGame(listOf(pt))
+        panel.addCompletedRound(Dart(20, 1))
 
         panel.updateAchievementsForFinish(1, 50)
 
@@ -149,6 +152,7 @@ class TestDartsGamePanel : AbstractTest() {
         val panel = TestGamePanel()
         val pt = makeSingleParticipant(insertPlayer(), panel.gameEntity.rowId)
         panel.startNewGame(listOf(pt))
+        panel.addCompletedRound(Dart(20, 1))
 
         panel.updateAchievementsForFinish(3, 50)