Chore/improve-db-connectivity (#142)

* adding .env.local to gitignore, implementing better db connectivity service with better architecture

* updating prisma imports

* removing driver specifications

* formatting

* fixing tests

Author: MmagdyHafezZ

.gitignore

@@ -65,6 +65,9 @@ dev.env
 dev.op.env
 .env.merged
 .env.op.local
+.env*.local
+# mock that shouldnt change
+*/mock.jwt.cookie.auth.guard.ts
 
 # manifest files
 face_expresstion_model-weights_manifest.json

.secrets.baseline

@@ -209,6 +209,15 @@
         "verified_result": null
       }
     ],
+    "apps/api/src/database/prisma.service.spec.ts": [
+      {
+        "hashed_secret": "9d4e1e23bd5b727046a9e3b4b7db57bd8d6ee684",
+        "is_verified": false,
+        "line_number": 8,
+        "type": "Basic Auth Credentials",
+        "verified_result": null
+      }
+    ],
     "apps/web/.env.template": [
       {
         "hashed_secret": "d08f88df745fa7950b104e4a707a31cfce7b5841",

apps/api-gateway/src/auth/jwt/cookie-based/mock.jwt.cookie.auth.guard.ts

@@ -22,14 +22,15 @@ export class MockJwtCookieAuthGuard extends AuthGuard("cookie-strategy") {
     const request: RequestWithUserSession = context.switchToHttp().getRequest();
 
     request.user = {
-      userId: "magdy.hafez@ibm.com1",
-      role: UserRole.AUTHOR,
-      groupId: "autogen-faculty-v1-course-v1-IND-AI0103EN-v1",
-      assignmentId: 1,
+      userId: "dev-user",
+      role: UserRole.LEARNER,
+      groupId: "string",
+      assignmentId: 1888,
       gradingCallbackRequired: false,
       returnUrl: "https://skills.network",
       launch_presentation_locale: "en",
     };
+
     return true;
   }
 }

apps/api/src/api/Job/job-status.service.ts

@@ -1,7 +1,7 @@
 import { Injectable } from "@nestjs/common";
 import { Job } from "@prisma/client";
 import { Observable, Subject } from "rxjs";
-import { PrismaService } from "src/prisma.service";
+import { PrismaService } from "src/database/prisma.service";
 
 @Injectable()
 export class JobStatusServiceV1 {

apps/api/src/api/Job/job.module.ts

@@ -1,6 +1,6 @@
 import { HttpModule } from "@nestjs/axios";
 import { Module } from "@nestjs/common";
-import { PrismaService } from "src/prisma.service";
+import { PrismaService } from "src/database/prisma.service";
 import { JobStatusServiceV1 } from "./job-status.service";
 
 @Module({

apps/api/src/api/admin/admin.controller.spec.ts

@@ -1,13 +1,27 @@
 import { Test, TestingModule } from "@nestjs/testing";
 import { AdminVerificationService } from "../../auth/services/admin-verification.service";
-import { PrismaService } from "../../prisma.service";
+import { PrismaService } from "../../database/prisma.service";
 import { LLM_PRICING_SERVICE } from "../llm/llm.constants";
 import { AdminController } from "./admin.controller";
 import { AdminRepository } from "./admin.repository";
 import { AdminService } from "./admin.service";
 
 describe("AdminController", () => {
   let controller: AdminController;
+  const originalDatabaseUrl = process.env.DATABASE_URL;
+
+  beforeAll(() => {
+    process.env.DATABASE_URL =
+      originalDatabaseUrl ?? "postgresql://user:pass@localhost:5432/test"; // pragma: allowlist secret
+  });
+
+  afterAll(() => {
+    if (originalDatabaseUrl) {
+      process.env.DATABASE_URL = originalDatabaseUrl;
+    } else {
+      delete process.env.DATABASE_URL;
+    }
+  });
 
   beforeEach(async () => {
     const mockLlmPricingService = {

apps/api/src/api/admin/admin.module.ts

@@ -1,6 +1,6 @@
 import { Module } from "@nestjs/common";
 import { PassportModule } from "@nestjs/passport";
-import { PrismaService } from "src/prisma.service";
+import { PrismaService } from "src/database/prisma.service";
 import { AdminAuthModule } from "../../auth/admin-auth.module";
 import { AuthModule } from "../../auth/auth.module";
 import { LlmModule } from "../llm/llm.module";

apps/api/src/api/admin/admin.repository.ts

@@ -1,6 +1,6 @@
 import { Injectable } from "@nestjs/common";
 import { Assignment, AssignmentAttempt } from "@prisma/client";
-import { PrismaService } from "src/prisma.service";
+import { PrismaService } from "src/database/prisma.service";
 import { RegradingRequestDto } from "../assignment/attempt/dto/assignment-attempt/feedback.request.dto";
 
 @Injectable()

apps/api/src/api/admin/admin.service.spec.ts

@@ -1,10 +1,24 @@
 import { Test, TestingModule } from "@nestjs/testing";
-import { PrismaService } from "../../prisma.service";
+import { PrismaService } from "../../database/prisma.service";
 import { LLM_PRICING_SERVICE } from "../llm/llm.constants";
 import { AdminService } from "./admin.service";
 
 describe("AdminService", () => {
   let service: AdminService;
+  const originalDatabaseUrl = process.env.DATABASE_URL;
+
+  beforeAll(() => {
+    process.env.DATABASE_URL =
+      originalDatabaseUrl ?? "postgresql://user:pass@localhost:5432/test"; // pragma: allowlist secret
+  });
+
+  afterAll(() => {
+    if (originalDatabaseUrl) {
+      process.env.DATABASE_URL = originalDatabaseUrl;
+    } else {
+      delete process.env.DATABASE_URL;
+    }
+  });
 
   beforeEach(async () => {
     const mockLlmPricingService = {

apps/api/src/api/admin/admin.service.ts

@@ -9,7 +9,7 @@ import {
   UserRole,
   UserSession,
 } from "../../auth/interfaces/user.session.interface";
-import { PrismaService } from "../../prisma.service";
+import { PrismaService } from "../../database/prisma.service";
 import { LLMPricingService } from "../llm/core/services/llm-pricing.service";
 import { LLM_PRICING_SERVICE } from "../llm/llm.constants";
 import { AdminAddAssignmentToGroupResponseDto } from "./dto/assignment/add.assignment.to.group.response.dto";