Refactor

Moving functions to GameUtils

Author: daithihearn

src/components/Game/AutoActionManager.tsx

@@ -1,8 +1,6 @@
 import { useEffect } from "react"
 import GameService from "../../services/GameService"
 
-import { CARDS } from "../../model/Cards"
-
 import { useAppDispatch, useAppSelector } from "../../caches/hooks"
 import {
     getCanBuyCards,
@@ -12,60 +10,9 @@ import {
     getIsMyGo,
     getRound,
 } from "../../caches/GameSlice"
-import { Round, RoundStatus } from "../../model/Round"
-import { Suit } from "../../model/Suit"
+import { RoundStatus } from "../../model/Round"
 import { getAutoPlayCard } from "../../caches/AutoPlaySlice"
-
-const bestCardLead = (round: Round) => {
-    let trumpCards = CARDS.filter(
-        c => c.suit === round.suit || c.suit === Suit.WILD,
-    )
-
-    // Remove played trump cards
-    round.completedHands.forEach(hand => {
-        hand.playedCards.forEach(p => {
-            const card = CARDS.find(c => (c.name = p.card))
-            if (
-                (card && card.suit === round.suit) ||
-                p.card === "JOKER" ||
-                p.card === "ACE_HEARTS"
-            )
-                trumpCards = trumpCards.filter(c => p.card !== c.name)
-        })
-    })
-
-    // Sort Descending
-    trumpCards.sort((a, b) => b.value - a.value)
-
-    return round.currentHand.leadOut === trumpCards[0].name
-}
-
-const getWorstCard = (cards: string[], suit: Suit) => {
-    console.info(`AutoAction -> followWorst`)
-    const myCardsRich = CARDS.filter(card => cards.some(c => c === card.name))
-    const myTrumpCards = myCardsRich.filter(
-        card => card.suit === suit || card.suit === Suit.WILD,
-    )
-
-    if (myTrumpCards.length > 0) {
-        // Sort ascending by value
-        myTrumpCards.sort((a, b) => a.value - b.value)
-        return myTrumpCards[0]
-    } else {
-        // Sort ascending by cold value
-        myCardsRich.sort((a, b) => a.coldValue - b.coldValue)
-
-        // if we can't find a cold card that is clearly the worst card then do nothing
-        if (
-            myCardsRich.length > 1 &&
-            myCardsRich[0].coldValue === myCardsRich[1].coldValue
-        ) {
-            return
-        }
-
-        return myCardsRich[0]
-    }
-}
+import { bestCardLead, getWorstCard } from "../../utils/GameUtils"
 
 const AutoActionManager = () => {
     const dispatch = useAppDispatch()

src/utils/GameUtils.ts

@@ -1,4 +1,5 @@
 import { CARDS, BLANK_CARD, Card, SelectableCard } from "../model/Cards"
+import { Round } from "../model/Round"
 import { Suit } from "../model/Suit"
 
 export const compareCards = (
@@ -123,3 +124,53 @@ export const removeCard = (cardToRemove: Card, orginalHand: Card[]) => {
 
     return newHand
 }
+
+export const bestCardLead = (round: Round) => {
+    let trumpCards = CARDS.filter(
+        c => c.suit === round.suit || c.suit === Suit.WILD,
+    )
+
+    // Remove played trump cards
+    round.completedHands.forEach(hand => {
+        hand.playedCards.forEach(p => {
+            const card = CARDS.find(c => (c.name = p.card))
+            if (
+                (card && card.suit === round.suit) ||
+                p.card === "JOKER" ||
+                p.card === "ACE_HEARTS"
+            )
+                trumpCards = trumpCards.filter(c => p.card !== c.name)
+        })
+    })
+
+    // Sort Descending
+    trumpCards.sort((a, b) => b.value - a.value)
+
+    return round.currentHand.leadOut === trumpCards[0].name
+}
+
+export const getWorstCard = (cards: string[], suit: Suit) => {
+    const myCardsRich = CARDS.filter(card => cards.some(c => c === card.name))
+    const myTrumpCards = myCardsRich.filter(
+        card => card.suit === suit || card.suit === Suit.WILD,
+    )
+
+    if (myTrumpCards.length > 0) {
+        // Sort ascending by value
+        myTrumpCards.sort((a, b) => a.value - b.value)
+        return myTrumpCards[0]
+    } else {
+        // Sort ascending by cold value
+        myCardsRich.sort((a, b) => a.coldValue - b.coldValue)
+
+        // if we can't find a cold card that is clearly the worst card then do nothing
+        if (
+            myCardsRich.length > 1 &&
+            myCardsRich[0].coldValue === myCardsRich[1].coldValue
+        ) {
+            return
+        }
+
+        return myCardsRich[0]
+    }
+}