Merge branch 'main' into feature/volunteer-languages-templatetag

Author: ArnavBallinCode

.github/workflows/ci.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [ "3.13", "3.14" ]
+        python-version: [ "3.14", "3.15" ]
       fail-fast:
         false
     steps:

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.13-bookworm AS base
+FROM python:3.14-bookworm AS base
 ENV PYTHONUNBUFFERED=1
 ENV PYTHONDONTWRITEBYTECODE=1
 RUN mkdir /code
@@ -30,7 +30,7 @@ COPY requirements-dev.txt /code/
 RUN --mount=type=cache,target=/root/.cache/pip \
     pip install -r requirements-dev.txt
 
-RUN chown -R user /usr/local/lib/python3.13/site-packages
+RUN chown -R user /usr/local/lib/python3.14/site-packages
 
 USER user
 ENV PATH="${PATH}:/home/user/.local/bin"
@@ -41,7 +41,7 @@ ENV PATH="${PATH}:/home/user/.local/bin"
 ###############################################################################
 FROM base
 
-RUN  chown -R nobody /usr/local/lib/python3.13/site-packages
+RUN  chown -R nobody /usr/local/lib/python3.14/site-packages
 
 COPY . /code/
 
@@ -50,5 +50,5 @@ RUN \
     DJANGO_SECRET_KEY=deadbeefcafe \
     DATABASE_URL=postgres://localhost:5432/db \
     DJANGO_SETTINGS_MODULE=portal.settings \
-    python manage.py collectstatic --noinput
+    python manage.py collectstatic --noinput --clear
 

Makefile

@@ -14,7 +14,7 @@ default:
 	docker compose build --build-arg  USER_ID=$(shell id -u)  --build-arg GROUP_ID=$(shell id -g) --force-rm web
 
 	# Collect static assets
-	docker compose run --rm web python manage.py collectstatic --noinput
+	docker compose run --rm web python manage.py collectstatic --noinput --clear
 
 	# Create createcachetable
 	docker compose run --rm web python manage.py createcachetable

docs/developer/setup.md

@@ -61,7 +61,7 @@ To run locally _without_ Docker these are the steps.
 
 Have these installed first before continuing further.
 
