Merge pull request #64 from call-0f-code/db-issue-fix

Sherin-2711 · web-flow · commit 3666d402f96b · 2026-01-05T16:00:11.000+05:30
updated prisma with new prisma config
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -7,6 +7,8 @@ jobs:
   test:
     if: github.base_ref == 'main'
     runs-on: ubuntu-latest
+    env:
+      DATABASE_URL: ${{ secrets.DATABASE_URL }}
 
     steps:
       - name: Checkout repository
diff --git a/bun.lock b/bun.lock
diff --git a/package.json b/package.json
@@ -42,29 +42,32 @@
     "jest-mock-extended": "^4.0.0",
     "lint-staged": "^16.1.2",
     "prettier": "^3.6.2",
-    "prisma": "^6.11.1",
+    "prisma": "^7.2.0",
     "ts-node-dev": "^2.0.0",
     "typescript": "^5.8.3",
     "typescript-eslint": "^8.36.0"
   },
   "dependencies": {
-    "@prisma/client": "^6.11.1",
+    "@prisma/adapter-pg": "^7.2.0",
+    "@prisma/client": "^7.2.0",
     "@supabase/supabase-js": "^2.50.5",
     "@types/cors": "^2.8.19",
     "@types/express": "^5.0.3",
     "@types/morgan": "^1.9.10",
     "@types/multer": "^2.0.0",
     "@types/node": "^24.0.13",
+    "@types/pg": "^8.16.0",
     "@types/uuid": "^10.0.0",
     "apidoc": "^1.2.0",
     "body-parser": "^2.2.0",
     "cors": "^2.8.5",
-    "dotenv": "^17.2.0",
+    "dotenv": "^17.2.3",
     "express": "^5.1.0",
     "husky": "^9.1.7",
     "jest": "^30.0.4",
     "morgan": "^1.10.1",
     "multer": "^2.0.1",
+    "pg": "^8.16.3",
     "ts-jest": "^29.4.0",
     "ts-node": "^10.9.2",
     "uuid": "^11.1.0",
diff --git a/prisma.config.ts b/prisma.config.ts
@@ -0,0 +1,17 @@
+import dotenv from "dotenv";
+import path from "node:path";
+import { defineConfig,env } from "prisma/config";
+
+dotenv.config({
+  path: "./.env",
+});
+
+export default defineConfig({
+  schema: path.join("prisma", "schema.prisma"),
+  migrations: {
+    path: path.join("prisma", "migrations"),
+  },
+  datasource: {
+    url: env("DATABASE_URL"),
+  },
+});
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
@@ -2,14 +2,12 @@
 // learn more about it in the docs: https://pris.ly/d/prisma-schema
 
 generator client {
-  provider = "prisma-client-js"
+  provider = "prisma-client"
   output   = "../src/generated/prisma"
 }
 
 datasource db {
   provider  = "postgresql"
-  url       = env("DATABASE_URL")
-  directUrl = env("DIRECT_URL")
 }
 
 model Member {
diff --git a/src/db/client.ts b/src/db/client.ts
@@ -1,6 +1,11 @@
-import { PrismaClient } from "../generated/prisma";
+import { PrismaPg } from "@prisma/adapter-pg";
+import { PrismaClient } from "../generated/prisma/client";
+export * from "../generated/prisma/client";
 
-const prisma = new PrismaClient();
+const adapter = new PrismaPg({
+  connectionString: process.env.DATABASE_URL,
+});
 
-export { prisma };
+const prisma = new PrismaClient({ adapter });
 
+export default prisma;
diff --git a/src/services/achievement.service.ts b/src/services/achievement.service.ts
@@ -1,4 +1,4 @@
-import { prisma } from "../db/client";
+import  prisma  from "../db/client";
 
 export const getAchievements = async () => {
   return await prisma.achievement.findMany({
diff --git a/src/services/interview.service.ts b/src/services/interview.service.ts
@@ -1,4 +1,5 @@
-import { prisma } from "../db/client"
+import prisma from "../db/client";
+
 
 export const getInterviews = async (page: number = 1, limit: number = 10, verdict : string = "All") => {
   const skip = (page - 1) * limit;
diff --git a/src/services/member.service.ts b/src/services/member.service.ts
@@ -1,4 +1,4 @@
-import { prisma } from "../db/client";
+import prisma  from "../db/client";
 import { ApiError } from "../utils/apiError";
 
 export const getUserByEmail = async(email: string) => {
diff --git a/src/services/progress.service.ts b/src/services/progress.service.ts
@@ -1,4 +1,4 @@
-import { prisma } from "../db/client";
+import  prisma  from "../db/client";
 
 export const getCompletedQuestion = async (memeberId: string) => {
   return await prisma.completedQuestion.findMany({
diff --git a/src/services/project.service.ts b/src/services/project.service.ts
@@ -1,4 +1,4 @@
-import { prisma } from "../db/client";
+import  prisma  from "../db/client";
 
 export const getProjects = async () => {
   return await prisma.project.findMany({
diff --git a/src/services/question.service.ts b/src/services/question.service.ts
@@ -1,5 +1,5 @@
-import { prisma } from "../db/client";
-import { Difficulty } from "../generated/prisma";
+import  prisma  from "../db/client";
+import { Difficulty } from "../generated/prisma/enums";
 
 export const getQuestionByTopicId = async (TopicId: number) => {
   return await prisma.question.findMany({
diff --git a/src/services/topic.service.ts b/src/services/topic.service.ts
@@ -1,4 +1,4 @@
-import { prisma } from "../db/client";
+import  prisma  from "../db/client";
 
 export const getTopics = async () => {
   return await prisma.topic.findMany();
diff --git a/tests/Interview.test.ts b/tests/Interview.test.ts
@@ -1,7 +1,7 @@
 import { getInterviews, getInterviewById, createInterview, updateInterviewById, deleteInterviewById} from '../src/controllers/interview.controller';
 import * as interviewService from '../src/services/interview.service';
 import { ApiError } from '../src/utils/apiError';
-import { Verdict } from '../src/generated/prisma';
+import { Verdict } from '../src/generated/prisma/enums';
 
 describe('getInterviews', () => {
   it('should return 200 and all interviews', async () => {
diff --git a/tests/Progress.test.ts b/tests/Progress.test.ts
@@ -4,7 +4,7 @@ import {
 } from "../src/controllers/progress.controller";
 import * as progressServices from "../src/services/progress.service";
 import { Request, Response } from "express";
-import { CompletedQuestion } from "../src/generated/prisma";
+import { CompletedQuestion } from "../src/generated/prisma/client";
 import { ApiError } from "../src/utils/apiError";
 
 beforeEach(() => {
diff --git a/tests/Question.test.ts b/tests/Question.test.ts
@@ -7,7 +7,7 @@ import {
   updateQuestion,
   deleteQuestion,
 } from "../src/controllers/question.controller";
-import { Question } from "../src/generated/prisma";
+import { Question } from "../src/generated/prisma/client";
 import { ApiError } from "../src/utils/apiError";
 
 beforeEach(() => {
diff --git a/tests/Topics.test.ts b/tests/Topics.test.ts
@@ -6,7 +6,7 @@ import {
 } from "../src/controllers/topic.controller";
 import * as topicServices from "../src/services/topic.service";
 import { ApiError } from "../src/utils/apiError";
-import { Topic } from "../src/generated/prisma";
+import { Topic } from "../src/generated/prisma/browser";
 
 beforeEach(() => {
   jest.clearAllMocks();

Original file line number	Diff line number	Diff line change
`@@ -2,14 +2,12 @@`
`2`	`2`	`// learn more about it in the docs: https://pris.ly/d/prisma-schema`
`3`	`3`
`4`	`4`	`generator client {`
`5`		`- provider = "prisma-client-js"`
	`5`	`+ provider = "prisma-client"`
`6`	`6`	`output = "../src/generated/prisma"`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`datasource db {`
`10`	`10`	`provider = "postgresql"`
`11`		`- url = env("DATABASE_URL")`
`12`		`- directUrl = env("DIRECT_URL")`
`13`	`11`	`}`
`14`	`12`
`15`	`13`	`model Member {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { prisma } from "../db/client";`
	`1`	`+import prisma from "../db/client";`
`2`	`2`
`3`	`3`	`export const getAchievements = async () => {`
`4`	`4`	`return await prisma.achievement.findMany({`