Merge pull request #155 from Code-Hammers/CHE-197/subtask/Add-PG-to-BE-Test-Setup

[CHE-197] Add PG to BE Test Setup

Author: brok3turtl3

docker-compose-test-solo.yml

@@ -11,18 +11,32 @@ services:
       - client_node_modules:/usr/src/app/client/node_modules
     depends_on:
       - ch-mongo-test
+      - ch-pg-test
     environment:
-      - JWT_SECRET=${JWT_SECRET}
+      - NODE_ENV=test
+      - JWT_SECRET=testJwtSecret
       - MONGO_URI=mongodb://ch-mongo-test:27017/ch-testdb
       - POSTGRES_USER=postgres
-      - POSTGRES_DB=ch-dev-database
-      - POSTGRES_PASSWORD=ch-dev
+      - POSTGRES_DB=ch-test-database
+      - POSTGRES_PASSWORD=ch-test
       # suppress aws sdk v2 deprecation warning
       - AWS_SDK_JS_SUPPRESS_MAINTENANCE_MODE_MESSAGE=1;
       - TEST_CMD=${TEST_CMD}
       - TEST_FILE=${TEST_FILE}
     command: npm run ${TEST_CMD} ${TEST_FILE}
 
+  ch-pg-test:
+    image: postgres:16.3
+    container_name: ch-pg-test
+    environment:
+      - POSTGRES_USER=postgres
+      - POSTGRES_DB=ch-test-database
+      - POSTGRES_PASSWORD=ch-test
+    volumes:
+      - ./scripts/db/postgres/sql_db_init_test.sql:/docker-entrypoint-initdb.d/sql_db_init_test.sql
+    ports:
+      - '5432:5432'
+
   ch-mongo-test:
     image: mongo
     container_name: ch-mongo-test

docker-compose-test.yml

@@ -12,16 +12,30 @@ services:
       - client_node_modules:/usr/src/app/client/node_modules
     depends_on:
       - ch-mongo-test
+      - ch-pg-test
     environment:
-      - JWT_SECRET=${JWT_SECRET}
+      - NODE_ENV=test
+      - JWT_SECRET=testJwtSecret
       - MONGO_URI=mongodb://ch-mongo-test:27017/ch-testdb
       - POSTGRES_USER=postgres
-      - POSTGRES_DB=ch-dev-database
-      - POSTGRES_PASSWORD=ch-dev
+      - POSTGRES_DB=ch-test-database
+      - POSTGRES_PASSWORD=ch-test
       # suppress aws sdk v2 deprecation warning
       - AWS_SDK_JS_SUPPRESS_MAINTENANCE_MODE_MESSAGE=1;
     command: npm run test:all
 
+  ch-pg-test:
+    image: postgres:16.3
+    container_name: ch-pg-test
+    environment:
+      - POSTGRES_USER=postgres
+      - POSTGRES_DB=ch-test-database
+      - POSTGRES_PASSWORD=ch-test
+    volumes:
+      - ./scripts/db/postgres/sql_db_init_test.sql:/docker-entrypoint-initdb.d/sql_db_init_test.sql
+    ports:
+      - '5432:5432'
+
   ch-mongo-test:
     image: mongo
     container_name: ch-mongo-test

scripts/db/postgres/sql_db_init_test.sql