-- Use Python 3.13+
+- Use Python 3.14+
 - You can install [different versions of Python using pyenv](https://github.com/pyenv/pyenv).
 - You'll also need PostgreSQL (you can find the instructions here).
 
@@ -210,6 +210,7 @@ For local development and testing, you can generate sample data to populate your
 - **5 Volunteer Profiles**: With various application statuses (approved, pending, waitlisted, rejected)
 - **5 Sponsorship Tiers**: Ranging from $2,500 to $25,000
 - **5 Sponsorship Profiles**: With different progress statuses
+- **5 Individual Donations**: Random amounts between $5 and $300
 
 **Important**: This command only works when `DEBUG=True` in your settings to prevent accidental use in production environments.
 

netlify.toml

@@ -2,4 +2,4 @@
 [build]
   command = "mkdocs build"
   publish = "site"
-  environment = { PYTHON_VERSION = "3.13"}
+  environment = { PYTHON_VERSION = "3.14"}

portal/common.py

@@ -2,6 +2,10 @@
 from django.db.models import Count, Sum
 
 from portal.constants import (
+    CACHE_KEY_DONATION_BREAKDOWN,
+    CACHE_KEY_DONATION_TOWARDS_GOAL_PERCENT,
+    CACHE_KEY_DONATIONS_TOTAL_AMOUNT,
+    CACHE_KEY_DONORS_COUNT,
     CACHE_KEY_SPONSORSHIP_BREAKDOWN,
     CACHE_KEY_SPONSORSHIP_COMMITTED,
     CACHE_KEY_SPONSORSHIP_COMMITTED_COUNT,
@@ -12,16 +16,24 @@
     CACHE_KEY_SPONSORSHIP_PENDING_COUNT,
     CACHE_KEY_SPONSORSHIP_TOWARDS_GOAL_PERCENT,
     CACHE_KEY_TEAMS_COUNT,
+    CACHE_KEY_TOTAL_FUNDS_RAISED,
     CACHE_KEY_TOTAL_SPONSORSHIPS,
     CACHE_KEY_VOLUNTEER_BREAKDOWN,
     CACHE_KEY_VOLUNTEER_LANGUAGES,
     CACHE_KEY_VOLUNTEER_ONBOARDED_COUNT,
     CACHE_KEY_VOLUNTEER_PYLADIES_CHAPTERS,
     CACHE_KEY_VOLUNTEER_SIGNUPS_COUNT,
+    DONATION_GOAL_AMOUNT,
+    DONATIONS_GOAL,
+    SPONSORSHIP_GOAL,
     SPONSORSHIP_GOAL_AMOUNT,
     STATS_CACHE_TIMEOUT,
 )
-from sponsorship.models import SponsorshipProfile, SponsorshipProgressStatus
+from sponsorship.models import (
+    IndividualDonation,
+    SponsorshipProfile,
+    SponsorshipProgressStatus,
+)
 from volunteer.constants import ApplicationStatus
 from volunteer.models import Team, VolunteerProfile
 
@@ -33,6 +45,7 @@ def get_stats_cached_values():
     stats_dict.update(get_volunteer_stats_dict())
 
     stats_dict.update(get_sponsorships_stats_dict())
+    stats_dict.update(get_donations_stats_dict())
     return stats_dict
 
 
@@ -53,6 +66,7 @@ def get_volunteer_stats_dict():
 
 def get_sponsorships_stats_dict():
     stats_dict = {}
+    stats_dict[SPONSORSHIP_GOAL] = SPONSORSHIP_GOAL_AMOUNT
     stats_dict[CACHE_KEY_TOTAL_SPONSORSHIPS] = get_sponsorship_total_count_stats_cache()
     stats_dict[CACHE_KEY_SPONSORSHIP_PAID] = get_sponsorship_paid_amount_stats_cache()
     stats_dict[CACHE_KEY_SPONSORSHIP_PAID_PERCENT] = (
@@ -78,7 +92,10 @@ def get_sponsorships_stats_dict():
         get_sponsorship_committed_count_stats_cache()
     )
     stats_dict[CACHE_KEY_SPONSORSHIP_BREAKDOWN] = get_sponsorship_breakdown()
-
+    stats_dict[CACHE_KEY_TOTAL_FUNDS_RAISED] = (
+        get_total_donations_amount_cache()
+        + get_sponsorship_committed_amount_stats_cache()
+    )
     return stats_dict
 
 
@@ -498,3 +515,67 @@ def get_volunteer_breakdown():
             STATS_CACHE_TIMEOUT,
         )
     return volunteer_breakdown
