feat: add daily stats model and GitHub username field; update daily tasks and templates

Author: DonnieBLT

website/admin.py

@@ -19,6 +19,7 @@
     Contributor,
     ContributorStats,
     Course,
+    DailyStats,
     Domain,
     Enrollment,
     ForumCategory,
@@ -598,6 +599,14 @@ class RoomAdmin(admin.ModelAdmin):
     date_hierarchy = "created_at"
 
 
+class DailyStatsAdmin(admin.ModelAdmin):
+    list_display = ("name", "value", "created", "modified")
+    search_fields = ["name", "value"]
+    list_filter = ["created", "modified"]
+    readonly_fields = ["created", "modified"]
+    ordering = ["-modified"]
+
+
 admin.site.register(Project, ProjectAdmin)
 admin.site.register(Repo, RepoAdmin)
 admin.site.register(Contributor, ContributorAdmin)
@@ -649,3 +658,4 @@ class RoomAdmin(admin.ModelAdmin):
 admin.site.register(Message, MessageAdmin)
 admin.site.register(SlackBotActivity, SlackBotActivityAdmin)
 admin.site.register(Room, RoomAdmin)
+admin.site.register(DailyStats, DailyStatsAdmin)

website/management/base.py

@@ -1,7 +1,7 @@
 from django.core.management.base import BaseCommand
 from django.utils import timezone
 
-from website.models import ManagementCommandLog
+from website.models import DailyStats, ManagementCommandLog
 
 
 class LoggedBaseCommand(BaseCommand):
@@ -28,6 +28,22 @@ def execute(self, *args, **options):
                     command_name=command_name, success=True, run_count=1, last_run=timezone.now()
                 )
 
+            # Update DailyStats for this command
+            today = timezone.now().date()
+            try:
+                # Try to find an existing entry for today
+                daily_stat = DailyStats.objects.get(name=command_name, created__date=today)
+                # Increment the value
+                try:
+                    current_value = int(daily_stat.value)
+                    daily_stat.value = str(current_value + 1)
+                except (ValueError, TypeError):
+                    daily_stat.value = "1"
+                daily_stat.save()
+            except DailyStats.DoesNotExist:
+                # Create a new entry
+                DailyStats.objects.create(name=command_name, value="1")
+
             return result
         except Exception as e:
             # Handle error case
@@ -46,4 +62,19 @@ def execute(self, *args, **options):
                     command_name=command_name, success=False, error_message=str(e), run_count=1, last_run=timezone.now()
                 )
 
+            # Still update DailyStats even if there was an error
+            today = timezone.now().date()
+            try:
+                daily_stat = DailyStats.objects.get(name=command_name, created__date=today)
+                # Increment the value
+                try:
+                    current_value = int(daily_stat.value)
+                    daily_stat.value = str(current_value + 1)
+                except (ValueError, TypeError):
+                    daily_stat.value = "1"
+                daily_stat.save()
+            except DailyStats.DoesNotExist:
+                # Create a new entry
+                DailyStats.objects.create(name=command_name, value="1")
+
             raise

website/management/commands/fetch_gsoc_orgs.py

@@ -100,6 +100,9 @@ def assign_tags(self, org, tags):
             tag_slug = slugify(tag_name)
             tag, _ = Tag.objects.get_or_create(slug=tag_slug, defaults={"name": tag_name})
             org.tags.add(tag)
+        # also add the tag gsoc25 to all orgs that run this
+        tag, _ = Tag.objects.get_or_create(slug="gsoc25", defaults={"name": "GSoC 2025"})
+        org.tags.add(tag)
 
     def assign_contacts(self, org, contacts):
         for contact in contacts:

website/management/commands/initsuperuser.py

@@ -11,5 +11,8 @@ def handle(self, *args, **options):
             EMAIL = user[1]
             PASSWORD = user[2]
             print("Creating superuser for %s (%s)" % (USERNAME, EMAIL))
-            superuser = User.objects.create_superuser(username=USERNAME, email=EMAIL, password=PASSWORD)
-            superuser.save()
+            if settings.DEBUG:
+                superuser = User.objects.create_superuser(username=USERNAME, email=EMAIL, password=PASSWORD)
+                superuser.save()
+            else:
+                print("Skipping superuser creation in non-debug mode")

website/management/commands/run_daily.py

@@ -18,6 +18,7 @@ def handle(self, *args, **options):
             call_command("check_keywords")
             call_command("check_owasp_projects")
             call_command("check_trademarks")
+            call_command("update_repo_stars")
         except Exception as e:
             logger.error(f"Error in daily tasks: {str(e)}")
             raise

website/management/commands/update_repo_stars.py

