Merge branch 'CHAOS-224-KHAOS-rewrite' into CHAOS-625-customisable-ratings

Author: KavikaPalletenne

.github/workflows/docker.yml

@@ -10,12 +10,41 @@ jobs:
   build-backend:
     name: Build (Backend)
     runs-on: ubuntu-latest
-    if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
+    if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/CHAOS-224-KHAOS-rewrite' }}
+    services:
+      postgres:
+        image: postgres:16
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: password
+          POSTGRES_DB: chaos
+        ports:
+          - 5432:5432
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: true
           token: ${{ secrets.GH_TOKEN }}
+      - name: Setup cargo cache
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            backend/server/target/
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: ${{ runner.os }}-cargo-
+      - name: Setup temporary DB
+        working-directory: backend
+        run: |
+          which sqlx || cargo install sqlx-cli --no-default-features --features native-tls,postgres
+          echo "DATABASE_URL=postgres://postgres:password@localhost:5432/chaos" >> .env
+          sqlx migrate run
+      - name: Generate SQLx files
+        working-directory: backend/server
+        run: cargo sqlx prepare
       - name: Set up Docker Buildx
         id: buildx
         uses: docker/setup-buildx-action@master
@@ -40,33 +69,27 @@ jobs:
           context: backend
           builder: ${{ steps.buildx.outputs.name }}
           file: backend/Dockerfile
-          push: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/main' }}
+          push: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/CHAOS-224-KHAOS-rewrite' }}
           tags: |
             ghcr.io/devsoc-unsw/chaos-backend:${{ github.sha }}
-            ghcr.io/devsoc-unsw/chaos-backend:latest
+            ghcr.io/devsoc-unsw/chaos-backend:staging-latest
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=local,src=/tmp/.buildx-cache
-          # Note the mode=max here
-          # More: https://github.com/moby/buildkit#--export-cache-options
-          # And: https://github.com/docker/buildx#--cache-tonametypetypekeyvalue
           cache-to: type=local,mode=max,dest=/tmp/.buildx-cache-new
       - name: Move cache
         run: |
           rm -rf /tmp/.buildx-cache
           mv /tmp/.buildx-cache-new /tmp/.buildx-cache
-  build-client:
-    name: Build (Client)
+  build-frontend:
+    name: Build (Frontend)
     runs-on: ubuntu-latest
+    if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/CHAOS-224-KHAOS-rewrite' }}
     permissions:
       contents: read
       packages: write
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-        with:
-          platforms: arm64
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
       - name: Log into registry ${{ env.REGISTRY }}
@@ -78,26 +101,23 @@ jobs:
       - name: Build and push Docker image
         uses: docker/build-push-action@v4
         with:
-          context: frontend
-          push: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/main' }}
+          context: frontend-nextjs
+          push: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/CHAOS-224-KHAOS-rewrite' }}
           platforms: linux/amd64
-          file: frontend/Dockerfile
-          build-args: |
-            VITE_API_BASE_URL=${{ secrets.API_BASE_URL }}
-            VITE_OAUTH_CALLBACK_URL=${{ secrets.OAUTH_CALLBACK_URL }}
+          file: frontend-nextjs/Dockerfile
           tags: |
             ghcr.io/devsoc-unsw/chaos-frontend:${{ github.sha }}
-            ghcr.io/devsoc-unsw/chaos-frontend:latest
+            ghcr.io/devsoc-unsw/chaos-frontend:staging-latest
           labels: ${{ steps.meta.outputs.labels }}
   deploy:
     name: Deploy (CD)
     runs-on: ubuntu-latest
-    needs: [build-client, build-backend]
-    if: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/main' }}
+    needs: [build-frontend, build-backend]
+    if: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/CHAOS-224-KHAOS-rewrite' }}
     concurrency: staging
     environment:
       name: staging
-      url: https://chaos.staging.csesoc.unsw.edu.au
+      url: https://chaosstaging.devsoc.app
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4

.github/workflows/rust.yml

@@ -50,6 +50,7 @@ jobs:
           echo "ROLE_NAME_MAX_CHARS=20" >> backend/.env
           echo "ROLE_DESCRIPTION_MAX_CHARS=50" >> backend/.env
           echo "ROLE_POSITIONS_AVAILABLE_MAX=20" >> backend/.env
+          echo "CHAOS_SUPER_USER_EMAIL=me@example.com" >> backend/.env
       # selecting a toolchain either by action or manual `rustup` calls should happen
       # before the plugin, as it uses the current rustc version as its cache key
       - uses: actions-rs/toolchain@v1