+
+
+def get_total_donations_amount_cache():
+    """Returns the donations amount"""
+    total_donations = cache.get(CACHE_KEY_DONATIONS_TOTAL_AMOUNT)
+    if not total_donations:
+
+        total_donations = (
+            IndividualDonation.objects.aggregate(Sum("donation_amount"))[
+                "donation_amount__sum"
+            ]
+            or 0
+        )
+    cache.set(
+        CACHE_KEY_DONATIONS_TOTAL_AMOUNT,
+        total_donations,
+        STATS_CACHE_TIMEOUT,
+    )
+    return total_donations
+
+
+def get_donors_count_cache():
+    """Returns the number of unique donors"""
+    donors_count = cache.get(CACHE_KEY_DONORS_COUNT)
+    if not donors_count:
+
+        donors_count = (
+            IndividualDonation.objects.values("donor_email").distinct().count()
+        )
+    cache.set(
+        CACHE_KEY_DONORS_COUNT,
+        donors_count,
+        STATS_CACHE_TIMEOUT,
+    )
+    return donors_count
+
+
+def get_donation_to_goal_percent_cache():
+    """Returns donation towards goal percent"""
+    donation_towards_goal_percent = cache.get(CACHE_KEY_DONATION_TOWARDS_GOAL_PERCENT)
+    if not donation_towards_goal_percent:
+        total_donations = get_total_donations_amount_cache()
+        donation_towards_goal_percent = (
+            (total_donations / DONATION_GOAL_AMOUNT) * 100
+            if DONATION_GOAL_AMOUNT > 0
+            else 0
+        )
+        cache.set(
+            CACHE_KEY_DONATION_TOWARDS_GOAL_PERCENT,
+            donation_towards_goal_percent,
+            STATS_CACHE_TIMEOUT,
+        )
+    return donation_towards_goal_percent
+
+
+def get_donations_stats_dict():
+    stats_dict = {}
+    stats_dict[DONATIONS_GOAL] = DONATION_GOAL_AMOUNT
+    stats_dict[CACHE_KEY_DONATION_BREAKDOWN] = {
+        "total_donations_amount": get_total_donations_amount_cache(),
+        "donors_count": get_donors_count_cache(),
+        "donation_towards_goal_percent": get_donation_to_goal_percent_cache(),
+    }
+    return stats_dict

portal/constants.py

@@ -17,6 +17,17 @@
 CACHE_KEY_SPONSORSHIP_TOWARDS_GOAL_PERCENT = "sponsorship_towards_goal_percent"
 CACHE_KEY_SPONSORSHIP_BREAKDOWN = "sponsorship_breakdown"
 
+SPONSORSHIP_GOAL_AMOUNT = 15000
+
 CACHE_KEY_VOLUNTEER_BREAKDOWN = "volunteer_breakdown"
 
-SPONSORSHIP_GOAL_AMOUNT = 15000
+DONATION_GOAL_AMOUNT = 2500
+CACHE_KEY_DONATION_BREAKDOWN = "donation_breakdown"
+CACHE_KEY_DONATIONS_TOTAL_AMOUNT = "donations_total_amount"
+CACHE_KEY_DONORS_COUNT = "donors_count"
+CACHE_KEY_DONATION_TOWARDS_GOAL_PERCENT = "donation_towards_goal_percent"
+
+CACHE_KEY_TOTAL_FUNDS_RAISED = "total_funds_raised"
+
+DONATIONS_GOAL = "donations_goal"
+SPONSORSHIP_GOAL = "sponsorship_goal"

portal/management/commands/generate_sample_data.py

@@ -7,17 +7,24 @@
 - Volunteer Profiles in various states
 - PyLadies Chapters
 - Sponsorship Tiers and Profiles
