Merge branch 'main' into security

Author: DonnieBLT

.cursorrules

@@ -1,4 +1,4 @@
-when using cursor rules, show two emojis that are related to the task at hand also give a confidence score 1-100
+when using cursor rules, show five emojis that are related to the task at hand also give a confidence score 1-100 and a haiku of the change you're about ot make
 {
     "urlModules": {
         "website/urls.py": "blt/urls.py"
@@ -18,4 +18,5 @@ if you are not sure about the user's intent, ask the user for clarification
 dont include exceptions in error messages but be very detailed in text what the error is - don't do this: messages.error(request, f"Error: {str(e)}")
 keep javascript in separate files and don't add it to html files
 avoid installing packages that are not needed
-remove any <style tags and use tailwind css instead
+remove any <style tags and use tailwind css instead
+when fixing an issue, always fix the root cause

blt/urls.py

@@ -145,6 +145,7 @@
     HackathonPrizeCreateView,
     HackathonSponsorCreateView,
     HackathonUpdateView,
+    refresh_repository_data,
 )
 from website.views.issue import (
     AllIssuesView,
@@ -1044,13 +1045,26 @@
     path("api/get-wallet-balance/", get_wallet_balance, name="get_wallet_balance"),
     path("extension/", TemplateView.as_view(template_name="extension.html"), name="extension"),
     path("roadmap/", RoadmapView.as_view(), name="roadmap"),
-    # Hackathon URLs.
-    path("hackathons/", HackathonListView.as_view(), name="hackathons"),
-    path("hackathons/create/", HackathonCreateView.as_view(), name="hackathon_create"),
-    path("hackathons/<slug:slug>/", HackathonDetailView.as_view(), name="hackathon_detail"),
-    path("hackathons/<slug:slug>/edit/", HackathonUpdateView.as_view(), name="hackathon_edit"),
-    path("hackathons/<slug:slug>/add-sponsor/", HackathonSponsorCreateView.as_view(), name="hackathon_add_sponsor"),
-    path("hackathons/<slug:slug>/add-prize/", HackathonPrizeCreateView.as_view(), name="hackathon_add_prize"),
+    # Hackathon URLs
+    path(
+        "hackathons/",
+        include(
+            [
+                path("", HackathonListView.as_view(), name="hackathons"),
+                path("create/", HackathonCreateView.as_view(), name="hackathon_create"),
+                path("<slug:slug>/", HackathonDetailView.as_view(), name="hackathon_detail"),
+                path("<slug:slug>/edit/", HackathonUpdateView.as_view(), name="hackathon_update"),
+                path("<slug:slug>/add-sponsor/", HackathonSponsorCreateView.as_view(), name="hackathon_sponsor_create"),
+                path("<slug:slug>/add-prize/", HackathonPrizeCreateView.as_view(), name="hackathon_prize_create"),
+                # Add the new URL pattern for refreshing repository data
+                path(
+                    "<slug:hackathon_slug>/refresh-repo/<int:repo_id>/",
+                    refresh_repository_data,
+                    name="refresh_repository_data",
+                ),
+            ]
+        ),
+    ),
     path("page-vote/", page_vote, name="page_vote"),
     # Queue Management URLs
     path("queue/", queue_list, name="queue_list"),

website/forms.py

@@ -211,6 +211,8 @@ class Meta:
             "registration_open",
             "max_participants",
             "repositories",
+            "sponsor_note",
+            "sponsor_link",
         ]
         widgets = {
             "description": forms.Textarea(
@@ -225,6 +227,19 @@ class Meta:
                     "class": "w-full rounded-md border-gray-300 shadow-sm focus:border-[#e74c3c] focus:ring focus:ring-[#e74c3c] focus:ring-opacity-50",
                 }
             ),
+            "sponsor_note": forms.Textarea(
+                attrs={
+                    "rows": 4,
+                    "class": "w-full rounded-md border-gray-300 shadow-sm focus:border-[#e74c3c] focus:ring focus:ring-[#e74c3c] focus:ring-opacity-50",
+                    "placeholder": "Provide information about sponsorship opportunities for this hackathon",
+                }
+            ),
+            "sponsor_link": forms.URLInput(
+                attrs={
+                    "class": "w-full rounded-md border-gray-300 shadow-sm focus:border-[#e74c3c] focus:ring focus:ring-[#e74c3c] focus:ring-opacity-50",
+                    "placeholder": "https://example.com/sponsor",
+                }
+            ),
             "start_time": forms.DateTimeInput(
                 attrs={
                     "type": "datetime-local",

website/management/commands/sync_repo_contributors.py

@@ -5,7 +5,7 @@
 from django.conf import settings
 from django.core.management.base import BaseCommand
 
-from website.models import Contributor, Repo
+from website.models import Contributor, GitHubIssue, Repo
 
 logger = logging.getLogger(__name__)
 
@@ -59,6 +59,7 @@ def handle(self, *args, **options):
             time.sleep(1)
 
         # Batch create/update contributors
+        contributors_by_login = {}
         for contrib_data in all_contributors:
             github_id = contrib_data.get("id")
             if not github_id:
@@ -76,7 +77,51 @@ def handle(self, *args, **options):
             )
             repo.contributor.add(contributor)
 
+            # Store contributor by login for later use
+            contributors_by_login[contrib_data.get("login")] = contributor
+
         repo.contributor_count = len(all_contributors)
         repo.save()
 
+        # Link contributors to GitHubIssue records
+        # Get all pull requests for this repo that don't have a contributor
+        pull_requests = GitHubIssue.objects.filter(repo=repo, type="pull_request", contributor__isnull=True)
+
+        logger.info(f"Found {pull_requests.count()} pull requests without contributors")
+
+        for pr in pull_requests:
+            try:
+                # Extract GitHub username from URL
+                # URL format: https://github.com/owner/repo/pull/123
+                parts = pr.url.split("/")
+                pr_number = parts[6]
+
+                # Get PR details from GitHub API
+                api_url = f"https://api.github.com/repos/{owner_repo}/pulls/{pr_number}"
+                response = requests.get(api_url, headers=headers)
+
+                if response.status_code != 200:
+                    logger.warning(f"Failed to fetch PR #{pr_number}: {response.status_code}")
+                    continue
+
+                pr_data = response.json()
+                github_username = pr_data["user"]["login"]
+
+                # Find contributor by username
+                contributor = contributors_by_login.get(github_username)
+
+                if contributor:
+                    # Link contributor to PR
+                    pr.contributor = contributor
+
+                    # Also check if PR is merged
+                    if pr_data.get("merged_at") and not pr.is_merged:
+                        pr.is_merged = True
+
+                    pr.save()
+                    logger.info(f"Linked PR #{pr_number} to contributor {github_username}")
+
+            except Exception as e:
+                logger.error(f"Error processing PR #{pr.issue_id}: {str(e)}")
+
         logger.info(f"Synced {len(all_contributors)} contributors for {repo.name}")

website/management/commands/update_github_issues.py

@@ -7,7 +7,7 @@
 from django.utils import timezone
 
 from website.management.base import LoggedBaseCommand
-from website.models import GitHubIssue, GitHubReview, Repo, UserProfile
+from website.models import Contributor, GitHubIssue, GitHubReview, Repo, UserProfile
 
 
 class Command(LoggedBaseCommand):
@@ -60,9 +60,45 @@ def handle(self, *args, **options):
                         merged = True if pr["pull_request"].get("merged_at") else False
                         repo = Repo.objects.get(name__iexact=repo_name)
 
+                        # Get or create contributor record
+                        try:
+                            # Get user details from GitHub API
+                            user_api_url = pr["user"]["url"]
+                            user_response = requests.get(user_api_url, headers=headers)
+                            user_response.raise_for_status()
+                            user_data = user_response.json()
+
+                            # Find or create contributor
+                            contributor, created = Contributor.objects.get_or_create(
+                                github_id=user_data["id"],
+                                defaults={
+                                    "name": user_data["login"],
+                                    "github_url": user_data["html_url"],
+                                    "avatar_url": user_data["avatar_url"],
+                                    "contributor_type": user_data["type"],
+                                    "contributions": 1,
+                                },
+                            )
+
+                            if not created:
+                                # Update existing contributor data
+                                contributor.name = user_data["login"]
+                                contributor.github_url = user_data["html_url"]
+                                contributor.avatar_url = user_data["avatar_url"]
+                                contributor.contributions += 1
+                                contributor.save()
+
+                            # Add contributor to repo
+                            repo.contributor.add(contributor)
+
+                        except Exception as e:
+                            self.stdout.write(self.style.WARNING(f"Error creating contributor: {str(e)}"))
+                            contributor = None
+
                         # Create or update the pull request
                         github_issue, created = GitHubIssue.objects.update_or_create(
                             issue_id=pr["number"],
+                            repo=repo,  # Add repo to the lookup to ensure uniqueness
                             defaults={
                                 "title": pr["title"],
                                 "body": pr.get("body", ""),
@@ -86,8 +122,8 @@ def handle(self, *args, **options):
                                 else None,
                                 "is_merged": merged,
                                 "url": pr["html_url"],
-                                "repo": repo,
                                 "user_profile": user,
+                                "contributor": contributor,  # Link to contributor
                             },
                         )
 

website/migrations/0229_hackathon_sponsor_link_hackathon_sponsor_note.py

@@ -0,0 +1,24 @@
+# Generated by Django 5.1.6 on 2025-03-11 22:50
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("website", "0228_githubissue_contributor"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="hackathon",
+            name="sponsor_link",
+            field=models.URLField(blank=True, help_text="Link to sponsorship information or application", null=True),
+        ),
+        migrations.AddField(
+            model_name="hackathon",
+            name="sponsor_note",
+            field=models.TextField(
+                blank=True, help_text="Additional information about sponsorship opportunities", null=True
+            ),
+        ),
+    ]

website/models.py

@@ -2087,6 +2087,11 @@ class Hackathon(models.Model):
     max_participants = models.PositiveIntegerField(null=True, blank=True)
     # Link to repositories that are part of this hackathon
     repositories = models.ManyToManyField(Repo, related_name="hackathons", blank=True)
+    # Sponsor information
+    sponsor_note = models.TextField(
+        blank=True, null=True, help_text="Additional information about sponsorship opportunities"
+    )
+    sponsor_link = models.URLField(blank=True, null=True, help_text="Link to sponsorship information or application")
 
     class Meta:
         ordering = ["-start_time"]
@@ -2139,8 +2144,8 @@ def get_leaderboard(self):
             repo__in=self.repositories.all(),
             type="pull_request",
             is_merged=True,
-            merged_at__gte=self.start_time,
-            merged_at__lte=self.end_time,
+            created_at__gte=self.start_time,
+            created_at__lte=self.end_time,
         )
 
         # Group by user_profile and count PRs
@@ -2153,6 +2158,23 @@ def get_leaderboard(self):
                     leaderboard[user_id]["prs"].append(pr)
                 else:
                     leaderboard[user_id] = {"user": pr.user_profile.user, "count": 1, "prs": [pr]}
+            elif pr.contributor and pr.contributor.github_id:
+                # If no user profile but has contributor, use contributor as key
+                contributor_id = f"contributor_{pr.contributor.id}"
+                if contributor_id in leaderboard:
+                    leaderboard[contributor_id]["count"] += 1
+                    leaderboard[contributor_id]["prs"].append(pr)
+                else:
+                    leaderboard[contributor_id] = {
+                        "user": {
+                            "username": pr.contributor.name or pr.contributor.github_id,
+                            "email": "",
+                            "id": contributor_id,
+                        },
+                        "count": 1,
+                        "prs": [pr],
+                        "is_contributor": True,
+                    }
 
         # Convert to list and sort by count (descending)
         leaderboard_list = list(leaderboard.values())