Refactor: docker/prisma configs to actions + tests (#14)

Author: macmiller87

.env.example

@@ -1,8 +1,11 @@
 #Setup Databases Containers for Prisma/App outside
-DATABASE_URL_APP="postgresql://POSTGRES_USER_DOCKER:POSTGRES_PASSWORD_DOCKER@localhost:5432/POSTGRES_DATABASE_DOCKER?schema=public"
-DATABASE_URL_TESTS="postgresql://POSTGRES_USER_DOCKER2:POSTGRES_PASSWORD_DOCKER2@localhost:5433/POSTGRES_DATABASE_DOCKER2?schema=public"
+DATABASE_URL="postgresql://POSTGRES_USER_DOCKER:POSTGRES_PASSWORD_DOCKER@localhost:5432/POSTGRES_DATABASE_DOCKER?schema=public"
+DATABASE_URL="postgresql://POSTGRES_USER_DOCKER2:POSTGRES_PASSWORD_DOCKER2@localhost:5433/POSTGRES_DATABASE_DOCKER2?schema=public"
 
 #Setup Databases Containers for Prisma Containers inside docker
+DATABASE_URL_APP="postgresql://POSTGRES_USER_DOCKER:POSTGRES_PASSWORD_DOCKER@POSTGRES_HOST_DOCKER:5432/POSTGRES_DATABASE_DOCKER?schema=public"
+# DATABASE_URL_TESTS="postgresql://POSTGRES_USER_DOCKER2:POSTGRES_PASSWORD_DOCKER2@POSTGRES_HOST_DOCKER2:5432/POSTGRES_DATABASE_DOCKER2?schema=public"
+
 DATABASE_URL_DOCKER="postgresql://POSTGRES_USER_DOCKER:POSTGRES_PASSWORD_DOCKER@POSTGRES_HOST_DOCKER:5432/POSTGRES_DATABASE_DOCKER?schema=public"
 DATABASE_URL_DOCKER2="postgresql://POSTGRES_USER_DOCKER2:POSTGRES_PASSWORD_DOCKER2@POSTGRES_HOST_DOCKER2:5432/POSTGRES_DATABASE_DOCKER2?schema=public"
 
@@ -24,8 +27,6 @@ SECRET=
 EXPIRES_IN=
 
 # Setup Tests
-TESTS_PORT=8082
-
 INVALID_TOKEN="eyJhbGciOiJIUzI1NiIsInR5cCI74687683jshjkahdjkgbssgafsag6IkpXVCJ9.eyJkYXRhcyI6eyJ1c2VyX2lkIjoiN2NhYzQ5ODUtZjA1NC00Yzc2LThkM2YtNWY4MWE3MjA4MTRjIiwidXNlcm5hbWUiOiJNYWNtaWxsZXIiLCJlbWFpbCI6Im1hY2FtYWOjM5LU2NTkzMTA4LCJleHAiOjE3NTY1OTM3MDgsImF1ZCI6InVzZXJzIiwiaXNzIjoiQURNSU4iLCJzdWIiOiI3Y2FjNDk4NS1mMDU0LTRjNzYtOGQzZi01ZjgxYTcyMDgxNGMifQ.4C2BNK73vJ0Tsns0v_cR-f5mnf2HEFbGi5JXG5sMIlo"
 
 FAKE_TOKEN="eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJkYXRhcyI6eyJ1c2VyX2lkIjoiN2NhYzQ5ODUtZjA1NC00Yzc2LThkM2YtNWY4MWE3MjA4MTRjIiwidXNlcm5hbWUiOiJNYWNtaWxsZXIiLCJlbWFpbCI6Im1hY2FtYWdvbGZAZ21haWwuY29tIiwicGFzc3dvcmQiOiIkMmIkMDgkSkxGdmZsbnMuVktSbEFVc3o0VnZ0Lm5QdU85azZNazY1cktHS3YwcTh3MTl6T2w3UjVEelMiLCJjcmVhdGVkQXQiOiIyMDI1LTA4LTMwVDIyOjMxOjM5LjY4N1oifSwiaWF0IjoxNzU2NTkzMTA4LCJleHAiOjE3NTY1OTM3MDgsImF1ZCI6InVzZXJzIiwiaXNzIjoiQURNSU4iLCJzdWIiOiI3Y2FjNDk4NS1mMDU0LTRjNzYtOGQzZi01ZjgxYTcyMDgxNGMifQ.4C2BNK73vJ0Tsns0v_cR-f5mnf2HEFbGi5JXG5sMIle"

.github/workflows/workflow.yml

@@ -28,28 +28,22 @@ jobs:
         run: yarn install
 
       - name: "Set up Docker"
-        run: docker compose up -d
+        run: docker compose -f docker-compose.actions.yml up -d
         env:
           POSTGRES_USER: ${{ vars.POSTGRES_USER_DOCKER }}
           POSTGRES_PASSWORD: ${{ vars.POSTGRES_PASSWORD_DOCKER }}
           POSTGRES_DB: ${{ vars.POSTGRES_DATABASE_DOCKER }}
-          POSTGRES_USER_DOCKER: ${{ vars.POSTGRES_USER_DOCKER }}
-          POSTGRES_PASSWORD_DOCKER: ${{ vars.POSTGRES_PASSWORD_DOCKER }}
-          POSTGRES_DATABASE_DOCKER: ${{ vars.POSTGRES_DATABASE_DOCKER }}
-          POSTGRES_HOST_DOCKER: ${{ vars.POSTGRES_HOST_DOCKER }}
           POSTGRES_USER_DOCKER2: ${{ vars.POSTGRES_USER_DOCKER2 }}
           POSTGRES_PASSWORD_DOCKER2: ${{ vars.POSTGRES_PASSWORD_DOCKER2 }}
           POSTGRES_DATABASE_DOCKER2: ${{ vars.POSTGRES_DATABASE_DOCKER2 }}
           POSTGRES_HOST_DOCKER2: ${{ vars.POSTGRES_HOST_DOCKER2 }}
-          DATABASE_URL_DOCKER: ${{ vars.DATABASE_URL_DOCKER }}
           DATABASE_URL_DOCKER2: ${{ vars.DATABASE_URL_DOCKER2 }}
-          DATABASE_URL_APP:  ${{ vars.DATABASE_URL_APP }}
-          DATABASE_URL_TESTS: ${{ vars.DATABASE_URL_TESTS }}
+          DATABASE_URL: ${{ vars.DATABASE_URL }}
 
       - name: Set up Prisma
-        run: yarn setup:prisma_tests
+        run: yarn setup:prisma
         env:
-          DATABASE_URL_TESTS: ${{ vars.DATABASE_URL_TESTS }}
+          DATABASE_URL: ${{ vars.DATABASE_URL_TESTS }}
 
       - name: "Run API and Tests"
         run: |
@@ -63,10 +57,9 @@ jobs:
 
           yarn test:actions
         env:
-          DATABASE_URL_TESTS: ${{ vars.DATABASE_URL_TESTS }}
+          DATABASE_URL: ${{ vars.DATABASE_URL_TESTS }}
           HOST: ${{ vars.HOST }}
           PORT: ${{ vars.PORT }}
-          TESTS_PORT: ${{ vars.TESTS_PORT }}
           SECRET: ${{ secrets.SECRET }}
           EXPIRES_IN: ${{ vars.EXPIRES_IN }}
           FAKE_TOKEN: ${{ vars.FAKE_TOKEN }}

docker-compose.actions.yml

@@ -0,0 +1,38 @@
+services:
+
+  postgres_db_tests:
+    image: postgres
+    container_name: database_tests
+    user: postgres
+    restart: always
+    ports:
+      - "5433:5432"
+    environment:
+      - POSTGRES_USER=${POSTGRES_USER_DOCKER2}
+      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD_DOCKER2}
+      - POSTGRES_DB=${POSTGRES_DATABASE_DOCKER2}
+    healthcheck:
+      test: [ "CMD", "pg_isready" ]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+    networks:
+      - prisma-network
+
+  prisma_tests:
+    build:
+      dockerfile: Dockerfile
+    container_name: prisma_tests
+    environment:
+      - DATABASE_URL=${DATABASE_URL_DOCKER2}
+    command: yarn setup:prisma
+    depends_on:
+      postgres_db_tests:
+        condition: service_healthy
+    networks:
+      - prisma-network
+
+networks:
+  prisma-network:
+    name: prisma-network
+    

