Merge branch 'main' into claude/issue-4460-20250803-1750

Author: marcoacierno

.github/workflows/claude.yml

@@ -1,4 +1,4 @@
-name: Claude PR Assistant
+name: Claude Code
 
 on:
   issue_comment:
@@ -11,38 +11,47 @@ on:
     types: [submitted]
 
 jobs:
-  claude-code-action:
+  claude:
     if: |
       (github.event_name == 'issue_comment' && contains(github.event.comment.body, '@claude')) ||
       (github.event_name == 'pull_request_review_comment' && contains(github.event.comment.body, '@claude')) ||
       (github.event_name == 'pull_request_review' && contains(github.event.review.body, '@claude')) ||
-      (github.event_name == 'issues' && contains(github.event.issue.body, '@claude'))
+      (github.event_name == 'issues' && (contains(github.event.issue.body, '@claude') || contains(github.event.issue.title, '@claude')))
     runs-on: ubuntu-latest
+    timeout-minutes: 30
     permissions:
-      contents: read
-      pull-requests: read
-      issues: read
+      contents: write
+      pull-requests: write
+      issues: write
       id-token: write
+      actions: read
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
           fetch-depth: 1
 
-      - name: Run Claude PR Action
-        uses: anthropics/claude-code-action@beta
+      - name: Run Claude
+        uses: anthropics/claude-code-action@v1
         with:
           anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}
-          # Or use OAuth token instead:
-          # claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
-          timeout_minutes: "60"
-          # mode: tag  # Default: responds to @claude mentions
-          # Optional: Restrict network access to specific domains only
-          # experimental_allowed_domains: |
-          #   .anthropic.com
-          #   .github.com
-          #   api.github.com
-          #   .githubusercontent.com
-          #   bun.sh
-          #   registry.npmjs.org
-          #   .blob.core.windows.net
+          # Optional: Customize the trigger phrase (default: @claude)
+          # trigger_phrase: "/claude"
+
+          # Optional: Trigger when specific user is assigned to an issue
+          assignee_trigger: "claude-bot"
+
+          # Optional: Configure Claude's behavior with CLI arguments
+          # claude_args: |
+          #   --model claude-opus-4-1-20250805
+          #   --max-turns 10
+          #   --allowedTools "Bash(npm install),Bash(npm run build),Bash(npm run test:*),Bash(npm run lint:*)"
+          #   --system-prompt "Follow our coding standards. Ensure all new code has tests. Use TypeScript for new files."
+
+          # Optional: Advanced settings configuration
+          # settings: |
+          #   {
+          #     "env": {
+          #       "NODE_ENV": "test"
+          #     }
+          #   }

CLAUDE.md

@@ -0,0 +1,81 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+## Development Commands
+
+### Backend (Django)
+
+- **Local development**: `docker-compose up` (starts all services)
+- **Run tests**: `cd backend && uv run pytest` or `DJANGO_SETTINGS_MODULE=pycon.settings.test uv run pytest`
+- **Single test**: `cd backend && uv run pytest path/to/test_file.py::test_function`
+- **Lint/format**: `cd backend && uv run ruff check` and `uv run ruff format`
+- **Type checking**: `cd backend && uv run mypy .`
+- **Django management**: `cd backend && uv run python manage.py <command>`
+- **Migrations**: `cd backend && uv run python manage.py makemigrations` and `uv run python manage.py migrate`
+
+### Frontend (Next.js)
+
+- **Local development**: `cd frontend && pnpm dev` (or via docker-compose)
+- **Build**: `cd frontend && pnpm build`
+- **Tests**: `cd frontend && pnpm test`
+- **GraphQL codegen**: `cd frontend && pnpm codegen` (or `pnpm codegen:watch`)
+- **Lint/format**: Use Biome via `npx @biomejs/biome check` and `npx @biomejs/biome format`
+
+## Architecture Overview
+
+This is a monorepo for PyCon Italia's website with:
+
+### Backend Structure (Django)
+
+- **API Layer**: GraphQL API using Strawberry at `/backend/api/`
+- **Django Apps**: Modular apps in `/backend/` including:
+  - `conferences/` - Conference management and configuration
+  - `submissions/` - Talk/proposal submissions
+  - `users/` - User management and authentication
+  - `schedule/` - Event scheduling and video uploads
+  - `sponsors/` - Sponsor management
+  - `grants/` - Financial assistance program
+  - `blog/` - Blog posts and news
+  - `cms/` - Content management via Wagtail
+  - `api/` - GraphQL schema and resolvers
+- **Database**: PostgreSQL with migrations in each app's `migrations/` folder
+- **Task Queue**: Celery with Redis backend for async processing
+- **Storage**: Configurable (filesystem local, cloud for production)
+
+### Frontend Structure (Next.js)
+
+- **Framework**: Next.js
+- **Styling**: Tailwind CSS with custom design system
+- **State Management**: Apollo Client for GraphQL
+- **Type Safety**: Full TypeScript with generated types from GraphQL schema
+- **Location**: `/frontend/src/` contains pages, components, and utilities
+
+### Key Integrations
+
+- **Pretix**: Ticketing system integration for event registration
+- **Stripe**: Payment processing
+- **ClamAV**: File scanning for security
+- **Wagtail**: CMS for page content management
+- **Google APIs**: For YouTube video management and calendar integration
+
+## Development Environment
+
+The project uses Docker Compose for local development with services:
+
+- **backend**: Django API server (port 8000)
+- **frontend**: Next.js dev server (port 3000)
+- **custom-admin**: Admin interface (ports 3002-3003)
+- **backend-db**: PostgreSQL database (port 15501)
+- **redis**: Caching and task queue
+- **clamav**: File virus scanning
+
+## Important Notes
+
+- Python version: 3.13.5+ (specified in pyproject.toml)
+- Uses `uv` for Python package management
+- Uses `pnpm` for Node.js package management
+- GraphQL schema auto-generation from Django backend to frontend
+- Test configuration uses separate settings (`pycon.settings.test`)
+- Ruff handles both linting and formatting for Python code
+- Biome handles linting and formatting for JavaScript/TypeScript

