Merge pull request #28 from Sheldenburg/feature/user-registration

fix the initial data load in prod

Author: Sheldenburg

.github/workflows/db-migration.yml

@@ -1,4 +1,4 @@
-name: Alembic DB Migration
+name: Alembic DB Migration and Load Initial Data
 
 on:
   push:
@@ -16,13 +16,24 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v3
         with:
-          python-version: '3.11'
+          python-version: "3.11"
 
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
           pip install -r requirements.txt
 
+      - name: Start the DB
+        working-directory: backend/src
+        env:
+          POSTGRES_DB: ${{ secrets.POSTGRES_DB }}
+          POSTGRES_USER: ${{ secrets.POSTGRES_USER }}
+          POSTGRES_PASSWORD: ${{ secrets.POSTGRES_PASSWORD }}
+          POSTGRES_SERVER: ${{ secrets.POSTGRES_SERVER }}
+          POSTGRES_PORT: ${{ secrets.POSTGRES_PORT }}
+        run: |
+          python backend_pre_start.py
+
       - name: Run Alembic migrations
         working-directory: backend/src/app
         env:
@@ -33,3 +44,16 @@ jobs:
           POSTGRES_PORT: ${{ secrets.POSTGRES_PORT }}
         run: |
           alembic upgrade head
+
+      - name: Create initial data in the DB
+        working-directory: backend/src
+        env:
+          POSTGRES_DB: ${{ secrets.POSTGRES_DB }}
+          POSTGRES_USER: ${{ secrets.POSTGRES_USER }}
+          POSTGRES_PASSWORD: ${{ secrets.POSTGRES_PASSWORD }}
+          POSTGRES_SERVER: ${{ secrets.POSTGRES_SERVER }}
+          POSTGRES_PORT: ${{ secrets.POSTGRES_PORT }}
+          FIRST_SUPERUSER: ${{ secrets.FIRST_SUPERUSER }}
+          FIRST_SUPERUSER_PASSWORD: ${{ secrets.FIRST_SUPERUSER_PASSWORD }}
+        run: |
+          python initial_data.py

backend/prestart.sh backend/scripts/prestart.sh

@@ -1,21 +1,16 @@
 #! /usr/bin/env bash
 
-cd lambda/app
+cd src
 # Load environment variables
 export $(grep -v '^#' .env | xargs)
 
-
 # Let the DB start
-# python /app/app/backend_pre_start.py
-# python backend_pre_start.py
+python backend_pre_start.py
 
+cd app
 # Run migrations
 alembic upgrade head
 
 cd ..
-
 # Create initial data in DB
-# python /app/app/initial_data.py
 python initial_data.py
-
-cd ..

backend/tests-start.sh backend/scripts/tests-start.sh

@@ -1,11 +1,10 @@
 import logging
 
+from app.core.db import engine
 from sqlalchemy import Engine
 from sqlmodel import Session, select
 from tenacity import after_log, before_log, retry, stop_after_attempt, wait_fixed
 
-from app.core.db import engine
-
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
 

backend/src/app/backend_pre_start.py backend/src/backend_pre_start.py

@@ -1,11 +1,10 @@
 import logging
 
+from app.core.db import engine
 from sqlalchemy import Engine
 from sqlmodel import Session, select
 from tenacity import after_log, before_log, retry, stop_after_attempt, wait_fixed
 
-from app.core.db import engine
-
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)