+- Individual Donations
 
 This command ONLY runs in development mode (DEBUG=True) and will refuse
 to run in production environments.
 """
 
+import random
+from datetime import timedelta
+
 from django.conf import settings
 from django.contrib.auth.models import User
 from django.core.management.base import BaseCommand, CommandError
 from django.db.models.signals import post_save
+from django.utils import timezone
 
+from portal_account.models import PortalProfile
 from sponsorship.models import (
+    IndividualDonation,
     SponsorshipProfile,
     SponsorshipProgressStatus,
     SponsorshipTier,
@@ -65,6 +72,7 @@ def handle(self, *args, **options):
         self._generate_volunteer_profiles()
         self._generate_sponsorship_tiers()
         self._generate_sponsorship_profiles()
+        self._generate_donations()
 
         self.stdout.write(
             self.style.SUCCESS("Sample data generation completed successfully!")
@@ -173,6 +181,10 @@ def _generate_users(self):
                 self.stdout.write(
                     self.style.WARNING(f"  ~ User already exists: {user.username}")
                 )
+            portal_profile, _ = PortalProfile.objects.get_or_create(user=user)
+            portal_profile.tos_agreement = True
+            portal_profile.coc_agreement = True
+            portal_profile.save()
 
         self.stdout.write(self.style.SUCCESS(f"Created {created_count} new users\n"))
 
@@ -690,3 +702,38 @@ def _create_sponsorship_profiles(self):
         self.stdout.write(
             self.style.SUCCESS(f"Created {created_count} new sponsorship profiles\n")
         )
+
+    def _generate_donations(self):
+        """Generate sample individual donations."""
+        self.stdout.write("Generating individual donations...")
+
+        created_count = 0
+        for i in range(5):
+            donation, created = IndividualDonation.objects.get_or_create(
+                transaction_id=f"transaction-{i+1}",
+                defaults={
+                    "donor_name": f"Donor {i+1}",
+                    "donor_email": f"donor{i+1}@example.com",
+                    "donation_amount": random.randint(5, 300),
+                    "transaction_date": timezone.now()
+                    - timedelta(days=random.randint(1, 30)),
+                },
+            )
+
+            if created:
+                created_count += 1
+                self.stdout.write(
+                    self.style.SUCCESS(
+                        f"  ✓ Created donation: {donation.donor_name} (${donation.donation_amount})"
+                    )
+                )
+            else:
+                self.stdout.write(
+                    self.style.WARNING(
+                        f"  ~ Donation already exists: {donation.donor_name}"
+                    )
+                )
+
+        self.stdout.write(
+            self.style.SUCCESS(f"Created {created_count} new individual donations\n")
+        )

portal/settings.py

@@ -14,6 +14,9 @@
 from pathlib import Path
 
 import dj_database_url
+import django.db.models.signals
+import sentry_sdk
+from sentry_sdk.integrations.django import DjangoIntegration
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent
@@ -28,6 +31,27 @@
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = bool(os.environ.get("DEBUG", default=0))
 
+SENTRY_SDK_DSN = os.environ.get("SENTRY_SDK_DSN")
+if SENTRY_SDK_DSN:
+    sentry_sdk.init(
+        dsn=SENTRY_SDK_DSN,
+        # Add data like request headers and IP for users;
+        # see https://docs.sentry.io/platforms/python/data-management/data-collected/ for more info
+        send_default_pii=True,
+        integrations=[
+            DjangoIntegration(
+                transaction_style="url",
+                middleware_spans=True,
+                signals_spans=True,
+                signals_denylist=[
+                    django.db.models.signals.pre_init,
+                    django.db.models.signals.post_init,
+                ],
+                cache_spans=False,
+                http_methods_to_capture=("GET",),
+            ),
+        ],
+    )
 ALLOWED_HOSTS = os.environ.get("DJANGO_ALLOWED_HOSTS")
 if ALLOWED_HOSTS:
     ALLOWED_HOSTS = ALLOWED_HOSTS.split(",")
@@ -157,12 +181,19 @@
 
 STATIC_URL = "static/"
 STATIC_ROOT = BASE_DIR / "staticroot"
-STATICFILES_STORAGE = "whitenoise.storage.CompressedManifestStaticFilesStorage"
 MEDIA_ROOT = os.path.join(BASE_DIR, "media")
 MEDIA_URL = "/media/"
 
 USE_SPACES = os.getenv("USE_SPACES")
 
+STORAGES = {
+    "default": {"BACKEND": "django.core.files.storage.FileSystemStorage"},
+    "staticfiles": {
+        "BACKEND": "whitenoise.storage.CompressedManifestStaticFilesStorage",
+    },
+}
+
+
 if USE_SPACES == "true":
     STORAGES = {
         "default": {

portal/urls.py

@@ -38,6 +38,11 @@
         volunteer_view.TeamList.as_view(),
         name="teams",
     ),
+    path(
+        "chapters/",
+        volunteer_view.PyladiesChaptersList.as_view(),
+        name="chapters",
+    ),
     path(
         "teams/<int:pk>",
         volunteer_view.TeamView.as_view(),
@@ -49,4 +54,9 @@
         views.stats,
         name="portal_stats",
     ),
+    path(
+        "stats.json",
+        views.stats_json,
+        name="portal_stats_json",
+    ),
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)