feat: run matches from rankings list

Author: amcsz

othello/apps/auth/migrations/0011_alter_user_rating.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.10 on 2026-02-02 21:35
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('authentication', '0010_user_rating_ratinghistory'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='user',
+            name='rating',
+            field=models.DecimalField(decimal_places=2, default=1000.0, max_digits=6),
+        ),
+    ]

othello/apps/auth/models.py

@@ -6,7 +6,7 @@ class User(AbstractUser):
     is_teacher = models.BooleanField(default=False, null=False)
     is_student = models.BooleanField(default=True, null=False)
     is_imported = models.BooleanField(default=False, null=False)
-    rating = models.DecimalField(max_digits=6, decimal_places=2, default=0.00)
+    rating = models.DecimalField(max_digits=6, decimal_places=2, default=1000.00)
 
     @property
     def has_management_permission(self) -> bool:

othello/apps/auth/views.py

@@ -1,14 +1,18 @@
 import json
+import logging
 
 from django.contrib.auth import get_user_model
 from django.contrib.auth.decorators import login_required
 from django.core.paginator import Paginator
 from django.http import HttpRequest, HttpResponse
 from django.shortcuts import get_object_or_404, render
 
-from .models import RatingHistory
+from ..games.forms import MatchForm
+from ..games.models import Submission, RatingHistory
 
 
+logger = logging.getLogger("othello")
+
 def index(request: HttpRequest) -> HttpResponse:
     return render(request, "auth/index.html")
 
@@ -65,10 +69,14 @@ def rankings(request: HttpRequest) -> HttpResponse:
     paginator = Paginator(users, 25)  # Show 25 users per page
     page_number = request.GET.get("page")
     page_obj = paginator.get_page(page_number)
+    form = MatchForm(request.user)
+    users_with_submissions = set(Submission.objects.values_list('user__username', flat=True).distinct()) - {request.user.username, "Yourself"}
     return render(
         request,
         "auth/rankings.html",
         {
             "page_obj": page_obj,
+            "form": form,
+            "users_with_submissions": users_with_submissions,
         },
     )

othello/apps/games/forms.py

@@ -76,13 +76,35 @@ class Meta:
 
 
 class MatchForm(forms.Form):
-    opponent = forms.ModelChoiceField(label="Opponent:", queryset=Submission.objects.none())
-    num_games = forms.IntegerField(label="Number of Games:", initial=3, min_value=1, max_value=10)
+    opponent = forms.ModelChoiceField(
+        label="Opponent:",
+        queryset=Submission.objects.none(),
+    )
+    num_games = forms.IntegerField(
+        label="Number of Games:",
+        initial=3,
+        min_value=1,
+        max_value=10,
+    )
 
-    def __init__(self, user, *args: Any, **kwargs: Any) -> None:
+    def __init__(self, user, *args, initial_opponent_user=None, **kwargs):
         super().__init__(*args, **kwargs)
+
         opponents = (
-            Submission.objects.latest().exclude(user=user).exclude(user__username="Yourself")
+            Submission.objects.latest()
+            .exclude(user=user)
+            .exclude(user__username="Yourself")
         )
         self.fields["opponent"].queryset = opponents
         self.fields["opponent"].label_from_instance = Submission.get_game_name
+
+        if initial_opponent_user:
+            try:
+                opponent_submission = (
+                    Submission.objects
+                    .filter(user=initial_opponent_user)
+                    .latest(onesub=True)
+                )
+                self.fields["opponent"].initial = opponent_submission
+            except Submission.DoesNotExist:
+                pass

othello/apps/games/models.py

@@ -196,7 +196,6 @@ def calculate_results(self) -> None:
             ]
         )
 
-        # --- Elo update ---
         user1 = self.player1.user
         user2 = self.player2.user
 
@@ -208,8 +207,7 @@ def calculate_results(self) -> None:
             rating2=rating2,
             player1_wins=player1_wins,
             player2_wins=player2_wins,
-            ties=ties,
-            k=32,  # tune this
+            ties=ties
         )
 
         user1.rating = rating1 + change1

othello/apps/games/views.py

@@ -2,6 +2,7 @@
 import logging
 
 from django.contrib import messages
+from django.contrib.auth import get_user_model
 from django.contrib.auth.decorators import login_required
 from django.core.paginator import Paginator
 from django.db import models
@@ -155,7 +156,21 @@ def request_match(request: HttpRequest) -> HttpResponse:
                 for error in errors:
                     messages.error(request, error["message"], extra_tags="danger")
     else:
-        form = MatchForm(request.user)
+        initial_opponent_user = None
+        opponent_username = request.GET.get("opponent")
+        if opponent_username:
+            try:
+                initial_opponent_user = get_user_model().objects.get(
+                    username=opponent_username
+                )
+            except get_user_model().DoesNotExist:
+                pass
+
+        form = MatchForm(
+            request.user,
+            initial_opponent_user=initial_opponent_user,
+        )
+
     return render(request, "games/request_match.html", {"form": form})
 
 

othello/templates/auth/rankings.html

@@ -12,6 +12,7 @@ <h1>User Rankings</h1>
                 <th>Rank</th>
                 <th>Username</th>
                 <th>Rating</th>
+                <th>Action</th>
             </tr>
         </thead>
         <tbody>
@@ -20,6 +21,7 @@ <h1>User Rankings</h1>
                 <td>{{ page_obj.start_index|add:forloop.counter|add:-1 }}</td>
                 <td><a href="{% url 'auth:profile' user.username %}">{{ user.username }}</a></td>
                 <td>{{ user.rating }}</td>
+                <td>{% if user.username in users_with_submissions %}<button type="button" class="btn btn-primary btn-sm" data-toggle="modal" data-target="#requestMatchModal" data-username="{{ user.username }}">Request Match</button>{% endif %}</td>
             </tr>
             {% endfor %}
         </tbody>
@@ -41,4 +43,60 @@ <h1>User Rankings</h1>
         </ul>
     </nav>
 </div>
+
+<div class="modal fade" id="requestMatchModal" tabindex="-1" role="dialog" aria-labelledby="requestMatchModalLabel" aria-hidden="true">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title" id="requestMatchModalLabel">Request a Match</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <form id="requestMatchForm" method="post" action="{% url 'games:request_match' %}">
+                {% csrf_token %}
+                <div class="modal-body">
+                    {{ form.as_p }}
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+                    <button type="submit" class="btn btn-primary">Request Match</button>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
+
+<script>
+$('#requestMatchModal').on('show.bs.modal', function (event) {
+    var button = $(event.relatedTarget);
+    var username = button.data('username');
+    var form = $('#requestMatchForm');
+    var action = form.attr('action');
+    if (action.indexOf('?') > -1) {
+        action = action.split('?')[0];
+    }
+    form.attr('action', action + '?opponent=' + encodeURIComponent(username));
+    
+    var select = form.find('select[name="opponent"]');
+    select.find('option').each(function() {
+        if ($(this).text().indexOf('(' + username + ')') !== -1) {
+            select.val($(this).val());
+            return false;
+        }
+    });
+
+    select.prop('disabled', true);
+});
+
+$('#requestMatchModal').on('hidden.bs.modal', function () {
+    var form = $('#requestMatchForm');
+    var select = form.find('select[name="opponent"]');
+    select.prop('disabled', false);
+});
+
+$('#requestMatchForm').on('submit', function() {
+    $(this).find('select[name="opponent"]').prop('disabled', false);
+});
+</script>
 {% endblock %}