add group categories to events (#447)

lexicongovernance · Jul 17, 2024 · 468adcc · 468adcc
1 parent fc5e6cd
commit 468adcc
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 32 deletions.
diff --git a/.github/workflows/check-formatting.yml b/.github/workflows/check-formatting.yml
@@ -18,15 +18,21 @@ jobs:
     name: Review formatting
     timeout-minutes: 2
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [20]
+
     steps:
-      - uses: actions/checkout@v4
+      - name: Check out repository code
+        uses: actions/checkout@v4
+
       - uses: pnpm/action-setup@v4
         with:
-          version: 8
-      - name: Setup Node.js environment
-        uses: actions/setup-node@v3
+          version: 9
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v4
         with:
-          node-version-file: '.nvmrc'
+          node-version: ${{ matrix.node-version }}
           cache: 'pnpm'
 
       - name: Install dependencies

diff --git a/.github/workflows/deploy-development.yml b/.github/workflows/deploy-development.yml
@@ -19,17 +19,21 @@ env:
 jobs:
   build-and-push:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [20]
+
     steps:
-      - name: Checkout code
+      - name: Check out repository code
         uses: actions/checkout@v4
 
       - uses: pnpm/action-setup@v4
         with:
-          version: 8
-      - name: Setup Node.js environment
-        uses: actions/setup-node@v3
+          version: 9
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v4
         with:
-          node-version-file: '.nvmrc'
+          node-version: ${{ matrix.node-version }}
           cache: 'pnpm'
 
       - name: Install dependencies

diff --git a/.github/workflows/deploy-production.yml b/.github/workflows/deploy-production.yml
@@ -19,22 +19,23 @@ env:
 jobs:
   build-and-push:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [20]
+
     steps:
-      - name: Checkout code
+      - name: Check out repository code
         uses: actions/checkout@v4
 
       - uses: pnpm/action-setup@v4
         with:
-          version: 8
-      - name: Setup Node.js environment
-        uses: actions/setup-node@v3
+          version: 9
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v4
         with:
-          node-version-file: '.nvmrc'
+          node-version: ${{ matrix.node-version }}
           cache: 'pnpm'
 
-      - name: Install dependencies
-        run: pnpm install
-
       - name: Run Version Bump Script
         run: scripts/workflows/bump-version.sh "${{ join(github.event.pull_request.labels.*.name, ' ') }}"
 

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -18,16 +18,21 @@ jobs:
     name: Check linting
     timeout-minutes: 2
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [20]
 
     steps:
-      - uses: actions/checkout@v4
+      - name: Check out repository code
+        uses: actions/checkout@v4
+
       - uses: pnpm/action-setup@v4
         with:
-          version: 8
-      - name: Setup Node.js environment
-        uses: actions/setup-node@v3
+          version: 9
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v4
         with:
-          node-version-file: '.nvmrc'
+          node-version: ${{ matrix.node-version }}
           cache: 'pnpm'
 
       - name: Install dependencies

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -10,16 +10,14 @@ on:
 
 jobs:
   testing:
-    # You must use a Linux environment when using service containers or container jobs
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [20]
 
-    # Service containers to run with `runner-job`
     services:
-      # Label used to access the service container
       postgres:
-        # Docker Hub image
         image: postgres
-        # Provide the password for postgres
         env:
           POSTGRES_PASSWORD: secretpassword
           POSTGRES_USER: postgres
@@ -40,11 +38,11 @@ jobs:
 
       - uses: pnpm/action-setup@v4
         with:
-          version: 8
-      - name: Setup Node.js environment
-        uses: actions/setup-node@v3
+          version: 9
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v4
         with:
-          node-version-file: '.nvmrc'
+          node-version: ${{ matrix.node-version }}
           cache: 'pnpm'
 
       - name: Install dependencies

diff --git a/src/db/events.ts b/src/db/events.ts
@@ -3,6 +3,7 @@ import { pgTable, timestamp, uuid, varchar, integer, boolean, jsonb } from 'driz
 import { registrations } from './registrations';
 import { cycles } from './cycles';
 import { registrationFields } from './registration-fields';
+import { groupCategories } from './group-categories';
 
 export const events = pgTable('events', {
   id: uuid('id').primaryKey().defaultRandom(),
@@ -22,6 +23,7 @@ export const eventsRelations = relations(events, ({ many }) => ({
   registrations: many(registrations),
   registrationFields: many(registrationFields),
   cycles: many(cycles),
+  groupCategories: many(groupCategories),
 }));
 
 export type Event = typeof events.$inferSelect;