.gitignore

@@ -3,4 +3,4 @@
 **/.idea/
 **/.next/
 **/target/
-**/.env.*
+**/.env.*

backend/.dockerignore

@@ -0,0 +1,34 @@
+# Build artifacts
+target/
+**/target/
+server/target/
+
+# Git
+.git/
+.gitignore
+
+# Environment files
+.env
+.env.*
+
+# Logs and temp files
+*.log
+*.tmp
+flycheck*/
+
+# IDE files
+.vscode/
+.idea/
+*.swp
+.DS_Store
+
+# Documentation
+*.md
+README*
+api.json
+api.yaml
+
+# Development tools (not needed in production image)
+database-seeding/
+setup-*.sh
+setup-*.yml

backend/.gitignore

@@ -3,4 +3,5 @@ target
 prisma-cli/prisma/migrations
 /.idea
 **/.DS_Store
-.env.*
+.env.*
+**/.sqlx

backend/Dockerfile

@@ -0,0 +1,48 @@
+# build project w/ cargo chef to speed up build times(idk saw it on yt)
+FROM rust:latest AS chef
+
+RUN apt-get update && apt-get install -y \
+    libssl-dev \
+    pkg-config \
+    && rm -rf /var/lib/apt/lists/*
+RUN cargo install cargo-chef
+WORKDIR /backend
+
+FROM chef AS planner
+COPY server/ ./server/
+WORKDIR /backend/server
+RUN cargo chef prepare --recipe-path recipe.json
+
+FROM chef AS builder
+WORKDIR /backend/server
+COPY --from=planner /backend/server/recipe.json ./recipe.json
+
+RUN cargo chef cook --release --recipe-path recipe.json
+
+COPY server/ ./
+
+# Build the server binary
+WORKDIR /backend/server
+
+ENV SQLX_OFFLINE=true
+
+RUN cargo build --release
+
+FROM debian:trixie-slim
+
+RUN apt-get update && apt-get install -y \
+    ca-certificates \
+    libssl3 \
+    libc6 \
+    netcat-openbsd \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN groupadd --system --gid 1001 chaos
+RUN useradd --system --uid 1001 --gid chaos rust
+
+COPY --from=builder --chown=chaos:rust /backend/server/target/release/server /backend/server
+
+USER rust
+
+ENTRYPOINT ["/backend/server"]
+EXPOSE 8000

backend/migrations/20240406023149_create_users.sql

@@ -14,8 +14,4 @@ CREATE TABLE users (
     updated_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP
 );
 
--- Seed initial superuser
-INSERT INTO users (id, email, name, role)
-VALUES (10000, 'chaosdirectors@devsoc.app', 'Super Admin', 'SuperUser');
-
 CREATE UNIQUE INDEX IDX_users_email_lower on users((lower(email)));

backend/migrations/20240406024211_create_organisations.sql

@@ -19,7 +19,13 @@ CREATE TABLE organisation_members (
         FOREIGN KEY(organisation_id)
             REFERENCES organisations(id)
                 ON DELETE CASCADE
-                ON UPDATE CASCADE
+                ON UPDATE CASCADE,
+    CONSTRAINT FK_organisation_members_user
+        FOREIGN KEY(user_id)
+            REFERENCES users(id)
+                ON DELETE CASCADE
+                ON UPDATE CASCADE,
+    UNIQUE(organisation_id, user_id)
 );
 
 

backend/migrations/20251208090000_organisation_invites.sql

@@ -0,0 +1,15 @@
+CREATE TABLE organisation_invites (
+    id BIGINT PRIMARY KEY,
+    organisation_id BIGINT NOT NULL REFERENCES organisations(id) ON DELETE CASCADE,
+    code TEXT NOT NULL UNIQUE,
+    email TEXT NOT NULL,
+    expires_at TIMESTAMPTZ NOT NULL,
+    used_at TIMESTAMPTZ,
+    used_by BIGINT REFERENCES users(id) ON DELETE SET NULL,
+    created_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    invited_by_user_id BIGINT REFERENCES users(id) ON DELETE SET NULL
+);
+
+CREATE INDEX IDX_organisation_invites_code ON organisation_invites(code);
+CREATE INDEX IDX_organisation_invites_organisation_id ON organisation_invites(organisation_id);
+CREATE INDEX IDX_organisation_invites_email ON organisation_invites(email);