backend/api/grants/tests/test_send_grant.py

@@ -91,8 +91,7 @@ def _send_grant(client, conference, conference_code=None, **kwargs):
     return response
 
 
-def test_send_grant(graphql_client, user, mocker, django_capture_on_commit_callbacks):
-    mock_email_template = mocker.patch("api.grants.mutations.EmailTemplate")
+def test_send_grant(graphql_client, user, mocker, django_capture_on_commit_callbacks, sent_emails):
     graphql_client.force_login(user)
     conference = ConferenceFactory(active_grants=True)
     EmailTemplateFactory(
@@ -118,13 +117,18 @@ def test_send_grant(graphql_client, user, mocker, django_capture_on_commit_callb
         user=user, conference=conference, privacy_policy="grant"
     ).exists()
 
-    # An email is sent to the user
-    mock_email_template.objects.for_conference().get_by_identifier().send_email.assert_called_once_with(
-        recipient=user,
-        placeholders={
-            "user_name": user.full_name,
-        },
-    )
+    # Verify that the correct email template was used and email was sent
+    emails_sent = sent_emails()
+    assert emails_sent.count() == 1
+    
+    sent_email = emails_sent.first()
+    assert sent_email.email_template.identifier == EmailTemplateIdentifier.grant_application_confirmation
+    assert sent_email.email_template.conference == conference
+    assert sent_email.recipient == user
+    assert sent_email.recipient_email == user.email
+    
+    # Verify placeholders were processed correctly
+    assert sent_email.placeholders["user_name"] == user.full_name
 
 
 def test_cannot_send_a_grant_if_grants_are_closed(graphql_client, user, mocker):

backend/api/submissions/tests/test_send_submission.py

@@ -141,10 +141,9 @@ def _submit_proposal(client, conference, submission, **kwargs):
 
 
 def test_submit_talk(
-    graphql_client, user, django_capture_on_commit_callbacks, mocker, settings
+    graphql_client, user, django_capture_on_commit_callbacks, mocker, settings, sent_emails
 ):
     settings.FRONTEND_URL = "http://testserver"
-    mock_email_template = mocker.patch("api.submissions.mutations.EmailTemplate")
     mock_notify = mocker.patch("api.submissions.mutations.notify_new_cfp_submission")
     graphql_client.force_login(user)
 
@@ -219,14 +218,20 @@ def test_submit_talk(
 
     mock_notify.delay.assert_called_once()
 
-    mock_email_template.objects.for_conference().get_by_identifier().send_email.assert_called_once_with(
-        recipient=user,
-        placeholders={
-            "user_name": user.full_name,
-            "proposal_title": "English",
-            "proposal_url": f"http://testserver/submission/{talk.hashid}",
-        },
-    )
+    # Verify that the correct email template was used and email was sent
+    emails_sent = sent_emails()
+    assert emails_sent.count() == 1
+    
+    sent_email = emails_sent.first()
+    assert sent_email.email_template.identifier == EmailTemplateIdentifier.proposal_received_confirmation
+    assert sent_email.email_template.conference == conference
+    assert sent_email.recipient == user
+    assert sent_email.recipient_email == user.email
+    
+    # Verify placeholders were processed correctly
+    assert sent_email.placeholders["user_name"] == user.full_name
+    assert sent_email.placeholders["proposal_title"] == "English"
+    assert sent_email.placeholders["proposal_url"] == f"http://testserver/submission/{talk.hashid}"
 
 
 def test_submit_talk_with_photo_to_upload(graphql_client, user, mocker):

backend/conferences/tests/test_tasks.py

@@ -2,7 +2,6 @@
 from notifications.tests.factories import EmailTemplateFactory
 from conferences.tests.factories import ConferenceVoucherFactory
 from datetime import datetime, timezone
-from unittest.mock import patch
 
 import time_machine
 from conferences.models.conference_voucher import ConferenceVoucher
@@ -22,7 +21,7 @@
         ConferenceVoucher.VoucherType.GRANT,
     ],
 )