@@ -0,0 +1,91 @@
+import logging
+import time
+
+import requests
+from django.core.management.base import BaseCommand
+from django.utils import timezone
+
+from website.models import ManagementCommandLog, Repo
+
+logger = logging.getLogger(__name__)
+
+
+class Command(BaseCommand):
+    help = "Update repository star counts from GitHub API"
+
+    def handle(self, *args, **options):
+        command_name = "update_repo_stars"
+        log_entry, created = ManagementCommandLog.objects.get_or_create(command_name=command_name)
+        log_entry.run_count += 1
+        log_entry.save()
+
+        try:
+            self.stdout.write(self.style.SUCCESS("Starting repository star count update..."))
+
+            # Get all repositories
+            repos = Repo.objects.all()
+            self.stdout.write(f"Found {repos.count()} repositories to update")
+
+            updated_count = 0
+            error_count = 0
+
+            for repo in repos:
+                try:
+                    # Extract owner and repo name from repo_url
+                    if "github.com" in repo.repo_url:
+                        parts = repo.repo_url.split("github.com/")
+                        if len(parts) > 1:
+                            repo_path = parts[1].strip("/")
+
+                            # Make API request to GitHub
+                            api_url = f"https://api.github.com/repos/{repo_path}"
+                            headers = {"Accept": "application/vnd.github.v3+json"}
+
+                            # Add GitHub token if available
+                            github_token = None
+                            if github_token:
+                                headers["Authorization"] = f"token {github_token}"
+
+                            response = requests.get(api_url, headers=headers)
+
+                            if response.status_code == 200:
+                                data = response.json()
+
+                                # Update repository information
+                                repo.stars = data.get("stargazers_count", 0)
+                                repo.forks = data.get("forks_count", 0)
+                                repo.watchers = data.get("watchers_count", 0)
+                                repo.open_issues = data.get("open_issues_count", 0)
+                                repo.last_updated = timezone.now()
+
+                                # Save changes
+                                repo.save()
+                                updated_count += 1
+                                self.stdout.write(f"Updated {repo.name}: {repo.stars} stars")
+                            else:
+                                self.stdout.write(
+                                    self.style.WARNING(f"Failed to fetch data for {repo.name}: {response.status_code}")
+                                )
+                                error_count += 1
+
+                            # Sleep to avoid rate limiting
+                            time.sleep(1)
+                    else:
+                        self.stdout.write(self.style.WARNING(f"Skipping {repo.name}: Not a GitHub repository"))
+                except Exception as e:
+                    self.stdout.write(self.style.ERROR(f"Error updating {repo.name}: {str(e)}"))
+                    error_count += 1
+
+            self.stdout.write(
+                self.style.SUCCESS(f"Repository update completed. Updated: {updated_count}, Errors: {error_count}")
+            )
+
+            log_entry.success = True
+            log_entry.error_message = None
+            log_entry.save()
+
+        except Exception as e:
+            self.stdout.write(self.style.ERROR(f"Command failed: {str(e)}"))
+            log_entry.success = False
+            log_entry.error_message = str(e)
+            log_entry.save()

website/migrations/0214_dailystats.py

@@ -0,0 +1,27 @@
+# Generated by Django 5.1.6 on 2025-03-02 17:48
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("website", "0213_organization_categories_and_more"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="DailyStats",
+            fields=[
+                ("id", models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")),
+                ("name", models.CharField(max_length=100, unique=True)),
+                ("value", models.CharField(max_length=255)),
+                ("created", models.DateTimeField(auto_now_add=True)),
+                ("modified", models.DateTimeField(auto_now=True)),
+            ],
+            options={
+                "verbose_name": "Daily Statistic",
+                "verbose_name_plural": "Daily Statistics",
+                "ordering": ["-modified"],
+            },
+        ),
+    ]

website/migrations/0215_bid_github_username_alter_bid_user.py

@@ -0,0 +1,27 @@
+# Generated by Django 5.1.6 on 2025-03-02 18:02
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("website", "0214_dailystats"),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="bid",
+            name="github_username",
+            field=models.CharField(blank=True, max_length=100, null=True),
+        ),
+        migrations.AlterField(
+            model_name="bid",
+            name="user",
+            field=models.ForeignKey(
+                blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL
+            ),
+        ),
+    ]

website/models.py

@@ -914,7 +914,8 @@ def __str__(self):
 
 
 class Bid(models.Model):
-    user = models.ForeignKey(User, on_delete=models.CASCADE)
+    user = models.ForeignKey(User, on_delete=models.CASCADE, null=True, blank=True)
+    github_username = models.CharField(max_length=100, blank=True, null=True)
     # link this to our issue model
     issue_url = models.URLField()
     created = models.DateTimeField(default=timezone.now)
@@ -1969,3 +1970,18 @@ class BaconSubmission(models.Model):
 
     def __str__(self):
         return f"{self.user.username} - {self.status}"
