From 567757ee111b5dc18046550853adf508b11ea3b2 Mon Sep 17 00:00:00 2001
From: Karim Sigvaldason <ksigvaldason@uchicago.edu>
Date: Tue, 27 May 2025 19:29:51 -0500
Subject: [PATCH 1/2] Significantly improved front end of game stats/history
 page [WIP: #1481

---
 src/templates/games/game_history.html | 228 ++++++++++++++++++++------
 1 file changed, 179 insertions(+), 49 deletions(-)

diff --git a/src/templates/games/game_history.html b/src/templates/games/game_history.html
index 705bdc03c..8b358530b 100644
--- a/src/templates/games/game_history.html
+++ b/src/templates/games/game_history.html
@@ -2,15 +2,18 @@
 
 {% block content %}
   <div class="container mt-5">
-    <h1 class="display-4 mb-4">Game History for {{ game.name }}</h1>
-    <a href="{% url 'game-detail' game.id %}" class="btn btn-primary mb-4">← Return to Game Detail</a>
-    <form method="get" class="mb-4">
-      <div class="row">
+    <div class="d-flex justify-content-between align-items-center mb-4">
+      <h1 class="display-4">Game History: {{ game.name }}</h1>
+      <a href="{% url 'game-detail' game.id %}"
+         class="btn btn-outline-primary">← Return to Game Detail</a>
+    </div>
+    <form method="get" class="mb-4 p-3 bg-light rounded shadow-sm">
+      <div class="row align-items-end">
         <div class="col-md-4">
-          <label for="periodSelect" class="form-label">Select Period:</label>
+          <label for="periodSelect" class="form-label fw-bold">View Statistics For:</label>
           <select name="period"
                   id="periodSelect"
-                  class="form-select"
+                  class="form-select form-select-lg"
                   onchange="this.form.submit()">
             {% for option in period_options %}
               <option value="{{ option.value }}"
@@ -20,60 +23,160 @@ <h1 class="display-4 mb-4">Game History for {{ game.name }}</h1>
         </div>
       </div>
     </form>
-    <div class="row mb-4">
-      <div class="col-md-3">
-        <div class="card text-center">
-          <div class="card-body">
-            <h5 class="card-title">Total Played</h5>
-            <p class="card-text fs-4">{{ total_played }}</p>
+    {% if entries or total_played > 0 %}
+      {# Overall Statistics Section #}
+      <h2 class="mb-3">Overall Performance</h2>
+      <div class="row row-cols-1 row-cols-md-2 row-cols-lg-4 g-4 mb-4">
+        <div class="col">
+          <div class="card h-100 text-center shadow-sm">
+            <div class="card-body">
+              <h5 class="card-title text-primary">Total Played</h5>
+              <p class="card-text fs-2 fw-bold">{{ total_played }}</p>
+            </div>
           </div>
         </div>
-      </div>
-      <div class="col-md-3">
-        <div class="card text-center text-success">
-          <div class="card-body">
-            <h5 class="card-title">Wins</h5>
-            <p class="card-text fs-4">{{ wins }}</p>
+        <div class="col">
+          <div class="card h-100 text-center shadow-sm">
+            <div class="card-body">
+              <h5 class="card-title text-success">Wins</h5>
+              <p class="card-text fs-2 fw-bold">{{ wins }}</p>
+            </div>
           </div>
         </div>
-      </div>
-      <div class="col-md-3">
-        <div class="card text-center text-danger">
-          <div class="card-body">
-            <h5 class="card-title">Losses</h5>
-            <p class="card-text fs-4">{{ losses }}</p>
+        <div class="col">
+          <div class="card h-100 text-center shadow-sm">
+            <div class="card-body">
+              <h5 class="card-title text-danger">Losses</h5>
+              <p class="card-text fs-2 fw-bold">{{ losses }}</p>
+            </div>
           </div>
         </div>
-      </div>
-      <div class="col-md-3">
-        <div class="card text-center text-secondary">
-          <div class="card-body">
-            <h5 class="card-title">Draws</h5>
-            <p class="card-text fs-4">{{ draws }}</p>
+        <div class="col">
+          <div class="card h-100 text-center shadow-sm">
+            <div class="card-body">
+              <h5 class="card-title text-secondary">Draws</h5>
+              <p class="card-text fs-2 fw-bold">{{ draws }}</p>
+            </div>
+          </div>
+        </div>
+        <div class="col">
+          <div class="card h-100 text-center shadow-sm">
+            <div class="card-body">
+              <h5 class="card-title text-info">Win Rate</h5>
+              <p class="card-text fs-2 fw-bold">{{ win_rate|floatformat:2 }}%</p>
+            </div>
+          </div>
+        </div>
+        <div class="col">
+          <div class="card h-100 text-center shadow-sm">
+            <div class="card-body">
+              <h5 class="card-title text-warning">Incomplete</h5>
+              <p class="card-text fs-2 fw-bold">{{ incomplete }}</p>
+            </div>
+          </div>
+        </div>
+        <div class="col">
+          <div class="card h-100 text-center shadow-sm">
+            <div class="card-body">
+              <h5 class="card-title">Avg. Playtime</h5>
+              <p class="card-text fs-2 fw-bold">
+                {% if average_playtime %}
+                  {{ average_playtime }}
+                {% else %}
+                  N/A
+                {% endif %}
+              </p>
+            </div>
           </div>
         </div>
       </div>
-    </div>
-    <div class="row mb-4">
-      <div class="col-md-3">
-        <div class="card text-center text-info">
-          <div class="card-body">
-            <h5 class="card-title">Win Rate</h5>
-            <p class="card-text fs-4">{{ win_rate|floatformat:2 }}%</p>
+      {# Streaks Section #}
+      <h2 class="mb-3">Streaks</h2>
+      <div class="row row-cols-1 row-cols-md-3 g-4 mb-4">
+        <div class="col">
+          <div class="card h-100 text-center shadow-sm">
+            <div class="card-body">
+              <h5 class="card-title text-success">Longest Win Streak</h5>
+              <p class="card-text fs-2 fw-bold">{{ longest_win_streak }}</p>
+            </div>
+          </div>
+        </div>
+        <div class="col">
+          <div class="card h-100 text-center shadow-sm">
+            <div class="card-body">
+              <h5 class="card-title text-danger">Longest Loss Streak</h5>
+              <p class="card-text fs-2 fw-bold">{{ longest_loss_streak }}</p>
+            </div>
+          </div>
+        </div>
+        <div class="col">
+          <div class="card h-100 text-center shadow-sm">
+            <div class="card-body">
+              <h5 class="card-title">Current Streak</h5>
+              <p class="card-text fs-2 fw-bold">
+                {% if current_streak_count > 0 %}
+                  {{ current_streak_count }} {{ current_streak_type }}{{ current_streak_count|pluralize }}
+                {% else %}
+                  N/A
+                {% endif %}
+              </p>
+            </div>
           </div>
         </div>
       </div>
-      <div class="col-md-3">
-        <div class="card text-center text-warning">
-          <div class="card-body">
-            <h5 class="card-title">Incomplete</h5>
-            <p class="card-text fs-4">{{ incomplete }}</p>
+      {# Opponent Statistics Section #}
+      <h2 class="mb-3">Opponent Insights</h2>
+      <div class="row row-cols-1 row-cols-md-3 g-4 mb-4">
+        <div class="col">
+          <div class="card h-100 text-center shadow-sm">
+            <div class="card-body">
+              <h5 class="card-title">Most Played With/Against</h5>
+              <p class="card-text fs-4">
+                {% if most_played_with %}
+                  <a href="{% url 'users:user-profile' most_played_with.user.pk %}">{{ most_played_with.user.username }}</a>
+                  ({{ most_played_with.count }} games)
+                {% else %}
+                  N/A
+                {% endif %}
+              </p>
+            </div>
+          </div>
+        </div>
+        <div class="col">
+          <div class="card h-100 text-center shadow-sm">
+            <div class="card-body">
+              <h5 class="card-title text-success">Favorite Opponent</h5>
+              <p class="card-text fs-4">
+                {% if favorite_opponent %}
+                  <a href="{% url 'users:user-profile' favorite_opponent.user.pk %}">{{ favorite_opponent.user.username }}</a>
+                  ({{ favorite_opponent.count }} wins)
+                {% else %}
+                  N/A
+                {% endif %}
+              </p>
+            </div>
+          </div>
+        </div>
+        <div class="col">
+          <div class="card h-100 text-center shadow-sm">
+            <div class="card-body">
+              <h5 class="card-title text-danger">Nemesis Opponent</h5>
+              <p class="card-text fs-4">
+                {% if nemesis_opponent %}
+                  <a href="{% url 'users:user-profile' nemesis_opponent.user.pk %}">{{ nemesis_opponent.user.username }}</a>
+                  ({{ nemesis_opponent.count }} losses)
+                {% else %}
+                  N/A
+                {% endif %}
+              </p>
+            </div>
           </div>
         </div>
       </div>
-    </div>
+    {% endif %}
     {% if entries %}
-      <div class="table-responsive">
+      <h2 class="mb-3">Match Log</h2>
+      <div class="table-responsive shadow-sm">
         <table class="table table-bordered table-hover align-middle">
           <thead class="table-light">
             <tr>
@@ -81,12 +184,19 @@ <h5 class="card-title">Incomplete</h5>
               <th scope="col">Date Played</th>
               <th scope="col">Status</th>
               <th scope="col">Result</th>
+              <th scope="col">Opponent(s)</th>
             </tr>
           </thead>
           <tbody>
             {% for record in entries %}
               <tr>
-                <td>{{ record.match.id }}</td>
+                <td>
+                  {% if record.match %}
+                    <a href="{% url 'lobby-details' record.match.lobby.pk %}">{{ record.match.id }}</a>
+                  {% else %}
+                    N/A
+                  {% endif %}
+                </td>
                 <td>{{ record.date_played|date:"Y-m-d H:i" }}</td>
                 <td>
                   {% if record.is_completed %}
@@ -96,9 +206,8 @@ <h5 class="card-title">Incomplete</h5>
                   {% endif %}
                 </td>
                 <td>
-                  {# GameHistory.WIN = 0, GameHistory.DRAW = 1, GameHistory.LOSE = 2, GameHistory.INCOMPLETE = 3 #}
                   {% if record.result == 0 %}
-                    <span class="badge bg-success">Win</span> {# Assuming 0 is Win based on common game dev practice, check model #}
+                    <span class="badge bg-success">Win</span>
                   {% elif record.result == 1 %}
                     <span class="badge bg-secondary">Draw</span>
                   {% elif record.result == 2 %}
@@ -109,14 +218,35 @@ <h5 class="card-title">Incomplete</h5>
                     <span class="badge bg-light text-dark">N/A</span>
                   {% endif %}
                 </td>
+                <td>
+                  {% if record.match %}
+                    {% for player in record.match.players.all %}
+                      {% if player != request.user %}
+                        <a href="{% url 'users:user-profile' player.pk %}">{{ player.username }}</a>
+                        {% if not forloop.last %},{% endif %}
+                      {% endif %}
+                    {% empty %}
+                      No other players
+                    {% endfor %}
+                  {% else %}
+                    N/A
+                  {% endif %}
+                </td>
               </tr>
             {% endfor %}
           </tbody>
         </table>
       </div>
     {% else %}
-      <div class="alert alert-warning text-center mt-4" role="alert">
-        🎮 No game history found for the selected period. Time to start playing!
+      <div class="alert alert-info text-center mt-4 shadow-sm" role="alert">
+        <h4 class="alert-heading">🎮 No Game History Yet!</h4>
+        <p>
+          It looks like you haven't played any matches for <strong>{{ game.name }}</strong> in the selected period.
+        </p>
+        <hr />
+        <p class="mb-0">
+          Time to dive in and make some history! You can <a href="{% url 'match-create' pk=game.pk %}" class="alert-link">create a match</a> or <a href="{% url 'match-join' pk=game.pk %}" class="alert-link">join an existing one</a>.
+        </p>
       </div>
     {% endif %}
   </div>

From d2274b4459008106f0ffc780ddc434b8a2b0aaff Mon Sep 17 00:00:00 2001
From: Karim Sigvaldason <ksigvaldason@uchicago.edu>
Date: Tue, 27 May 2025 19:31:41 -0500
Subject: [PATCH 2/2] Forgot to include views.py changes

---
 src/chigame/games/views.py | 121 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 118 insertions(+), 3 deletions(-)

diff --git a/src/chigame/games/views.py b/src/chigame/games/views.py
index 54b88ec7a..234cfc056 100644
--- a/src/chigame/games/views.py
+++ b/src/chigame/games/views.py
@@ -2013,7 +2013,7 @@ def create_game_history_entry(user, match):
         user=user,
         match=match,
         defaults={
-            "is_completed": match.lobby.match_status == 3,  # Lobby.Finished
+            "is_completed": match.lobby.match_status == Lobby.Finished,  # Lobby.Finished is 3
             "result": outcome,
         },
     )
@@ -2045,7 +2045,8 @@ def get(self, request, game_id):
             if start_date:
                 entries = entries.filter(date_played__gte=start_date)
 
-        entries = entries.select_related("match").order_by("-date_played")
+        # Order by date_played ascending for accurate streak calculations first
+        ordered_entries_for_streaks = entries.select_related("match").order_by("date_played")
 
         # Calculate statistics
         total_played = entries.count()
@@ -2056,9 +2057,20 @@ def get(self, request, game_id):
 
         win_rate = (wins / total_played) * 100 if total_played > 0 else 0
 
+        longest_win_streak = self._calculate_longest_streak(ordered_entries_for_streaks, GameHistory.WIN)
+        longest_loss_streak = self._calculate_longest_streak(ordered_entries_for_streaks, GameHistory.LOSE)
+        current_streak_type, current_streak_count = self._calculate_current_streak(ordered_entries_for_streaks)
+        average_playtime_seconds = self._calculate_average_playtime(entries)  # Can use original entries for this
+        average_playtime = (
+            timedelta(seconds=average_playtime_seconds) if average_playtime_seconds is not None else None
+        )
+
+        # For opponent-based stats, we can use the original entries collection
+        opponent_stats = self._calculate_opponent_stats(request.user, entries)
+
         context = {
             "game": game,
-            "entries": entries,
+            "entries": entries.select_related("match").order_by("-date_played"),  # Re-order for display
             "selected_period": period,
             "total_played": total_played,
             "wins": wins,
@@ -2066,6 +2078,14 @@ def get(self, request, game_id):
             "draws": draws,
             "incomplete": incomplete,
             "win_rate": win_rate,
+            "longest_win_streak": longest_win_streak,
+            "longest_loss_streak": longest_loss_streak,
+            "current_streak_type": current_streak_type,
+            "current_streak_count": current_streak_count,
+            "average_playtime": average_playtime,
+            "most_played_with": opponent_stats["most_played_with"],
+            "favorite_opponent": opponent_stats["favorite_opponent"],
+            "nemesis_opponent": opponent_stats["nemesis_opponent"],
             "period_options": [
                 {"value": "all", "label": "All Time"},
                 {"value": "7days", "label": "Last 7 Days"},
@@ -2077,6 +2097,101 @@ def get(self, request, game_id):
         }
         return render(request, "games/game_history.html", context)
 
+    def _calculate_longest_streak(self, entries, outcome_type):
+        max_streak = 0
+        current_streak = 0
+        for entry in entries:
+            if entry.result == outcome_type:
+                current_streak += 1
+            else:
+                max_streak = max(max_streak, current_streak)
+                current_streak = 0
+        max_streak = max(max_streak, current_streak)  # Final check
+        return max_streak
+
+    def _calculate_current_streak(self, entries):
+        if not entries:
+            return "N/A", 0
+
+        # .last() requires an ordered queryset
+        last_entry = entries.last()
+        if not last_entry or last_entry.result not in [GameHistory.WIN, GameHistory.LOSE]:
+            return "N/A", 0  # Not a win or loss
+
+        streak_type = last_entry.result
+        current_streak_count = 0
+
+        # Iterate in reverse order from the original ascending sort for streaks
+        for entry in reversed(entries):
+            if entry.result == streak_type:
+                current_streak_count += 1
+            else:
+                break
+
+        streak_label = "Win" if streak_type == GameHistory.WIN else "Loss"
+        return streak_label, current_streak_count
+
+    def _calculate_average_playtime(self, entries):
+        total_duration_seconds = 0
+        completed_games_count = 0
+        for entry in entries:
+            if entry.is_completed and entry.match and entry.match.start_time and entry.match.end_time:
+                duration = entry.match.end_time - entry.match.start_time
+                total_duration_seconds += duration.total_seconds()
+                completed_games_count += 1
+
+        if completed_games_count > 0:
+            return total_duration_seconds / completed_games_count
+        return None
+
+    def _calculate_opponent_stats(self, current_user, entries):
+        opponent_play_count = {}
+        opponent_win_count = {}
+        opponent_loss_count = {}
+
+        for entry in entries:
+            match = entry.match
+            if not match:
+                continue
+
+            opponents_in_match = [player for player in match.players.all() if player != current_user]
+
+            for opponent in opponents_in_match:
+                opponent_play_count[opponent] = opponent_play_count.get(opponent, 0) + 1
+
+                if entry.result == GameHistory.WIN:
+                    opponent_win_count[opponent] = opponent_win_count.get(opponent, 0) + 1
+                elif entry.result == GameHistory.LOSE:
+                    opponent_loss_count[opponent] = opponent_loss_count.get(opponent, 0) + 1
+
+        most_played_with_opponent = None
+        if opponent_play_count:
+            most_played_with_opponent_user = max(opponent_play_count, key=opponent_play_count.get)
+            most_played_with_opponent = {
+                "user": most_played_with_opponent_user,
+                "count": opponent_play_count[most_played_with_opponent_user],
+            }
+
+        favorite_opponent_user = None
+        if opponent_win_count:
+            favorite_opponent_user_candidate = max(opponent_win_count, key=opponent_win_count.get)
+            max_wins_against = opponent_win_count[favorite_opponent_user_candidate]
+            if max_wins_against > 0:
+                favorite_opponent_user = {"user": favorite_opponent_user_candidate, "count": max_wins_against}
+
+        nemesis_opponent_user = None
+        if opponent_loss_count:
+            nemesis_opponent_user_candidate = max(opponent_loss_count, key=opponent_loss_count.get)
+            max_losses_against = opponent_loss_count[nemesis_opponent_user_candidate]
+            if max_losses_against > 0:
+                nemesis_opponent_user = {"user": nemesis_opponent_user_candidate, "count": max_losses_against}
+
+        return {
+            "most_played_with": most_played_with_opponent,
+            "favorite_opponent": favorite_opponent_user,
+            "nemesis_opponent": nemesis_opponent_user,
+        }
+
 
 class MatchStatsView(DetailView):
     model = Tournament