Merge branch 'main' of https://github.com/ericahan22/Wat2Do

Author: ericahan22

backend/apps/clubs/migrations/0006_clubs_clubs_club_name_idx.py

@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("clubs", "0005_alter_clubs_categories"),
     ]

backend/apps/clubs/views.py

@@ -25,15 +25,15 @@ def get_clubs(request):
         limit = 50
 
         queryset = Clubs.objects.all().order_by("id")
-        
+
         # Apply search filter
         if search_term:
             queryset = queryset.filter(club_name__icontains=search_term)
-        
+
         # Apply category filter
         if category_filter and category_filter.lower() != "all":
             queryset = queryset.filter(categories__icontains=category_filter)
-        
+
         # Handle cursor-based pagination
         if cursor:
             try:
@@ -44,24 +44,34 @@ def get_clubs(request):
                     {"error": "Invalid cursor format"},
                     status=status.HTTP_400_BAD_REQUEST,
                 )
-        
+
         # Get total count for the filtered queryset
         total_count = queryset.count()
-        
+
         # Fetch one more than limit to check if there are more results
-        results = list(queryset.values("id", "club_name", "categories", "club_page", "ig", "discord", "club_type")[:limit + 1])
-        
+        results = list(
+            queryset.values(
+                "id",
+                "club_name",
+                "categories",
+                "club_page",
+                "ig",
+                "discord",
+                "club_type",
+            )[: limit + 1]
+        )
+
         # Determine if there's a next page
         has_more = len(results) > limit
         if has_more:
             results = results[:limit]  # Remove the extra item
-            
+
             # Generate next cursor from last item
             last_club = results[-1]
-            next_cursor = str(last_club['id'])
+            next_cursor = str(last_club["id"])
         else:
             next_cursor = None
-        
+
         # Ensure categories is always a list for each club
         for club in results:
             categories = club.get("categories")
@@ -76,11 +86,13 @@ def get_clubs(request):
             else:
                 club["categories"] = []
 
-        return Response({
-            "results": results,
-            "nextCursor": next_cursor,
-            "hasMore": next_cursor is not None,
-            "totalCount": total_count
-        })
+        return Response(
+            {
+                "results": results,
+                "nextCursor": next_cursor,
+                "hasMore": next_cursor is not None,
+                "totalCount": total_count,
+            }
+        )
     except Exception as e:
         return Response({"error": str(e)}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)

backend/apps/core/auth.py

@@ -1,19 +1,19 @@
-from functools import wraps
 import logging
+from functools import wraps
 
-from clerk_backend_api import authenticate_request, AuthenticateRequestOptions
+from clerk_backend_api import AuthenticateRequestOptions, authenticate_request
 from django.contrib.auth import authenticate
 from django.contrib.auth.backends import BaseBackend
 from django.contrib.auth.models import AnonymousUser, User
 from django.http import JsonResponse
 
-from config.settings.base import CLERK_SECRET_KEY, CLERK_AUTHORIZED_PARTIES
+from config.settings.base import CLERK_AUTHORIZED_PARTIES, CLERK_SECRET_KEY
 
 logger = logging.getLogger(__name__)
 
 
 class JwtAuthBackend(BaseBackend):