+
+
+class DailyStats(models.Model):
+    name = models.CharField(max_length=100, unique=True)
+    value = models.CharField(max_length=255)
+    created = models.DateTimeField(auto_now_add=True)
+    modified = models.DateTimeField(auto_now=True)
+
+    class Meta:
+        verbose_name = "Daily Statistic"
+        verbose_name_plural = "Daily Statistics"
+        ordering = ["-modified"]
+
+    def __str__(self):
+        return f"{self.name}: {self.value}"

website/templates/bidding.html

@@ -66,6 +66,24 @@ <h2 class="text-xl font-semibold mb-3 text-gray-900 flex items-center gap-2">
                             </button>
                         </div>
                     </div>
+                    <!-- GitHub Username Input -->
+                    <div>
+                        <label class="block text-sm font-semibold text-gray-700 mb-2">
+                            <i class="fab fa-github mr-2"></i>GitHub Username
+                        </label>
+                        <div class="relative">
+                            <input type="text"
+                                   id="githubUsername"
+                                   name="user"
+                                   class="block w-full rounded-lg border-2 border-gray-200 shadow-sm focus:border-[#e74c3c] focus:ring focus:ring-[#e74c3c] focus:ring-opacity-50 pl-10 pr-4 py-3 transition-all duration-200"
+                                   placeholder="Enter GitHub username"
+                                   value="{{ request.user.username }}">
+                            <div class="absolute inset-y-0 left-0 pl-3 flex items-center pointer-events-none">
+                                <i class="fab fa-github text-gray-400"></i>
+                            </div>
+                        </div>
+                        <p class="mt-2 text-sm text-gray-500">Enter your GitHub username if different from your BLT username</p>
+                    </div>
                     <!-- Current Bid Display -->
                     <div id="BidDisplay" class="text-lg font-medium text-gray-900"></div>
                     <!-- Quick Bid Buttons -->

website/templates/home.html

@@ -803,53 +803,26 @@ <h2 class="text-3xl font-bold mb-6">Get Involved</h2>
             'action': 'OWASP-BLT/BLT-Action'
         };
 
-        // Cache star counts in localStorage with expiration
-        function getStoredStarCount(repo) {
-            const stored = localStorage.getItem(`star_count_${repo}`);
-            if (stored) {
-                try {
-                    const { count, timestamp } = JSON.parse(stored);
-                    // Cache for 1 hour
-                    if (Date.now() - timestamp < 3600000) {
-                        return count;
-                    }
-                } catch (e) {
-                    return null;
-                }
+        // Display star counts from the database
+        {% for repo in repo_stars %}
+            const countElement = document.getElementById(`{{ repo.key }}-star-count`);
+            if (countElement) {
+                countElement.textContent = {{ repo.stars }};
             }
+        {% endfor %}
 
-        function storeStarCount(repo, count) {
-            localStorage.setItem(`star_count_${repo}`, JSON.stringify({
-                count: count,
-                timestamp: Date.now()
-            }));
-        }
-
+        // Fallback to GitHub API if no data in database
         Object.entries(repos).forEach(([key, repo]) => {
             const countElement = document.getElementById(`${key}-star-count`);
-            if (!countElement) return;
-
-            // First try to get from cache
-            const cachedCount = getStoredStarCount(repo);
-            if (cachedCount !== null) {
-                countElement.textContent = cachedCount;
-            }
+            if (!countElement || countElement.textContent.trim() !== '') return;
 
-            // Then fetch fresh data
+            // If we don't have data from the database, fetch from GitHub API
             fetch(`https://api.github.com/repos/${repo}`, {
                 headers: {
                     'Accept': 'application/vnd.github.v3+json'
                 }
             })
             .then(response => {
-                if (response.status === 403) {
-                    // Rate limited - use cached value or keep showing loading
-                    const cached = getStoredStarCount(repo);
-                    if (cached !== null) {
-                        countElement.textContent = cached;
-                    }
-                    throw new Error('Rate limited');
-                }
                 if (!response.ok) {
                     throw new Error(`HTTP error! status: ${response.status}`);
                 }
@@ -858,16 +831,11 @@ <h2 class="text-3xl font-bold mb-6">Get Involved</h2>
             .then(data => {
                 if (data && typeof data.stargazers_count === 'number') {
                     countElement.textContent = data.stargazers_count;
-                    storeStarCount(repo, data.stargazers_count);
                 }
             })
             .catch(error => {
                 console.error(`Error fetching star count for ${repo}:`, error);
-                // Only show 0 if we don't have a cached value
-                const cached = getStoredStarCount(repo);
-                if (cached === null) {
-                    countElement.textContent = '...';
-                }
+                countElement.textContent = '...';
             });
         });
     </script>