chore(commands): remove redundant database setup commands

since ensure_db implements the same functionality, the .sh commands
were cleaned up to avoid redundancy

Author: lalver1

.devcontainer/devcontainer.json

@@ -5,7 +5,7 @@
   "runServices": ["dev", "pgweb"],
   "forwardPorts": ["docs:8000"],
   "workspaceFolder": "/caltrans/app",
-  "postStartCommand": ["/bin/bash", "bin/reset_db.sh"],
+  "postStartCommand": ["/bin/bash", "bin/setup.sh"],
   "postAttachCommand": ["/bin/bash", ".devcontainer/postAttach.sh"],
   "customizations": {
     "vscode": {

.github/workflows/tests-pytest.yml

@@ -33,9 +33,6 @@ jobs:
           pip install -e .[test]
           pip install -r streamlit_app/requirements.txt
 
-      - name: Run setup
-        run: ./bin/init.sh
-
       - name: Run tests
         run: ./tests/pytest/run.sh
 

bin/reset_db.sh

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+set -ex
+
+# Ensure databases, users, migrations, and superuser are set up
+should_reset=${REMOTE_CONTAINERS:-false}
+if [[ $should_reset == "true" ]]; then
+    # running in a devcontainer, reset the DB
+    python manage.py ensure_db --reset
+else
+    python manage.py ensure_db
+fi
+
+# Load data fixtures (if any)
+valid_fixtures=$(echo "$DJANGO_DB_FIXTURES" | grep -e fixtures\.json$ || test $? = 1)
+
+if [[ -n "$valid_fixtures" ]]; then
+    python manage.py loaddata $DJANGO_DB_FIXTURES
+else
+    echo "No JSON fixtures to load"
+fi

bin/setup.sh

@@ -1,10 +1,6 @@
 #!/usr/bin/env bash
 set -eu
 
-# initialize Django
-
-bin/init.sh
-
 # start the web server
 
 nginx

bin/start.sh

@@ -6,6 +6,7 @@ services:
       context: .
       dockerfile: appcontainer/Dockerfile
     image: caltrans/pems:web
+    command: ["-c", "bin/setup.sh && exec bin/start.sh"]
     depends_on:
       - postgres
     env_file: .env