Merge DAW and all recent changes

.devcontainer/devcontainer.json

@@ -0,0 +1,27 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/docker-existing-dockerfile
+{
+	"name": "Existing Dockerfile",
+	"build": {
+		// Sets the run context to one level up instead of the .devcontainer folder.
+		"context": "..",
+		// Update the 'dockerFile' property if you aren't using the standard 'Dockerfile' filename.
+		"dockerfile": "../Dockerfile"
+	},
+
+	// Features to add to the dev container. More info: https://containers.dev/features.
+	// "features": {},
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	"forwardPorts": [8000],
+    "runArgs": ["--network=host"]
+
+	// Uncomment the next line to run commands after the container is created.
+	// "postCreateCommand": "cat /etc/os-release",
+
+	// Configure tool-specific properties.
+	// "customizations": {},
+
+	// Uncomment to connect as an existing user other than the container default. More info: https://aka.ms/dev-containers-non-root.
+	// "remoteUser": "devcontainer"
+}

.dockerignore

@@ -0,0 +1,15 @@
+__pycache__/
+
+
+# Django stuff
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+static
+
+# Environment
+.env
+.env*
+.venv
+venv/

.github/workflows/deploy.yaml

@@ -0,0 +1,117 @@
+name: Build and Deploy
+
+on:
+  push:
+    branches:
+      - main
+  release:
+    types:
+      - published
+
+permissions:
+  contents: read
+  packages: write
+  id-token: write
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-24.04-arm
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to GHCR
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Compute image tags
+        id: image
+        env:
+          EVENT_NAME: ${{ github.event_name }}
+          RELEASE_TAG: ${{ github.event.release.tag_name }}
+          RELEASE_PRERELEASE: ${{ github.event.release.prerelease }}
+          REPOSITORY: ${{ github.repository }}
+          SHA: ${{ github.sha }}
+        run: |
+          set -euo pipefail
+          image="ghcr.io/${REPOSITORY,,}"
+          short_sha="${SHA::12}"
+
+          tags=""
+
+          if [[ "$EVENT_NAME" == "push" ]]; then
+            tags="${image}:nightly"
+            tags+=$'\n'"${image}:sha-${short_sha}"
+          elif [[ "$EVENT_NAME" == "release" ]]; then
+            tags="${image}:${RELEASE_TAG}"
+            if [[ "$RELEASE_PRERELEASE" != "true" ]]; then
+              tags+=$'\n'"${image}:latest"
+            fi
+          else
+            echo "Unsupported event: $EVENT_NAME" >&2
+            exit 1
+          fi
+
+          {
+            echo "image=$image"
+            echo "tags<<EOF"
+            echo "$tags"
+            echo "EOF"
+          } >> "$GITHUB_OUTPUT"
+
+      - name: Build and push image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: ./Dockerfile.aws
+          push: true
+          platforms: ${{ vars.DOCKER_PLATFORMS != '' && vars.DOCKER_PLATFORMS || 'linux/arm64' }}
+          tags: ${{ steps.image.outputs.tags }}
+
+  deploy-dev:
+    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
+    needs: build-and-push
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
+          aws-region: ${{ vars.AWS_REGION }}
+
+      - name: Trigger ECS deployment (dev)
+        run: |
+          aws ecs update-service \
+            --cluster "${{ vars.ECS_DEV_CLUSTER }}" \
+            --service "${{ vars.ECS_DEV_SERVICE }}" \
+            --force-new-deployment
+
+  deploy-prod:
+    if: github.event_name == 'release' && github.event.release.prerelease == false
+    needs: build-and-push
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
+          aws-region: ${{ vars.AWS_REGION }}
+
+      - name: Trigger ECS deployment (prod)
+        run: |
+          aws ecs update-service \
+            --cluster "${{ vars.ECS_PROD_CLUSTER }}" \
+            --service "${{ vars.ECS_PROD_SERVICE }}" \
+            --force-new-deployment

.github/workflows/format.yml

@@ -0,0 +1,25 @@
+name: Check Python Code Formatting
+
+on:
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  format-check:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.12.x"
+
+      - name: Install Black
+        run: pip install black
+
+      - name: Run Black
+        run: black . --check

.gitignore

@@ -151,7 +151,6 @@ typings/
 
 
 ### VisualStudioCode template
