prepare for prod

Author: JoeyRubas

Pipfile

@@ -40,3 +40,6 @@ nplusone = "*"
 
 [requires]
 python_version = "3.10.16"
+
+[scripts]
+pylint = "python -m pylint --recursive=y --score=n manage.py mittab"

assets/js/sendJudgeCodes.js

@@ -9,6 +9,21 @@ document.addEventListener("DOMContentLoaded", () => {
   const getValue = (cell) =>
     cell?.dataset.sortValue ?? cell?.textContent?.trim().toLowerCase() ?? "";
 
+  const setSortDirection = (cell, direction) => {
+    const headerCell = cell;
+    headerCell.dataset.sortDir = direction;
+    const arrow = headerCell.querySelector(".sort-arrow");
+    let arrowText = "";
+    if (direction === "asc") {
+      arrowText = "▲";
+    } else if (direction === "desc") {
+      arrowText = "▼";
+    }
+    if (arrow) {
+      arrow.textContent = arrowText;
+    }
+  };
+
   const sortTable = (header) => {
     const key = header.dataset.sortKey;
     if (!key) return;
@@ -21,17 +36,9 @@ document.addEventListener("DOMContentLoaded", () => {
 
     headers.forEach((th) => {
       if (th === header) return;
-      th.dataset.sortDir = "";
-      const arrow = th.querySelector(".sort-arrow");
-      if (arrow) {
-        arrow.textContent = "";
-      }
+      setSortDirection(th, "");
     });
-    header.dataset.sortDir = currentDir;
-    const activeArrow = header.querySelector(".sort-arrow");
-    if (activeArrow) {
-      activeArrow.textContent = currentDir === "asc" ? "▲" : "▼";
-    }
+    setSortDirection(header, currentDir);
 
     rows.sort((a, b) => {
       const aCell = a.cells[header.cellIndex];
@@ -53,10 +60,11 @@ document.addEventListener("DOMContentLoaded", () => {
   };
 
   headers.forEach((th) => {
-    th.style.cursor = "pointer";
-    th.addEventListener("click", (event) => {
+    const header = th;
+    header.style.cursor = "pointer";
+    header.addEventListener("click", (event) => {
       event.preventDefault();
-      sortTable(th);
+      sortTable(header);
     });
   });
 });

mittab/apps/tab/forms.py

@@ -452,7 +452,7 @@ def has_invalid_ranks(self):
 
 
 class EBallotForm(ResultEntryForm):
-    ballot_code = forms.CharField(max_length=30, min_length=0)
+    ballot_code = forms.CharField(max_length=BALLOT_CODE_MAX_LENGTH, min_length=0)
 
     def __init__(self, *args, **kwargs):
         ballot_code = ""

…ab/migrations/0033_auto_20251114_2149.py …b/migrations/0037_judge_code_emailing.pymittab/apps/tab/migrations/0033_auto_20251114_2149.py renamed to mittab/apps/tab/migrations/0037_judge_code_emailing.py mittab/apps/tab/migrations/0033_auto_20251114_2149.py renamed to mittab/apps/tab/migrations/0037_judge_code_emailing.py

@@ -8,7 +8,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('tab', '0032_manualjudgeassignment'),
+        ("tab", "0036_alter_outround_room_nullable"),
     ]
 
     operations = [
@@ -20,14 +20,14 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='judge',
             name='ballot_code',
-            field=models.CharField(blank=True, max_length=255, null=True, unique=True, validators=[django.core.validators.RegexValidator(message='Ballot code must contain at least one letter on each side of a single hyphen.', regex='^[A-Za-z]+-[A-Za-z]+$')]),
+            field=models.CharField(blank=True, max_length=255, null=True, unique=True, validators=[django.core.validators.MaxLengthValidator(30), django.core.validators.RegexValidator(message='Ballot code must contain at least one letter on each side of a single hyphen.', regex='^[A-Za-z]+-[A-Za-z]+$')]),
         ),
         migrations.CreateModel(
             name='JudgeCodeEmailLog',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('email', models.EmailField(max_length=254)),
-                ('ballot_code', models.CharField(max_length=64)),
+                ('ballot_code', models.CharField(max_length=30)),
                 ('sent_at', models.DateTimeField(auto_now_add=True)),
                 ('judge', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='code_email_logs', to='tab.judge')),
             ],

mittab/apps/tab/models.py

@@ -3,7 +3,7 @@
 from haikunator import Haikunator
 from django.db import models
 from django.core.exceptions import ValidationError
-from django.core.validators import RegexValidator
+from django.core.validators import MaxLengthValidator, RegexValidator
 
 from mittab.libs.cacheing import cache_logic
 
@@ -365,7 +365,7 @@ class BreakingTeam(models.Model):
                                        choices=TYPE_CHOICES)
 
 
-BALLOT_CODE_MAX_LENGTH = 64
+BALLOT_CODE_MAX_LENGTH = 30
 ballot_code_validator = RegexValidator(
     regex=r"^[A-Za-z]+-[A-Za-z]+$",
     message="Ballot code must contain at least one letter on each side of a single hyphen.",
@@ -381,7 +381,10 @@ class Judge(models.Model):
                                    blank=True,
                                    null=True,
                                    unique=True,
-                                   validators=[ballot_code_validator])
+                                   validators=[
+                                       MaxLengthValidator(BALLOT_CODE_MAX_LENGTH),
+                                       ballot_code_validator,
+                                   ])
     is_dino = models.BooleanField(default=False)
     wing_only = models.BooleanField(default=False)
     required_room_tags = models.ManyToManyField("RoomTag", blank=True)

mittab/apps/tab/views/judge_views.py

@@ -215,7 +215,7 @@ def view_judge(request, judge_id):
         if form.is_valid():
             try:
                 form.save()
-            except ValueError:
+            except (ValueError, ValidationError):
                 return redirect_and_flash_error(
                     request, "Judge information cannot be validated")
             updated_name = form.cleaned_data["name"]
@@ -243,7 +243,7 @@ def enter_judge(request):
         if form.is_valid():
             try:
                 form.save()
-            except ValueError:
+            except (ValueError, ValidationError):
                 return redirect_and_flash_error(request,
                                                 "Judge cannot be validated")
             created_name = form.cleaned_data["name"]
@@ -377,17 +377,25 @@ def send_judge_codes(request):
     tournament_name = TabSettings.get("tournament_name", "your tournament")
     plan = _prepare_judge_code_plan(all_judges, tournament_name, request)
     sendable_by_id = {entry["judge"].id: entry for entry in plan["sendable"]}
-    default_selected_ids = set(sendable_by_id.keys())
+    default_selected_ids = list(sendable_by_id.keys())
+    default_selected_id_set = set(default_selected_ids)
 
     if request.method == "POST":
-        selected_ids = {
-            int(judge_id)
-            for judge_id in request.POST.getlist("judge_ids")
-            if judge_id.isdigit()
-        }
-        selected_ids &= default_selected_ids
+        selected_ids = []
+        seen_ids = set()
+        for judge_id in request.POST.getlist("judge_ids"):
+            if not judge_id.isdigit():
+                continue
+
+            parsed_id = int(judge_id)
+            if parsed_id not in default_selected_id_set or parsed_id in seen_ids:
+                continue
+
+            selected_ids.append(parsed_id)
+            seen_ids.add(parsed_id)
     else:
         selected_ids = default_selected_ids
+    selected_id_set = set(selected_ids)
 
     last_sent_map = dict(
         JudgeCodeEmailLog.objects.values("judge_id")
@@ -413,7 +421,7 @@ def send_judge_codes(request):
     judge_rows = []
     for judge in all_judges:
         can_send = judge.id in sendable_by_id
-        checked = can_send and judge.id in selected_ids
+        checked = can_send and judge.id in selected_id_set
         status = status_lookup.get(judge.id, "Ready" if can_send else "Not eligible")
         judge_rows.append({
             "judge": judge,
@@ -448,11 +456,33 @@ def send_judge_codes(request):
 
         try:
             sent = EmailService().send_bulk(email_requests)
-        except (EmailServiceError, ImproperlyConfigured) as exc:
+        except ImproperlyConfigured as exc:
             return redirect_and_flash_error(
                 request,
                 f"Unable to send judge codes: {exc}",
             )
+        except EmailServiceError as exc:
+            sent_request_ids = {id(email_request) for email_request in exc.sent_requests}
+            sent_log_entries = [
+                entry["log_entry"]
+                for entry in selected_entries
+                if id(entry["email_request"]) in sent_request_ids
+            ]
+            if sent_log_entries:
+                JudgeCodeEmailLog.objects.bulk_create(sent_log_entries)
+
+            partial_message = ""
+            if sent_log_entries:
+                sent_count = len(sent_log_entries)
+                partial_message = (
+                    f" after sending {sent_count} judge code"
+                    f"{'' if sent_count == 1 else 's'}"
+                )
+
+            return redirect_and_flash_error(
+                request,
+                f"Unable to send judge codes{partial_message}: {exc}",
+            )
 
         JudgeCodeEmailLog.objects.bulk_create(log_entries)
 

mittab/libs/email_service.py

@@ -13,6 +13,10 @@
 class EmailServiceError(Exception):
     """Raised when Amazon SES rejects a send request."""
 
+    def __init__(self, message, sent_requests=None):
+        super().__init__(message)
+        self.sent_requests = list(sent_requests or [])
+
 
 @dataclass(frozen=True)
 class EmailRequest:
@@ -41,6 +45,7 @@ def send_bulk(self, requests: Iterable[EmailRequest]) -> int:
             return 0
 
         sent = 0
+        sent_requests: List[EmailRequest] = []
         failures: List[str] = []
         list_management = self._list_management_options()
         configuration_set = settings.AWS_SES_CONFIGURATION_SET
@@ -59,13 +64,15 @@ def send_bulk(self, requests: Iterable[EmailRequest]) -> int:
             try:
                 self.client.send_email(**payload)
                 sent += 1
+                sent_requests.append(request)
             except (BotoCoreError, ClientError) as exc:
                 logger.exception("Amazon SES send failed: %s", exc)
                 failures.append(str(exc))
 
         if failures:
             raise EmailServiceError(
-                f"Failed to send {len(failures)} email(s): {failures[-1]}"
+                f"Failed to send {len(failures)} email(s): {failures[-1]}",
+                sent_requests=sent_requests,
             )
 
         return sent
@@ -88,7 +95,8 @@ def _list_management_options(self):
         contact_list = settings.AWS_MAILMANAGER_ADDRESS_LIST
         if not contact_list:
             logger.warning(
-                "AWS_MAILMANAGER_ADDRESS_LIST not configured; unsubscribe links will be omitted"
+                "AWS_MAILMANAGER_ADDRESS_LIST not configured; "
+                "unsubscribe links will be omitted"
             )
             return None
 

mittab/libs/tests/test_email_service.py

@@ -5,28 +5,47 @@
 
 
 class DummySESClient:
-    def __init__(self, should_fail=False, fail_create=False, existing_lists=None):
+    def __init__(
+        self,
+        should_fail=False,
+        fail_create=False,
+        existing_lists=None,
+        fail_on_calls=None,
+    ):
         self.should_fail = should_fail
         self.fail_create = fail_create
+        self.fail_on_calls = set(fail_on_calls or [])
         self.calls = []
+        self.send_attempts = 0
         self.created_lists = []
         self.contact_lists = set(existing_lists or [])
 
     def send_email(self, **kwargs):
-        if self.should_fail:
-            raise ClientError({"Error": {"Code": "Boom", "Message": "boom"}}, "SendEmail")
+        self.send_attempts += 1
+        call_number = self.send_attempts
+        if self.should_fail or call_number in self.fail_on_calls:
+            raise ClientError(
+                {"Error": {"Code": "Boom", "Message": "boom"}},
+                "SendEmail",
+            )
         self.calls.append(kwargs)
 
     def create_contact_list(self, **kwargs):
         if self.fail_create:
-            raise ClientError({"Error": {"Code": "RandomError", "Message": "boom"}}, "CreateContactList")
+            raise ClientError(
+                {"Error": {"Code": "RandomError", "Message": "boom"}},
+                "CreateContactList",
+            )
         self.created_lists.append(kwargs.get("ContactListName"))
         self.contact_lists.add(kwargs.get("ContactListName"))
 
     def get_contact_list(self, **kwargs):
         name = kwargs.get("ContactListName")
         if name not in self.contact_lists:
-            raise ClientError({"Error": {"Code": "NotFoundException", "Message": "missing"}}, "GetContactList")
+            raise ClientError(
+                {"Error": {"Code": "NotFoundException", "Message": "missing"}},
+                "GetContactList",
+            )
 
 
 def test_send_bulk_injects_unsubscribe_links(settings):
@@ -70,6 +89,30 @@ def test_send_bulk_raises_on_failure(settings):
         service.send_bulk([request])
 
 
+def test_send_bulk_reports_partial_successes(settings):
+    settings.AWS_MAILMANAGER_ADDRESS_LIST = "test-contact-list"
+    settings.DEFAULT_FROM_EMAIL = "MIT-TAB <no-reply@example.com>"
+    settings.EMAIL_REPLY_TO = "no-reply@example.com"
+
+    client = DummySESClient(fail_on_calls={2})
+    service = EmailService(ses_client=client)
+    first_request = EmailRequest(
+        to_address="judge1@example.com",
+        subject="Judge Code",
+        text_body="Test",
+    )
+    second_request = EmailRequest(
+        to_address="judge2@example.com",
+        subject="Judge Code",
+        text_body="Test",
+    )
+
+    with pytest.raises(EmailServiceError) as exc_info:
+        service.send_bulk([first_request, second_request])
+
+    assert exc_info.value.sent_requests == [first_request]
+
+
 def test_send_bulk_without_contact_list(settings):
     settings.AWS_MAILMANAGER_ADDRESS_LIST = ""
     settings.DEFAULT_FROM_EMAIL = "MIT-TAB <no-reply@example.com>"
@@ -106,7 +149,7 @@ def test_send_bulk_existing_contact_list(settings):
     sent = service.send_bulk([request])
 
     assert sent == 1
-    assert client.created_lists == []
+    assert not client.created_lists
 
 
 def test_send_bulk_contact_list_creation_failure(settings):