-def test_send_conference_voucher_email(voucher_type):
+def test_send_conference_voucher_email(voucher_type, sent_emails):
     user = UserFactory(
         full_name="Marco Acierno",
         email="[email protected]",
@@ -41,19 +40,21 @@ def test_send_conference_voucher_email(voucher_type):
         identifier=EmailTemplateIdentifier.voucher_code,
     )
 
-    with patch(
-        "conferences.tasks.EmailTemplate"
-    ) as mock_email_template, time_machine.travel("2020-10-10 10:00:00Z", tick=False):
+    with time_machine.travel("2020-10-10 10:00:00Z", tick=False):
         send_conference_voucher_email(conference_voucher_id=conference_voucher.id)
 
-    mock_email_template.objects.for_conference().get_by_identifier().send_email.assert_called_once_with(
-        recipient=user,
-        placeholders={
-            "voucher_code": "ABC123",
-            "voucher_type": voucher_type,
-            "user_name": "Marco Acierno",
-        },
-    )
+    emails_sent = sent_emails()
+    assert emails_sent.count() == 1
+
+    sent_email = emails_sent.first()
+    assert sent_email.email_template.identifier == EmailTemplateIdentifier.voucher_code
+    assert sent_email.email_template.conference == conference_voucher.conference
+    assert sent_email.recipient == user
+    assert sent_email.placeholders == {
+        "voucher_code": "ABC123",
+        "voucher_type": voucher_type,
+        "user_name": "Marco Acierno",
+    }
 
     conference_voucher.refresh_from_db()
     assert conference_voucher.voucher_email_sent_at == datetime(

backend/conftest.py

@@ -116,3 +116,21 @@ def matcher(req):
         requests_mock.add_matcher(matcher)
 
     return wrapper
+
+
+@pytest.fixture
+def sent_emails(db):
+    """
+    Fixture to capture and provide access to SentEmail objects created during tests.
+    This fixture allows tests to verify email template usage and email creation
+    without mocking the EmailTemplate class.
+    
+    Returns:
+        A callable that returns a QuerySet of SentEmail objects created during the test.
+    """
+    from notifications.models import SentEmail
+    
+    def get_sent_emails():
+        return SentEmail.objects.all()
+    
+    return get_sent_emails

backend/grants/admin.py

@@ -31,13 +31,14 @@
 from schedule.models import ScheduleItem
 from submissions.models import Submission
 from .models import Grant, GrantConfirmPendingStatusProxy
-from django.db.models import Exists, OuterRef, F
+from django.db.models import Exists, OuterRef
 from pretix import user_has_admission_ticket
 
 from django.contrib.admin import SimpleListFilter
 from participants.models import Participant
 from django.urls import reverse
 from django.utils.safestring import mark_safe
+from visa.models import InvitationLetterRequest
 
 logger = logging.getLogger(__name__)
 
@@ -402,6 +403,7 @@ class GrantAdmin(ExportMixin, ConferencePermissionMixin, admin.ModelAdmin):
         "country",
         "is_proposed_speaker",
         "is_confirmed_speaker",
+        "has_sent_invitation_letter_request",
         "emoji_gender",
         "conference",
         "status",
@@ -584,6 +586,12 @@ def user_has_ticket(self, obj: Grant) -> bool:
     def has_voucher(self, obj: Grant) -> bool:
         return obj.has_voucher
 
+    @admin.display(description="📧")
+    def has_sent_invitation_letter_request(self, obj: Grant) -> bool:
+        if obj.has_invitation_letter_request:
+            return "📧"
+        return ""
+
     def get_queryset(self, request):
         qs = (
             super()
@@ -608,6 +616,12 @@ def get_queryset(self, request):
                         user_id=OuterRef("user_id"),
                     )
                 ),
+                has_invitation_letter_request=Exists(
+                    InvitationLetterRequest.objects.filter(
+                        conference_id=OuterRef("conference_id"),
+                        requester_id=OuterRef("user_id"),
+                    )
+                ),
             )
         )