-    def authenticate(self, request, **kwargs):
+    def authenticate(self, request, **_kwargs):
         try:
             state = authenticate_request(
                 request,
@@ -25,16 +25,17 @@ def authenticate(self, request, **kwargs):
 
             if not state.is_signed_in:
                 request.error_message = getattr(state, "message", "Not signed in")
-                logger.warning("JWT auth: Clerk rejected token: %s", request.error_message)
+                logger.warning(
+                    "JWT auth: Clerk rejected token: %s", request.error_message
+                )
                 return None
 
             request.auth_payload = state.payload
-            
+
             django_user = AnonymousUser()
             django_user.username = state.payload.get("sub") or "clerk_user"
             return django_user
 
-
         except Exception:
             request.error_message = "Unable to authenticate user"
             logger.exception("JWT auth: exception during authentication")
@@ -55,13 +56,14 @@ def _wrapped_view(request, *args, **kwargs):
             error = getattr(request, "error_message", "User not authenticated")
             return JsonResponse({"detail": error}, status=401)
         request.user = user
-        
+
         # Extract user_id and is_admin from auth_payload (set by JwtAuthBackend)
         auth_payload = getattr(request, "auth_payload", {})
         request.user_id = auth_payload.get("sub") or auth_payload.get("id")
         request.is_admin = auth_payload.get("role") == "admin"
-        
+
         return view_func(request, *args, **kwargs)
+
     return _wrapped_view
 
 
@@ -71,6 +73,7 @@ def optional_jwt(view_func):
     If a token is provided and valid, populates request.auth_payload, request.user_id, and request.is_admin.
     If no token or invalid token, continues without error (for public endpoints).
     """
+
     @wraps(view_func)
     def _wrapped_view(request, *args, **kwargs):
         try:
@@ -81,7 +84,7 @@ def _wrapped_view(request, *args, **kwargs):
                     authorized_parties=CLERK_AUTHORIZED_PARTIES,
                 ),
             )
-            
+
             if state.is_signed_in:
                 request.auth_payload = state.payload
                 # Extract user_id (tries 'sub' first, falls back to 'id')
@@ -103,8 +106,9 @@ def _wrapped_view(request, *args, **kwargs):
             request.user_id = None
             request.is_admin = False
             request.user = AnonymousUser()
-        
+
         return view_func(request, *args, **kwargs)
+
     return _wrapped_view
 
 
@@ -115,4 +119,5 @@ def _wrapped_view(request, *args, **kwargs):
         if not getattr(request, "is_admin", False):
             return JsonResponse({"message": "Admin only"}, status=403)
         return view_func(request, *args, **kwargs)
+
     return _wrapped_view

backend/apps/core/management/commands/fix_sequences.py

@@ -3,9 +3,9 @@
 
 
 class Command(BaseCommand):
-    help = 'Fix PostgreSQL sequences that are out of sync for all tables'
+    help = "Fix PostgreSQL sequences that are out of sync for all tables"
 
-    def handle(self, *args, **options):
+    def handle(self, *_args, **_options):
         with connection.cursor() as cursor:
             # Get all sequences and their associated tables using pg_catalog
             cursor.execute("""
@@ -22,35 +22,39 @@ def handle(self, *args, **options):
                   AND n.nspname = 'public'
                 ORDER BY t.relname, a.attname;
             """)
-            
+
             sequences = cursor.fetchall()
             fixed_count = 0
-            
+
             if not sequences:
-                self.stdout.write(self.style.WARNING("No sequences found in the public schema"))
+                self.stdout.write(
+                    self.style.WARNING("No sequences found in the public schema")
+                )
                 return
-            
+
             self.stdout.write(f"Found {len(sequences)} sequences to check...")
             self.stdout.write("")
-            
+
             for sequence_name, table_name, column_name in sequences:
                 try:
                     # Get the current max value in the table
                     cursor.execute(f"SELECT MAX({column_name}) FROM {table_name};")
                     max_value = cursor.fetchone()[0]
-                    
+
                     if max_value is None:
                         max_value = 1
-                    
+
                     # Get the current sequence value
                     cursor.execute(f"SELECT last_value FROM {sequence_name};")
                     current_seq_value = cursor.fetchone()[0]
-                    
+
                     # Fix the sequence if needed
                     if current_seq_value < max_value:
-                        cursor.execute(f"SELECT setval('{sequence_name}', {max_value}, true);")
+                        cursor.execute(
+                            f"SELECT setval('{sequence_name}', {max_value}, true);"
+                        )
                         new_value = cursor.fetchone()[0]
-                        
+
                         self.stdout.write(
                             self.style.SUCCESS(
                                 f"✓ Fixed {table_name}.{column_name}: {sequence_name} "
@@ -62,14 +66,16 @@ def handle(self, *args, **options):
                         self.stdout.write(
                             f"  {table_name}.{column_name}: {sequence_name} is OK (current: {current_seq_value}, max: {max_value})"
                         )
-                        
+
                 except Exception as e:
                     self.stdout.write(
-                        self.style.ERROR(f"✗ Error fixing {table_name}.{column_name}: {str(e)}")
+                        self.style.ERROR(
+                            f"✗ Error fixing {table_name}.{column_name}: {e!s}"
+                        )
                     )
-            
+
             self.stdout.write("")
-            self.stdout.write("="*60)
+            self.stdout.write("=" * 60)
             if fixed_count > 0:
                 self.stdout.write(
                     self.style.SUCCESS(
@@ -80,4 +86,3 @@ def handle(self, *args, **options):
                 self.stdout.write(
                     self.style.SUCCESS("✓ All sequences are already in sync!")
                 )
-

backend/apps/core/middleware.py

@@ -1,10 +1,11 @@
 from django.http import HttpResponse
 
+
 class HealthCheckMiddleware:
     def __init__(self, get_response):
         self.get_response = get_response
 
     def __call__(self, request):
-        if request.path_info == '/health':
+        if request.path_info == "/health":
             return HttpResponse("OK")
-        return self.get_response(request)
+        return self.get_response(request)

backend/apps/core/views.py

@@ -2,12 +2,13 @@
 Views for the core app with Clerk authentication.
 """
 
-from apps.core.auth import jwt_required
 from rest_framework import status
 from rest_framework.decorators import api_view, permission_classes
 from rest_framework.permissions import AllowAny
 from rest_framework.response import Response
 
+from apps.core.auth import jwt_required
+
 
 @api_view(["GET"])
 @permission_classes([AllowAny])
@@ -48,34 +49,39 @@ def health(_request):
 @jwt_required
 def user_info(request):
     """Get current user info from Clerk"""
-    user_id = request.user.get('id')
-    return Response({
-        "id": user_id,
-        "email": request.user.get('email_addresses', [{}])[0].get('email_address'),
-        "first_name": request.user.get('first_name'),
-        "last_name": request.user.get('last_name'),
-        "username": request.user.get('username'),
-        "image_url": request.user.get('image_url'),
-        "created_at": request.user.get('created_at'),
-        "updated_at": request.user.get('updated_at'),
-    }, status=status.HTTP_200_OK)
+    user_id = request.user.get("id")
+    return Response(
+        {
+            "id": user_id,
+            "email": request.user.get("email_addresses", [{}])[0].get("email_address"),
+            "first_name": request.user.get("first_name"),
+            "last_name": request.user.get("last_name"),
+            "username": request.user.get("username"),
+            "image_url": request.user.get("image_url"),
+            "created_at": request.user.get("created_at"),
+            "updated_at": request.user.get("updated_at"),
+        },
+        status=status.HTTP_200_OK,
+    )
 
 
 @api_view(["GET"])
 @jwt_required
 def protected_view(request):
     """Simple protected route that requires Clerk authentication"""
-    user_id = request.user.get('id')
+    user_id = request.user.get("id")
     return Response(
         {
             "message": "Welcome to the protected area!",
             "user": {
                 "id": user_id,
-                "email": request.user.get('email_addresses', [{}])[0].get('email_address'),
-                "first_name": request.user.get('first_name'),
-                "last_name": request.user.get('last_name'),
-                "username": request.user.get('username'),
-                "image_url": request.user.get('image_url'),
+                "email": request.user.get("email_addresses", [{}])[0].get(
+                    "email_address"
+                ),
+                "first_name": request.user.get("first_name"),
+                "last_name": request.user.get("last_name"),
+                "username": request.user.get("username"),
+                "image_url": request.user.get("image_url"),
             },
         },
         status=status.HTTP_200_OK,

backend/apps/events/migrations/0012_eventsubmission.py

@@ -5,7 +5,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("events", "0011_alter_events_dtstamp"),
     ]

backend/apps/events/migrations/0013_eventsubmission_submitted_by.py

@@ -6,7 +6,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
         ("events", "0012_eventsubmission"),

backend/apps/events/migrations/0014_alter_eventsubmission_submitted_by.py

@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("events", "0013_eventsubmission_submitted_by"),
     ]

backend/apps/events/migrations/0015_events_other_handle_and_more.py

@@ -1,11 +1,10 @@
 # Generated by Django 4.2.7 on 2025-10-29 21:32
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("events", "0014_alter_eventsubmission_submitted_by"),
     ]