Merge branch 'main' into prod

Author: kuboschek

.github/workflows/docker-latest.yml

@@ -6,7 +6,7 @@ on:
 
 env:
   REGISTRY: ghcr.io
-  IMAGE_NAME: jacobsalumni/membermanagement:latest
+  IMAGE_NAME: beyondthepond/membermanagement:latest
   PLATFORMS: linux/amd64
 
 jobs:

.github/workflows/docker-prod.yml

@@ -6,7 +6,7 @@ on:
 
 env:
   REGISTRY: ghcr.io
-  IMAGE_NAME: jacobsalumni/membermanagement:prod
+  IMAGE_NAME: beyondthepond/membermanagement:prod
   PLATFORMS: linux/amd64
 
 jobs:

.github/workflows/main.yml

@@ -8,29 +8,28 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                python: ["3.10"]
-                node: ["16"]
+                python: ["3.13"]
+                node: ["18"]
                 browser: ["chrome", "firefox"]
 
         steps:
         - uses: actions/checkout@v3
 
         - name: Install Python ${{ matrix.python }}
-          uses: actions/setup-python@v4
+          uses: actions/setup-python@v5
           with:
             python-version: ${{ matrix.python }}
+
+        - name: Run 'poetry install'
+          run: |
+            pip install poetry
+            poetry install
+
         - name: Install Chrome Webdriver
           if: ${{ matrix.browser == 'chrome' }}
           run: |
-            python3 -m venv venv
-            source venv/bin/activate
-
-            pip install seleniumbase
             sudo apt-get install -y google-chrome-stable
-            seleniumbase install chromedriver
-
-            deactivate
-            rm -rf venv
+            poetry run seleniumbase install chromedriver
         - name: Install Firefox Webdriver
           if: ${{ matrix.browser == 'firefox' }}
           run: |
@@ -55,22 +54,10 @@ jobs:
             ' | sudo tee /etc/apt/preferences.d/mozilla-firefox > /dev/null
             sudo apt-get -y install firefox
 
-
-            python3 -m venv venv
-            source venv/bin/activate
-
             sudo apt-get install -y firefox
 
-            pip install seleniumbase
-            seleniumbase install geckodriver
+            poetry run seleniumbase install geckodriver
 
-            deactivate
-            rm -rf venv
-        - name: Run 'poetry install'
-          run: |
-            pip install poetry
-            poetry config virtualenvs.create false
-            poetry install
 
         - name: Install Node ${{ matrix.node }}
           uses: actions/setup-node@v1
@@ -83,12 +70,13 @@ jobs:
           run: yarn build
         - name: Check if 'black' has been run
           run:
-            black --exclude 'migrations' --check .
+            poetry run black --exclude 'migrations' --check .
         - name: Run 'pytest'
           env:
             SELENIUM_WEBDRIVER: ${{ matrix.browser }}
             ENABLE_GEOCACHE_TEST: '1'
-          run: pytest --timeout=300
+            DJANGO_SETTINGS_MODULE: 'MemberManagement.test_settings'
+          run: poetry run pytest -n 4 --time-limit=300
 
     smoke:
         name: Docker Smoke Test

.vscode/settings.json

@@ -1,7 +1,8 @@
 {
     "python.formatting.provider": "black",
     "python.testing.pytestArgs": [
-        "."
+        ".",
+        "-n 2"
     ],
     "python.testing.unittestEnabled": false,
     "python.testing.pytestEnabled": true,

Dockerfile

@@ -5,7 +5,7 @@ RUN git describe --always > /PORTAL_VERSION
 RUN echo "Saved version file containing '$(cat /PORTAL_VERSION)'"
 
 # image for building node dependencies
-FROM node:16-alpine AS frontend
+FROM node:18-alpine AS frontend
 
 RUN apk add --no-cache \
     git
@@ -23,7 +23,7 @@ ADD assets/ /app/assets/
 RUN yarn build
 
 # image for python
-FROM python:3.10-alpine
+FROM python:3.13-alpine
 
 # Install binary python dependencies
 RUN apk add --no-cache \

MemberManagement/docker_settings.py

@@ -88,3 +88,12 @@
 # Donation receipts
 PDF_RENDER_SERVER = os.environ.get("PDF_RENDER_SERVER")
 SIGNATURE_IMAGE = os.path.join(BASE_DIR, os.environ.setdefault("SIGNATURE_IMAGE", ""))
+
+
+STRIPE_CONTRIBUTOR_PRICE_ID = os.environ.get("STRIPE_CONTRIBUTOR_PRICE_ID")
+STRIPE_PATRON_PRICE_ID = os.environ.get("STRIPE_PATRON_PRICE_ID")
+STRIPE_STARTER_PRICE_ID = os.environ.get("STRIPE_STARTER_PRICE_ID")
+
+STRIPE_CONTRIBUTOR_PRODUCT_ID = os.environ.get("STRIPE_CONTRIBUTOR_PRODUCT_ID")
+STRIPE_PATRON_PRODUCT_ID = os.environ.get("STRIPE_PATRON_PRODUCT_ID")
+STRIPE_STARTER_PRODUCT_ID = os.environ.get("STRIPE_STARTER_PRODUCT_ID")

MemberManagement/settings.py

@@ -251,3 +251,13 @@
     pass
 
 SITE_ID = 1
+
+# Product IDs, used for reconciling local data from Stripe data
+STRIPE_CONTRIBUTOR_PRODUCT_ID = "prod_SUs3ndpRDNqw9C"
+STRIPE_PATRON_PRODUCT_ID = "prod_SUs4SFxhRtJgV5"
+STRIPE_STARTER_PRODUCT_ID = "prod_S7cQEP8uPJu675"
+
+# Exact price IDs, used for signups
+STRIPE_CONTRIBUTOR_PRICE_ID = "price_1Rc03OK8wO5tRpJk4crjyiAj"
+STRIPE_PATRON_PRICE_ID = "price_1Rc05JK8wO5tRpJkX3EvIcnA"
+STRIPE_STARTER_PRICE_ID = "price_1RDNBKK8wO5tRpJk4y3CLUAS"

MemberManagement/tests/test_access.py

@@ -33,9 +33,6 @@
     + [
         "registry_vote",
         "setup_membership",
-        "setup_subscription",
-        "update_subscription",
-        "view_payments",
     ]
 )
 