docker-compose.yml

@@ -10,7 +10,7 @@ services:
     environment:
       - POSTGRES_USER=${POSTGRES_USER_DOCKER}
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD_DOCKER}
-      - POSTGRES_DB=${POSTGRES_DATABASE_DOCKER}
+      - POSTGRES_DB=${POSTGRES_DATABASE_DOCKER}  
     healthcheck:
       test: [ "CMD", "pg_isready" ]
       interval: 10s
@@ -41,9 +41,9 @@ services:
   prisma_app:
     build: .
     container_name: prisma_app
-    environment:
-      - DATABASE_URL_APP=${DATABASE_URL_DOCKER}
-    command: yarn setup:prisma_app
+    environment:   
+      - DATABASE_URL=${DATABASE_URL_DOCKER}
+    command: yarn setup:prisma
     depends_on:
       postgres_db_app:
         condition: service_healthy
@@ -54,8 +54,8 @@ services:
     build: .
     container_name: prisma_tests
     environment:
-      - DATABASE_URL_TESTS=${DATABASE_URL_DOCKER2}
-    command: yarn setup:prisma_tests
+      - DATABASE_URL=${DATABASE_URL_DOCKER2}
+    command: yarn setup:prisma
     depends_on:
       postgres_db_tests:
         condition: service_healthy

