fix: missing bits

Author: ncrmro

apps/database/mig_data.sh

@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+echo "Seeding the database..."
+
+export DATABASE_DIR=${DATABASE_DIR:-..}
+
+#retry() {
+#  max_attempts="$1"
+#  shift
+#  seconds="$1"
+#  shift
+#  cmd="$@"
+#  attempt_num=1
+#
+#  until $cmd; do
+#    if [ $attempt_num -eq $max_attempts ]; then
+#      echo "Attempt $attempt_num failed and there are no more attempts left!"
+#      return 1
+#    else
+#      echo "Attempt $attempt_num failed! Trying again in $seconds seconds..."
+#      attempt_num=$(expr "$attempt_num" + 1)
+#      sleep "$seconds"
+#    fi
+#  done
+#}
+#retry 10 1 psql $DATABASE_URL --dbname=$DBNAME -c '\l' >/dev/null
+
+echo >&2 "$(date +%Y%m%dt%H%M%S) Postgres is up - executing command"
+
+for i in ./test_data/*.sql; do # Whitespace-safe but not recursive.
+  echo "$i"
+  yarn graphile-migrate run $i
+done

apps/database/migrations/afterReset.sql

@@ -1,37 +1,12 @@
 BEGIN;
-
-DO
-$$
-    BEGIN
-        CREATE USER :DATABASE_AUTHENTICATOR WITH PASSWORD ':DATABASE_AUTHENTICATOR_PASSWORD';
-    EXCEPTION
-        WHEN DUPLICATE_OBJECT THEN
-            RAISE NOTICE 'not creating authenticator role -- it already exists';
-    END
-$$;
-
-
-DO
-$$
-    BEGIN
-        CREATE ROLE :DATABASE_VISITOR;
-    EXCEPTION
-        WHEN DUPLICATE_OBJECT THEN
-            RAISE NOTICE 'not creating viewer role -- it already exists';
-    END
-$$;
-
 GRANT CONNECT ON DATABASE :DATABASE_NAME TO :DATABASE_OWNER;
 GRANT CONNECT ON DATABASE :DATABASE_NAME TO :DATABASE_AUTHENTICATOR;
 GRANT ALL ON DATABASE :DATABASE_NAME TO :DATABASE_OWNER;
-ALTER SCHEMA public OWNER TO :DATABASE_OWNER;
+-- ALTER SCHEMA public OWNER TO :DATABASE_OWNER;
 
 -- Some extensions require superuser privileges, so we create them before migration time.
--- CREATE EXTENSION IF NOT EXISTS plpgsql WITH SCHEMA pg_catalog;
--- CREATE EXTENSION IF NOT EXISTS "uuid-ossp" WITH SCHEMA public;
 CREATE EXTENSION IF NOT EXISTS citext WITH SCHEMA public;
 CREATE EXTENSION IF NOT EXISTS pgcrypto WITH SCHEMA public;
 CREATE EXTENSION IF NOT EXISTS unaccent WITH SCHEMA public;
-CREATE EXTENSION IF NOT EXISTS "pg_trgm" WITH SCHEMA public;
-
+CREATE EXTENSION IF NOT EXISTS pg_trgm WITH SCHEMA public;
 COMMIT;

apps/database/test_data/00-users.sql

@@ -0,0 +1,27 @@
+-- Manually create the test user so JWT works across database resets
+INSERT INTO app_public.user (id, username, name, is_verified)
+VALUES ('da221b05-a99c-485d-a278-015e7baaeda2', 'testuser1', 'Test User', TRUE);
+UPDATE app_private.user_secrets us
+        SET password_hash = crypt('test123', gen_salt('bf'))
+    WHERE user_id = 'da221b05-a99c-485d-a278-015e7baaeda2';
+
+INSERT INTO app_public.user (id, username, name, is_verified)
+VALUES ('23e675b1-d581-4d84-96a9-8f73dbee72ad', 'ncrmro', 'Nicholas Romero', TRUE);
+UPDATE app_private.user_secrets us
+        SET password_hash = crypt('test123', gen_salt('bf'))
+    WHERE user_id = '23e675b1-d581-4d84-96a9-8f73dbee72ad';
+
+SELECT *
+FROM app_public.register_user(
+        username := 'testuser2', password := 'test123'
+    );
+
+SELECT *
+FROM app_public.register_user(
+        username := 'nopartorsystemuser', password := 'test123'
+    );
+
+SELECT *
+FROM app_public.register_user(
+        username := 'noemailuser', password := 'test123'
+    );

docker-compose.yml

@@ -3,10 +3,6 @@ version: "3.7"
 services:
   db:
     image: postgres:13.1-alpine
-    environment:
-      POSTGRES_USER: $DATABASE_OWNER
-      POSTGRES_PASSWORD: $DATABASE_OWNER_PASSWORD
-      POSTGRES_DB: $DATABASE_NAME
     env_file:
       - .env
     volumes: