From a91880b9f51263c9110789280b4fded00da14ed3 Mon Sep 17 00:00:00 2001
From: rajdip-b <agentR47@gmail.com>
Date: Fri, 9 Feb 2024 20:45:07 +0530
Subject: [PATCH] final touches

---
 .env.example            |  3 +--
 .husky/pre-commit       |  5 +----
 docker-compose-dev.yml  | 13 -------------
 docker-compose-test.yml | 21 +++++++++++++++++++++
 docker-compose.yml      | 22 +++++++++++++---------
 package.json            |  5 +++--
 6 files changed, 39 insertions(+), 30 deletions(-)
 delete mode 100644 docker-compose-dev.yml
 create mode 100644 docker-compose-test.yml

diff --git a/.env.example b/.env.example
index 9dc7e2a3c..44b6e2bb2 100644
--- a/.env.example
+++ b/.env.example
@@ -1,11 +1,10 @@
-DATABASE_URL=postgres://postgres:password@127.0.0.1:5432/keyshade
+DATABASE_URL=postgresql://postgres:password@127.0.0.1:5432/keyshade_db
 ADMIN_EMAIL=your@email.com
 
 GITHUB_CLIENT_ID= 
 GITHUB_CLIENT_SECRET= 
 GITHUB_CALLBACK_URL=
 
-
 SMTP_HOST=
 SMTP_PORT=
 SMTP_EMAIL_ADDRESS=
diff --git a/.husky/pre-commit b/.husky/pre-commit
index 0b4d771ca..d3fe40860 100755
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -1,7 +1,4 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"
 
-pnpm run lint:fix && pnpm run prettier:fix && pnpm run test:api
-docker compose up -d
-pnpm run e2e:api
-docker compose down
\ No newline at end of file
+pnpm run lint:fix && pnpm run prettier:fix && pnpm run test:api && pnpm run e2e:api
\ No newline at end of file
diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
deleted file mode 100644
index 3f302a287..000000000
--- a/docker-compose-dev.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-version: '3.9'
-
-services:
-  dev-db:
-    image: postgres:13
-    ports:
-      - '5432:5432'
-    environment:
-      POSTGRES_USER: postgres
-      POSTGRES_PASSWORD: password
-      POSTGRES_DB: keyshade_db
-    volumes:
-      - ./data:/var/lib/postgresql/data
\ No newline at end of file
diff --git a/docker-compose-test.yml b/docker-compose-test.yml
new file mode 100644
index 000000000..4c290a385
--- /dev/null
+++ b/docker-compose-test.yml
@@ -0,0 +1,21 @@
+# Set the version of docker compose to use
+version: '3.9'
+
+# The containers that compose the project
+services:
+  db:
+    image: postgres:13
+    restart: always
+    container_name: integration-tests-prisma
+    ports:
+      - '5432:5432'
+    environment:
+      POSTGRES_USER: prisma
+      POSTGRES_PASSWORD: prisma
+      POSTGRES_DB: tests
+    networks:
+      - keyshade-test
+
+networks:
+  keyshade-test:
+    driver: bridge
diff --git a/docker-compose.yml b/docker-compose.yml
index 4cdab6b5e..3c57e05a1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,15 +1,19 @@
-# Set the version of docker compose to use
 version: '3.9'
 
-# The containers that compose the project
 services:
-  db:
+  dev-db:
     image: postgres:13
-    restart: always
-    container_name: integration-tests-prisma
     ports:
-      - '5433:5432'
+      - '5432:5432'
     environment:
-      POSTGRES_USER: prisma
-      POSTGRES_PASSWORD: prisma
-      POSTGRES_DB: tests
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: password
+      POSTGRES_DB: keyshade_db
+    volumes:
+      - ./data:/var/lib/postgresql/data
+    networks:
+      - keyshade-dev
+
+networks:
+  keyshade-dev:
+    driver: bridge
diff --git a/package.json b/package.json
index a38d06a3c..f7ef3047a 100644
--- a/package.json
+++ b/package.json
@@ -100,8 +100,9 @@
     "build:workspace": "nx run workspace:build",
     "test": "nx run-many -t test --parallel",
     "test:api": "nx run api:test",
-    "e2e:api:prepare": "NODE_ENV='e2e' DATABASE_URL='postgresql://prisma:prisma@localhost:5433/tests' pnpm run db:deploy-migrations",
-    "e2e:api": "pnpm run e2e:api:prepare && NODE_ENV='e2e' DATABASE_URL='postgresql://prisma:prisma@localhost:5433/tests' nx run api:test:e2e -- --coverage --coverageDirectory=coverage-e2e/api --coverageReporters=json",
+    "e2e:api:prepare": "docker compose down && docker compose -f docker-compose-test.yml up -d && NODE_ENV='e2e' DATABASE_URL='postgresql://prisma:prisma@localhost:5432/tests' pnpm run db:deploy-migrations",
+    "e2e:api": "pnpm run e2e:api:prepare && NODE_ENV='e2e' DATABASE_URL='postgresql://prisma:prisma@localhost:5432/tests' nx run api:test:e2e -- --coverage --coverageDirectory=coverage-e2e/api --coverageReporters=json && pnpm run e2e:api:teardown",
+    "e2e:api:teardown": "docker compose -f docker-compose-test.yml down",
     "test:web": "nx run web:test",
     "test:workspace": "nx run workspace:test",
     "start:web": "nx run web:serve --configuration=production",