README.md

@@ -1,6 +1,6 @@
 # Member Management Portal
 
-![Build Status](https://github.com/JacobsAlumni/MemberManagement/workflows/CI/badge.svg)
+![Build Status](https://github.com/BeyondThePond/MemberManagement/workflows/CI/badge.svg)
 
 The Django Application for managing Jacobs University Bremen Alumni Members.
 
@@ -91,9 +91,9 @@ See the Configuration sections of the appropriate settings to configure.
 ### Deployment via Docker
 
 It is also possible to deploy this application via [Docker](https://www.docker.com/).
-This repository is automatically built as a [GitHub Package](https://github.com/users/jacobsalumni/packages/container/package/membermanagement) for every push on the main and prod branches.
-- for the `main` branch, use `ghcr.io/jacobsalumni/membermanagement:latest`
-- for the `prod` branch, use `ghcr.io/jacobsalumni/membermanagement:prod`
+This repository is automatically built as a [GitHub Package](https://github.com/users/beyondthepond/packages/container/package/membermanagement) for every push on the main and prod branches.
+- for the `main` branch, use `ghcr.io/beyondthepond/membermanagement:latest`
+- for the `prod` branch, use `ghcr.io/beyondthepond/membermanagement:prod`
 
 For Docker purposes the configuration file `MemberManagement/docker_settings.py` is used.
 By default, it also uses a local sqlite database.

alumni/fields/tier.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+from MemberManagement import settings
+
 from .custom import CustomTextChoiceField
 
 __all__ = ["TierField"]
@@ -10,18 +12,29 @@ class TierField(CustomTextChoiceField):
     CONTRIBUTOR = "co"
     PATRON = "pa"
 
-    CHOICES = (
+    CHOICES = [
         (CONTRIBUTOR, "Contributor – Standard membership for 39€ p.a."),
         (STARTER, "Starter – Free Membership for 0€ p.a."),
         (PATRON, "Patron – Premium membership for 249€ p.a."),
-    )
+    ]
 
     STRIPE_IDS = {
         CONTRIBUTOR: "contributor-membership",
         STARTER: "starter-membership",
         PATRON: "patron-membership",
     }
 
+    STRIPE_ID_TO_TIER = {
+        # Legacy IDs
+        "contributor-membership": CONTRIBUTOR,
+        "patron-membership": PATRON,
+        "starter-membership": STARTER,
+        # New IDs
+        settings.STRIPE_CONTRIBUTOR_PRODUCT_ID: CONTRIBUTOR,
+        settings.STRIPE_PATRON_PRODUCT_ID: PATRON,
+        settings.STRIPE_STARTER_PRODUCT_ID: STARTER,
+    }
+
     @staticmethod
     def get_description(value):
         for k, v in TierField.CHOICES:
@@ -31,3 +44,9 @@ def get_description(value):
     @staticmethod
     def get_stripe_id(value):
         return TierField.STRIPE_IDS[value]
+
+    @staticmethod
+    def get_tier_from_stripe_id(stripe_id: str) -> str:
+        """Maps a Stripe plan ID to a membership tier."""
+
+        return TierField.STRIPE_ID_TO_TIER.get(stripe_id, "Unknown")