Dev

Author: Zohair-coder

.github/workflows/functional_test.yml

@@ -81,7 +81,7 @@ jobs:
         fi
 
     - name: Reset database
-      run: docker compose run scraper python3 src/db.py create_tables
+      run: docker compose run scraper sh -c 'apk add postgresql-client && ./reset_db.bash;'
 
     - name: Run scraper again (to test cache)
       run: docker compose run scraper python3 src/main.py --db --all-colleges --ratings

docker-compose.yml

@@ -3,9 +3,11 @@ services:
   scraper:
     build: .
     environment:
+      SCHEDULER_DB_USERNAME: postgres
+      SCHEDULER_DB_DBNAME: postgres
       SCHEDULER_DB_HOSTNAME: postgres
+      SCHEDULER_DB_PORT: 5432
       SCHEDULER_DB_PG_PASSWORD: super-secret-password
-      SCHEDULER_DB_DBNAME: postgres
     volumes:
       - ./:/app
     depends_on:

reset_db.bash

@@ -1,12 +1,10 @@
-#!/bin/bash
-
 # Set variables
 username=$SCHEDULER_DB_USERNAME
 dbname=$SCHEDULER_DB_DBNAME
 hostname=$SCHEDULER_DB_HOSTNAME
 port=$SCHEDULER_DB_PORT
 filename="src/create_tables.sql"
 
-PG_PASSWORD=$SCHEDULER_DB_PG_PASSWORD
+export PGPASSWORD=$SCHEDULER_DB_PG_PASSWORD
 # Connect to PostgreSQL and execute SQL file
 psql -U "$username" -h "$hostname" -p "$port" -d "$dbname" -f "$filename"

src/db.py

@@ -172,9 +172,4 @@ def assign_grafana_user_permissions(cur: cursor):
     cmd = sql.SQL(
         "GRANT SELECT ON ALL TABLES IN SCHEMA public TO {};"
     ).format(sql.Identifier(grafana_username))
-    cur.execute(cmd)
-
-if __name__ == "__main__":
-    if "create_tables" in sys.argv:
-        cur, conn = connect_to_db()
-        create_tables(cur)
+    cur.execute(cmd)