package.json

@@ -5,15 +5,14 @@
   "main": "src/server.js",
   "type": "module",
   "scripts": {
-    "dev": "npx prisma generate --schema prisma/schema2.prisma && node --watch --env-file=.env src/server.js",
+    "dev": "node --watch --env-file=.env src/server.js",
     "dev:actions": "node --watch src/server.js",
     "dev:debug": "node --inspect --env-file=.env src/server.js",
     "test": "node --test --experimental-test-coverage --env-file=.env",
     "test:actions": "node --test --experimental-test-coverage",
-    "dc:up": "docker compose up -d && docker compose logs -f prisma_app",
+    "dc:up": "docker compose up -d && docker compose logs -f prisma_tests",
     "dc:down": "docker compose down --volumes --remove-orphans",
-    "setup:prisma_app": "npx prisma generate --schema prisma/schema.prisma && npx prisma migrate deploy --schema prisma/schema.prisma && npx prisma db push --schema prisma/schema.prisma",
-    "setup:prisma_tests": "npx prisma generate --schema prisma/schema2.prisma && npx prisma migrate deploy --schema prisma/schema2.prisma && npx prisma db push --schema prisma/schema2.prisma"
+    "setup:prisma": "npx prisma migrate deploy && npx prisma db push"
   },
   "repository": {
     "type": "git",

prisma/migrations/20250824202107_tables_app/migration.sql

@@ -0,0 +1,25 @@
+-- CreateTable
+CREATE TABLE "public"."Users" (
+    "user_id" TEXT NOT NULL,
+    "username" TEXT NOT NULL,
+    "email" TEXT NOT NULL,
+    "password" TEXT NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+    CONSTRAINT "Users_pkey" PRIMARY KEY ("user_id")
+);
+
+-- CreateTable
+CREATE TABLE "public"."UserTokens" (
+    "id" TEXT NOT NULL,
+    "user_id" TEXT NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+    CONSTRAINT "UserTokens_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Users_email_key" ON "public"."Users"("email");
+
+-- AddForeignKey
+ALTER TABLE "public"."UserTokens" ADD CONSTRAINT "UserTokens_user_id_fkey" FOREIGN KEY ("user_id") REFERENCES "public"."Users"("user_id") ON DELETE CASCADE ON UPDATE CASCADE;

prisma/migrations/20250907184148_tables_tests/migration.sql

@@ -4,7 +4,7 @@ generator client {
 
 datasource db {
   provider = "postgresql"
-  url      = env("DATABASE_URL_APP")
+  url      = env("DATABASE_URL")
 }
 
 model Users {