@@ -0,0 +1,75 @@
+-- DROP EXISTING TABLES
+DROP TABLE IF EXISTS follow_ups;
+DROP TABLE IF EXISTS applications;
+DROP TABLE IF EXISTS jobs;
+DROP TABLE IF EXISTS statuses;
+DROP TABLE IF EXISTS follow_up_types;
+
+-- CREATE JOBS TABLE
+CREATE TABLE jobs (
+    id SERIAL PRIMARY KEY,
+    title VARCHAR(255) NOT NULL,
+    company VARCHAR(255) NOT NULL,
+    location VARCHAR(255),
+    description TEXT,
+    url VARCHAR(255),
+    created_at TIMESTAMPTZ DEFAULT NOW()
+);
+
+-- CREATE STATUSES TABLE
+CREATE TABLE statuses (
+    id SERIAL PRIMARY KEY,
+    name VARCHAR(255) NOT NULL
+);
+
+-- INSERT DEFAULT STATUSES
+INSERT INTO statuses (name) VALUES
+    ('Applied'),
+    ('Phone Screen'),
+    ('Interviewing'),
+    ('Offer Received'),
+    ('Rejected'),
+    ('Withdrawn');
+
+-- CREATE FOLLOW-UP TYPES TABLE
+CREATE TABLE follow_up_types (
+    id SERIAL PRIMARY KEY,
+    name VARCHAR(255) NOT NULL
+);
+
+-- INSERT DEFAULT FOLLOW-UP TYPES
+INSERT INTO follow_up_types (name) VALUES
+    ('After Apply'),
+    ('After Phone Screen'),
+    ('After Interview'),
+    ('After Technical Interview'),
+    ('After Offer Received'),
+    ('After Rejection'),
+    ('After Withdrawal');
+
+-- CREATE APPLICATIONS TABLE
+CREATE TABLE applications (
+    id SERIAL PRIMARY KEY,
+    job_id INT NOT NULL,
+    status_id INT NOT NULL,
+    user_id VARCHAR(255) NOT NULL,
+    quick_apply BOOLEAN NOT NULL,
+    date_applied TIMESTAMPTZ DEFAULT NOW(),
+    general_notes TEXT,
+    last_updated TIMESTAMPTZ DEFAULT NOW(),
+    notification_period INT DEFAULT 3,
+    notifications_paused BOOLEAN DEFAULT FALSE,
+    FOREIGN KEY (job_id) REFERENCES jobs(id),
+    FOREIGN KEY (status_id) REFERENCES statuses(id)
+);
+
+-- CREATE FOLLOW-UPS TABLE
+CREATE TABLE follow_ups (
+    id SERIAL PRIMARY KEY,
+    application_id INT NOT NULL,
+    follow_up_date TIMESTAMPTZ DEFAULT NOW(),
+    follow_up_type_id INT NOT NULL,
+    notes TEXT,
+    FOREIGN KEY (application_id) REFERENCES applications(id),
+    FOREIGN KEY (follow_up_type_id) REFERENCES follow_up_types(id)
+);

server/config/sql-db.ts

@@ -1,11 +1,8 @@
 import { Pool } from 'pg';
-import dotenv from 'dotenv';
-
-dotenv.config();
 
 const pool = new Pool({
   user: process.env.POSTGRES_USER,
-  host: 'postgres',
+  host: process.env.NODE_ENV === 'test' ? 'ch-pg-test' : 'postgres',
   database: process.env.POSTGRES_DB,
   password: process.env.POSTGRES_PASSWORD,
   port: 5432,

server/test/setup.ts

@@ -2,6 +2,7 @@ import mongoose from 'mongoose';
 import app from '../app';
 import request from 'supertest';
 import User from '../models/userModel';
+import { pool } from '../config/sql-db';
 
 declare global {
   function login(): Promise<string[]>;
@@ -11,7 +12,6 @@ const testUserEmail = '[email protected]';
 const testUserPassword = 'jackieTreehorn';
 
 beforeAll(async () => {
-  process.env.JWT_SECRET = 'asdfasdfasdf';
   await mongoose.connect('mongodb://ch-mongo-test:27017/ch-testdb', {});
 });
 
@@ -21,10 +21,28 @@ beforeEach(async () => {
   for (const collection of collections) {
     await collection.deleteMany({});
   }
+
+  await pool.query(`
+    DO
+    $$
+    DECLARE
+        table_name text;
+    BEGIN
+        FOR table_name IN
+            SELECT tablename
+            FROM pg_tables
+            WHERE schemaname = 'public'
+        LOOP
+            EXECUTE format('TRUNCATE TABLE %I CASCADE;', table_name);
+        END LOOP;
+    END
+    $$;
+   `);
 });
 
 afterAll(async () => {
   await mongoose.connection.close();
+  pool.end();
 });
 
 global.login = async () => {