-.vscode/
 .vscode/*
 !.vscode/settings.json
 !.vscode/tasks.json

.tool-versions

@@ -0,0 +1 @@
+python 3.11.6

.vscode/launch.json

@@ -0,0 +1,19 @@
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Python Debugger: Django",
+      "type": "debugpy",
+      "request": "launch",
+      "args": [
+        "runserver"
+      ],
+      "django": true,
+      "autoStartBrowser": false,
+      "program": "${workspaceFolder}/manage.py"
+    }
+  ]
+}

.vscode/settings.json

@@ -0,0 +1,8 @@
+{
+  "[python]": {
+    "editor.defaultFormatter": "ms-python.black-formatter",
+    "editor.formatOnSave": true
+  },
+  "editor.formatOnPaste": true,
+  "editor.formatOnSave": true
+}

Dockerfile.aws

@@ -0,0 +1,35 @@
+FROM python:3.10-slim AS builder
+
+RUN mkdir /app
+
+WORKDIR /app
+
+ENV PYTHONDONTWRITEBYTECODE=1
+ENV PYTHONUNBUFFERED=1
+
+COPY requirements.txt /app/
+COPY requirements/ /app/requirements/
+RUN pip install --no-cache-dir -r requirements.txt
+RUN pip install --no-cache-dir -r /app/requirements/production.txt
+
+FROM python:3.10-slim
+
+RUN useradd -m -r appuser && \
+    mkdir /app && \
+    chown -R appuser /app
+
+COPY --from=builder /usr/local/lib/python3.10/site-packages/ /usr/local/lib/python3.10/site-packages/
+COPY --from=builder /usr/local/bin/ /usr/local/bin
+
+WORKDIR /app
+
+COPY --chown=appuser:appuser . .
+
+ENV PYTHONDONTWRITEBYTECODE=1
+ENV PYTHONUNBUFFERED=1
+
+RUN chmod +x /app/entrypoint.prod.sh
+
+EXPOSE 8000
+
+CMD ["/app/entrypoint.prod.sh"]

Procfile

@@ -0,0 +1 @@
+web: bash start.sh

README.md

@@ -82,21 +82,21 @@ Moved to [Live reloading and SASS compilation](http://cookiecutter-django.readth
 
 ### Email Server
 
-In development, it is often nice to be able to see emails that are being sent from your application. If you choose to use [MailHog](https://github.com/mailhog/MailHog) when generating the project a local SMTP server with a web interface will be available.
+In development, it is often nice to be able to see emails that are being sent from your application. If you choose to use [mailpit](https://github.com/axllent/mailpit) when generating the project a local SMTP server with a web interface will be available.
 
-1.  [Download the latest MailHog release](https://github.com/mailhog/MailHog/releases) for your OS.
+1.  [Download the latest mailpit release](https://github.com/axllent/mailpit/releases) for your OS.
 
-2.  Rename the build to `MailHog`.
+2.  Rename the build to `mailpit`.
 
 3.  Copy the file to the project root.
 
 4.  Make it executable:
 
-        $ chmod +x MailHog
+        $ chmod +x mailpit
 
 5.  Spin up another terminal window and start it there:
 
-        ./MailHog
+        ./mailpit
 
 6.  Check out <http://127.0.0.1:8025/> to see how it goes.
 
@@ -128,7 +128,7 @@ The following details how to deploy this application.
 
 # Renewing SSL Certs (requires creating DNS TXT Entries rn 😕)
 1. maybe this is the command? 
-    * `sudo certbot certonly --manual --server https://acme-v02.api.letsencrypt.org/directory --preferred-challenges dns-01 -d "*.musiccpr.org,musiccpr.org"`
+    * `sudo certbot certonly --manual --server https://acme-v02.api.letsencrypt.org/directory --preferred-challenges dns-01 -d "musiccpr.org,dev-api.musiccpr.org,dev.musiccpr.org,api.musiccpr.org"`
 # Deploying to Prod first time
 Prefer to have:
 1. same ec2 instance as dev

config/api_router.py

@@ -16,6 +16,7 @@
     SubmissionViewSet,
     AttachmentViewSet,
     TeacherSubmissionViewSet,
+    ActivityProgressViewSet,
 )
 from teleband.musics.api.views import PieceViewSet
 from teleband.instruments.api.views import InstrumentViewSet
@@ -45,6 +46,7 @@
 
 assignments_router = nested_cls(courses_router, "assignments", lookup="assignment")
 assignments_router.register("submissions", SubmissionViewSet)
+assignments_router.register("activity-progress", ActivityProgressViewSet, basename="activity-progress")
 
 attachments_router = nested_cls(assignments_router, "submissions", lookup="submission")
 attachments_router.register("attachments", AttachmentViewSet)

config/settings/base.py

@@ -46,6 +46,8 @@
     "default": env.db("DATABASE_URL", default="postgres:///teleband"),
 }
 DATABASES["default"]["ATOMIC_REQUESTS"] = True
+DATABASES["default"]["OPTIONS"] = {"pool": True}
+
 # https://docs.djangoproject.com/en/stable/ref/settings/#std:setting-DEFAULT_AUTO_FIELD
 DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
 
@@ -90,6 +92,7 @@
     "teleband.instruments",
     "teleband.musics",
     "teleband.submissions",
+    "teleband.dashboards",
 ]
 # https://docs.djangoproject.com/en/dev/ref/settings/#installed-apps
 INSTALLED_APPS = DJANGO_APPS + THIRD_PARTY_APPS + LOCAL_APPS
@@ -137,6 +140,7 @@
 # ------------------------------------------------------------------------------
 # https://docs.djangoproject.com/en/dev/ref/settings/#middleware
 MIDDLEWARE = [
+    "teleband.utils.health_check.AlbHealthcheckMiddleware",
     "django.middleware.security.SecurityMiddleware",
     "corsheaders.middleware.CorsMiddleware",
     "django.contrib.sessions.middleware.SessionMiddleware",

config/settings/local.py

@@ -14,7 +14,16 @@
     "default": env.db("DATABASE_URL", default="sqlite:///db.sqlite"),
 }
 # https://docs.djangoproject.com/en/dev/ref/settings/#allowed-hosts
-ALLOWED_HOSTS = env.list("ALLOWED_HOSTS", default=["localhost", "0.0.0.0", "127.0.0.1"])
+ALLOWED_HOSTS = env.list(
+    "ALLOWED_HOSTS",
+    default=[
+        "localhost",
+        "0.0.0.0",
+        "127.0.0.1",
+        "dev-api.musiccpr.org",
+        "api.musiccpr.org",
+    ],
+)
 
 # CACHES
 # ------------------------------------------------------------------------------