[arenabuddy] fix issues with parsing mulligans

Author: gazure

arenabuddy/arenabuddy/src/app/components/mulligan_display.rs

@@ -85,8 +85,8 @@ fn MulliganCard(mulligan: Mulligan) -> Element {
 
 fn get_decision_class(decision: &str) -> &'static str {
     match decision {
-        "keep" => "bg-emerald-900/40 text-emerald-300",
-        "mulligan" => "bg-red-900/40 text-red-300",
+        "Keep" => "bg-emerald-900/40 text-emerald-300",
+        "Mulligan" => "bg-red-900/40 text-red-300",
         _ => "bg-gray-700 text-gray-300",
     }
 }

arenabuddy/core/src/player_log/replay.rs

@@ -247,10 +247,10 @@ impl MatchReplay {
             }
         })?;
 
-        let mulligan_responses: BTreeMap<i32, &MulliganRespWrapper> = self
+        let mulligan_responses: Vec<&MulliganRespWrapper> = self
             .client_messages_iter()
             .filter_map(|client_message| match &client_message.payload {
-                ClientMessage::MulliganResp(wrapper) => Some((wrapper.meta.game_state_id?, wrapper)),
+                ClientMessage::MulliganResp(wrapper) => Some(wrapper),
                 _ => None,
             })
             .collect();
@@ -268,9 +268,10 @@ impl MatchReplay {
         Ok(opening_hands
             .into_iter()
             .zip(mulligan_requests)
-            .filter_map(|((gn, hand), (gn2, mulligan_request))| {
+            .enumerate()
+            .filter_map(|(i, ((gn, hand), (gn2, mulligan_request)))| {
                 if gn != gn2 {
-                    warn!("invalid mulilgan data for {}", self.match_id);
+                    warn!("invalid mulligan data for {}", self.match_id);
                     return None;
                 }
 
@@ -282,12 +283,8 @@ impl MatchReplay {
                     .collect::<Vec<String>>()
                     .join(",");
 
-                let Some(game_state_id) = mulligan_request.meta.game_state_id else {
-                    warn!("No game state ID found for mulligan request");
-                    return None;
-                };
                 let number_to_keep = DEFAULT_HAND_SIZE - mulligan_request.mulligan_req.mulligan_count;
-                let decision = match mulligan_responses.get(&game_state_id) {
+                let decision = match mulligan_responses.get(i) {
                     Some(mulligan_response) => match mulligan_response.mulligan_resp.decision {
                         MulliganOption::AcceptHand => "Keep",
                         MulliganOption::Mulligan => "Mulligan",

arenabuddy/data/src/db/postgres.rs

@@ -412,7 +412,7 @@ impl PostgresMatchDB {
                 COUNT(CASE WHEN mr.winning_team_id = m.controller_seat_id THEN 1 END) AS wins,
                 COUNT(CASE WHEN mr.winning_team_id != m.controller_seat_id THEN 1 END) AS losses
             FROM match m
-            JOIN mulligan mul ON m.id = mul.match_id AND mul.decision = 'keep'
+            JOIN mulligan mul ON m.id = mul.match_id AND mul.decision = 'Keep'
                 AND mul.play_draw IN ('Play', 'Draw')
             JOIN match_result mr ON m.id = mr.match_id AND mr.result_scope = 'MatchScope_Game' AND mr.game_number = mul.game_number
             WHERE ($1::uuid IS NULL OR m.user_id = $1)
@@ -454,7 +454,7 @@ impl PostgresMatchDB {
                 COUNT(CASE WHEN mr.winning_team_id = m.controller_seat_id THEN 1 END) AS wins,
                 COUNT(CASE WHEN mr.winning_team_id != m.controller_seat_id THEN 1 END) AS losses
             FROM match m
-            JOIN mulligan mul ON m.id = mul.match_id AND mul.decision = 'keep'
+            JOIN mulligan mul ON m.id = mul.match_id AND mul.decision = 'Keep'
             JOIN match_result mr ON m.id = mr.match_id AND mr.result_scope = 'MatchScope_Game' AND mr.game_number = mul.game_number
             WHERE ($1::uuid IS NULL OR m.user_id = $1)
             GROUP BY mul.number_to_keep