Chore/improve-db-connectivity

.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: "[email protected]",
-      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";

apps/api/src/api/assignment/attempt/attempt.service.ts

@@ -10,7 +10,7 @@
 } from "@nestjs/common";
 import {
   Assignment,
   CorrectAnswerVisibility,
   Question,
   QuestionType,
   QuestionVariant,
@@ -21,8 +21,8 @@
 import { JsonValue } from "@prisma/client/runtime/library";
 import { LearnerFileUpload } from "src/api/attempt/common/interfaces/attempt.interface";
 import {
   SuccessPageDataDto,
   SuccessPageQuestionDto,
 } from "src/api/attempt/dto/success-page-data.dto";
 import { LlmFacadeService } from "src/api/llm/llm-facade.service";
 import { PresentationQuestionEvaluateModel } from "src/api/llm/model/presentation.question.evaluate.model";
@@ -32,7 +32,7 @@
   UserSession,
   UserSessionRequest,
 } from "../../../auth/interfaces/user.session.interface";
-import { PrismaService } from "../../../prisma.service";
+import { PrismaService } from "../../../database/prisma.service";
 import { QuestionAnswerContext } from "../../llm/model/base.question.evaluate.model";
 import { FileUploadQuestionEvaluateModel } from "../../llm/model/file.based.question.evaluate.model";
 import { TextBasedQuestionEvaluateModel } from "../../llm/model/text.based.question.evaluate.model";

apps/api/src/api/assignment/attempt/guards/assignment.attempt.access.control.guard.ts

@@ -9,7 +9,7 @@ import {
   UserRole,
   UserSessionRequest,
 } from "../../../../auth/interfaces/user.session.interface";
-import { PrismaService } from "../../../../prisma.service";
+import { PrismaService } from "../../../../database/prisma.service";
 
 @Injectable()
 export class AssignmentAttemptAccessControlGuard implements CanActivate {

apps/api/src/api/assignment/guards/assignment.access.control.guard.ts

@@ -7,7 +7,7 @@ import {
 } from "@nestjs/common";
 import { Reflector } from "@nestjs/core";
 import { UserSessionRequest } from "src/auth/interfaces/user.session.interface";
-import { PrismaService } from "../../../prisma.service";
+import { PrismaService } from "../../../database/prisma.service";
 
 @Injectable()
 export class AssignmentAccessControlGuard implements CanActivate {

apps/api/src/api/assignment/question/guards/assignment.question.access.control.guard.ts

@@ -6,7 +6,7 @@ import {
 } from "@nestjs/common";
 import { Reflector } from "@nestjs/core";
 import { UserSessionRequest } from "src/auth/interfaces/user.session.interface";
-import { PrismaService } from "../../../../prisma.service";
+import { PrismaService } from "../../../../database/prisma.service";
 
 @Injectable()
 export class AssignmentQuestionAccessControlGuard implements CanActivate {

apps/api/src/api/assignment/question/question.service.ts

@@ -10,7 +10,7 @@ import { Prisma } from "@prisma/client";
 import { WINSTON_MODULE_PROVIDER } from "nest-winston";
 import { LlmFacadeService } from "src/api/llm/llm-facade.service";
 import { Logger } from "winston";
-import { PrismaService } from "../../../prisma.service";
+import { PrismaService } from "../../../database/prisma.service";
 import { LearnerLiveRecordingFeedback } from "../attempt/dto/assignment-attempt/types";
 import {
   Choice,

apps/api/src/api/assignment/v1/services/assignment.service.ts

@@ -22,7 +22,7 @@ import {
   UserRole,
   UserSession,
 } from "src/auth/interfaces/user.session.interface";
-import { PrismaService } from "src/prisma.service";
+import { PrismaService } from "src/database/prisma.service";
 import { Logger } from "winston";
 import {
   getAllLanguageCodes,

apps/api/src/api/assignment/v2/controllers/assignment.controller.ts

@@ -37,7 +37,7 @@
   UserSessionRequest,
 } from "src/auth/interfaces/user.session.interface";
 import { Roles } from "src/auth/role/roles.global.guard";
-import { PrismaService } from "src/prisma.service";
+import { PrismaService } from "src/database/prisma.service";
 import { Logger } from "winston";
 import { ReportRequestDTO } from "../../attempt/dto/assignment-attempt/post.assignment.report.dto";
 import { ASSIGNMENT_SCHEMA_URL } from "../../constants";
@@ -61,7 +61,7 @@
 import { QuestionService } from "../services/question.service";
 import { ReportService } from "../services/report.repository";
 
 interface AdminSessionRequest extends Request {
   adminSession: {
     email: string;
     role: UserRole;

apps/api/src/api/assignment/v2/modules/assignment.module.ts

@@ -3,7 +3,7 @@ import { Module } from "@nestjs/common";
 import { AdminService } from "src/api/admin/admin.service";
 import { LlmModule } from "src/api/llm/llm.module";
 import { AdminVerificationService } from "src/auth/services/admin-verification.service";
-import { PrismaService } from "src/prisma.service";
+import { PrismaService } from "src/database/prisma.service";
 import { AssignmentControllerV2 } from "../controllers/assignment.controller";
 import { DraftManagementController } from "../controllers/draft-management.controller";
 import { VersionManagementController } from "../controllers/version-management.controller";

apps/api/src/api/assignment/v2/repositories/assignment.repository.ts

@@ -3,8 +3,8 @@ import { Assignment, Question, QuestionVariant } from "@prisma/client";
 import {
   UserRole,
   UserSession,
-} from "../../../../auth/interfaces/user.session.interface";
-import { PrismaService } from "../../../../prisma.service";
+} from "src/auth/interfaces/user.session.interface";
+import { PrismaService } from "src/database/prisma.service";
 import {
   AssignmentResponseDto,
   GetAssignmentResponseDto,

apps/api/src/api/assignment/v2/repositories/question.repository.ts

@@ -1,7 +1,7 @@
 /* eslint-disable unicorn/no-null */
 import { Injectable, Logger } from "@nestjs/common";
 import { Prisma, Question, QuestionVariant } from "@prisma/client";
-import { PrismaService } from "src/prisma.service";
+import { PrismaService } from "src/database/prisma.service";
 import {
   Choice,
   QuestionDto,

apps/api/src/api/assignment/v2/repositories/variant.repository.ts

@@ -1,7 +1,7 @@
 /* eslint-disable unicorn/no-null */
 import { Injectable, Logger } from "@nestjs/common";
 import { Prisma, QuestionVariant } from "@prisma/client";
-import { PrismaService } from "src/prisma.service";
+import { PrismaService } from "src/database/prisma.service";
 import {
   Choice,
   ScoringDto,

apps/api/src/api/assignment/v2/services/__tests__/version-management.service.spec.ts

@@ -6,7 +6,7 @@ import { NotFoundException } from "@nestjs/common";
 import { Test, TestingModule } from "@nestjs/testing";
 import { WINSTON_MODULE_PROVIDER } from "nest-winston";
 import { UserRole } from "../../../../../auth/interfaces/user.session.interface";
-import { PrismaService } from "../../../../../prisma.service";
+import { PrismaService } from "../../../../../database/prisma.service";
 import { VersionManagementService } from "../version-management.service";
 
 describe("VersionManagementService", () => {

apps/api/src/api/assignment/v2/services/assignment.service.ts

@@ -1,7 +1,7 @@
 import { Inject, Injectable } from "@nestjs/common";
 import { WINSTON_MODULE_PROVIDER } from "nest-winston";
 import { UserSession } from "src/auth/interfaces/user.session.interface";
-import { PrismaService } from "src/prisma.service";
+import { PrismaService } from "src/database/prisma.service";
 import { Logger } from "winston";
 import { BaseAssignmentResponseDto } from "../../dto/base.assignment.response.dto";
 import {

apps/api/src/api/assignment/v2/services/draft-management.service.ts

@@ -15,7 +15,7 @@ import {
   UserSession,
 } from "src/auth/interfaces/user.session.interface";
 import { Logger } from "winston";
-import { PrismaService } from "../../../../prisma.service";
+import { PrismaService } from "../../../../database/prisma.service";
 
 export interface SaveDraftDto {
   draftName?: string;

apps/api/src/api/assignment/v2/services/grading-consistency.service.ts

@@ -7,7 +7,7 @@ import { QuestionType } from "@prisma/client";
 import { WINSTON_MODULE_PROVIDER } from "nest-winston";
 import { RubricScore } from "src/api/llm/model/file.based.question.response.model";
 import { Logger } from "winston";
-import { PrismaService } from "../../../../prisma.service";
+import { PrismaService } from "../../../../database/prisma.service";
 import {
   CriteriaDto,
   ScoringDto,

apps/api/src/api/assignment/v2/services/job-status.service.ts

@@ -15,7 +15,7 @@ import {
   switchMap,
   takeWhile,
 } from "rxjs";
-import { PrismaService } from "src/prisma.service";
+import { PrismaService } from "src/database/prisma.service";
 
 interface JobStatus {
   status: string;

apps/api/src/api/assignment/v2/services/question.service.ts

@@ -7,7 +7,7 @@
 import { ResponseType } from "@prisma/client";
 import { AssignmentTypeEnum } from "src/api/llm/features/question-generation/services/question-generation.service";
 import { LlmFacadeService } from "src/api/llm/llm-facade.service";
-import { PrismaService } from "src/prisma.service";
+import { PrismaService } from "src/database/prisma.service";
 import { BaseAssignmentResponseDto } from "../../dto/base.assignment.response.dto";
 import {
   EnhancedQuestionsToGenerate,
@@ -102,7 +102,7 @@
     questions: QuestionDto[],
     jobId?: number,
     progressCallback?: (progress: number) => Promise<void>,
     forceTranslation = false,
   ): Promise<void> {
     const INITIAL_SETUP_RANGE = { start: 0, end: 10 };
     const QUESTION_PROCESSING_RANGE = { start: 10, end: 90 };

apps/api/src/api/assignment/v2/services/report.repository.ts

@@ -6,7 +6,7 @@ import {
   UnprocessableEntityException,
 } from "@nestjs/common";
 import { ReportType } from "@prisma/client";
-import { PrismaService } from "src/prisma.service";
+import { PrismaService } from "src/database/prisma.service";
 
 @Injectable()
 export class ReportService {

apps/api/src/api/assignment/v2/services/translation.service.ts

@@ -3,7 +3,7 @@
 import { Prisma } from "@prisma/client";
 import Bottleneck from "bottleneck";
 import { LlmFacadeService } from "src/api/llm/llm-facade.service";
-import { PrismaService } from "src/prisma.service";
+import { PrismaService } from "src/database/prisma.service";
 import {
   getAllLanguageCodes,
   getLanguageNameFromCode,
@@ -120,7 +120,7 @@
     items: T[],
     batchProcessor: (item: T) => Promise<boolean>,
     batchSize = this.MAX_BATCH_SIZE,
     _concurrencyLimit = this.CONCURRENCY_LIMIT,
   ): Promise<BatchProcessResult> {
     const results: BatchProcessResult = { success: 0, failure: 0, dropped: 0 };
     const chunks: T[][] = [];
@@ -775,7 +775,7 @@
     operationName: string,
     translationFunction: () => Promise<T>,
     maxAttempts = this.MAX_RETRY_ATTEMPTS,
     _jobId?: number,
   ): Promise<T> {
     let attempts = 0;
     const operationId = `${operationName}-${Date.now()}`;
@@ -843,7 +843,7 @@
   /**
    * Handle stuck operations by resetting limiter if needed
    */
   private handleStuckOperation(_operationName: string): void {
     this.operationStats.consecutiveFailures++;
     this.operationStats.lastFailureTime = Date.now();
 

apps/api/src/api/assignment/v2/services/version-management.service.ts

@@ -22,9 +22,9 @@
   UserSession,
 } from "src/auth/interfaces/user.session.interface";
 import { Logger } from "winston";
-import { PrismaService } from "../../../../prisma.service";
+import { PrismaService } from "../../../../database/prisma.service";
 import { QuestionDto } from "../../dto/update.questions.request.dto";
 import { assign } from "nodemailer/lib/shared";
 
 export interface CreateVersionDto {
   versionNumber?: string;

apps/api/src/api/assignment/v2/tests/unit/repositories/assignment.repository.spec.ts

@@ -7,7 +7,7 @@ import { Test, TestingModule } from "@nestjs/testing";
 import { QuestionType } from "@prisma/client";
 import { GetAssignmentResponseDto } from "src/api/assignment/dto/get.assignment.response.dto";
 import { ScoringDto } from "src/api/assignment/dto/update.questions.request.dto";
-import { PrismaService } from "src/prisma.service";
+import { PrismaService } from "src/database/prisma.service";
 import {
   createMockAssignment,
   sampleAuthorSession,

apps/api/src/api/assignment/v2/tests/unit/repositories/question.repository.spec.ts

@@ -16,7 +16,7 @@ import {
   QuestionDto,
   ScoringDto,
 } from "src/api/assignment/dto/update.questions.request.dto";
-import { PrismaService } from "src/prisma.service";
+import { PrismaService } from "src/database/prisma.service";
 import {
   createMockPrismaService,
   createMockQuestion,

apps/api/src/api/assignment/v2/tests/unit/repositories/report.repository.spec.ts

@@ -16,7 +16,7 @@ import {
 } from "@nestjs/common";
 import { Test, TestingModule } from "@nestjs/testing";
 import { ReportType } from "@prisma/client";
-import { PrismaService } from "src/prisma.service";
+import { PrismaService } from "src/database/prisma.service";
 import {
   createMockAssignment,
   createMockReport,

apps/api/src/api/assignment/v2/tests/unit/repositories/variant.repository.spec.ts

@@ -7,7 +7,7 @@
 import { Test, TestingModule } from "@nestjs/testing";
 import { Prisma, VariantType } from "@prisma/client";
 import { VariantDto } from "src/api/assignment/dto/update.questions.request.dto";
-import { PrismaService } from "src/prisma.service";
+import { PrismaService } from "src/database/prisma.service";
 import {
   createMockPrismaService,
   createMockQuestionVariant,

apps/api/src/api/assignment/v2/tests/unit/services/assignment.service.spec.ts

@@ -13,7 +13,7 @@ import {
 } from "src/api/assignment/dto/update.questions.request.dto";
 import { QuestionService } from "src/api/assignment/v2/services/question.service";
 import { LlmFacadeService } from "src/api/llm/llm-facade.service";
-import { PrismaService } from "src/prisma.service";
+import { PrismaService } from "src/database/prisma.service";
 import {
   createMockAssignmentRepository,
   createMockAssignmentResponseDto,

apps/api/src/api/assignment/v2/tests/unit/services/job-status.service.spec.ts

@@ -8,7 +8,7 @@
 /* eslint-disable unicorn/no-null */
 import { Test, TestingModule } from "@nestjs/testing";
 import { firstValueFrom } from "rxjs";
-import { PrismaService } from "src/prisma.service";
+import { PrismaService } from "src/database/prisma.service";
 import {
   createMockJob,
   createMockPrismaService,

apps/api/src/api/assignment/v2/tests/unit/services/question.service.spec.ts

@@ -13,7 +13,7 @@ import {
   VariantDto,
 } from "src/api/assignment/dto/update.questions.request.dto";
 import { LlmFacadeService } from "src/api/llm/llm-facade.service";
-import { PrismaService } from "src/prisma.service";
+import { PrismaService } from "src/database/prisma.service";
 import {
   createMockJob,
   createMockJobStatusService,

apps/api/src/api/assignment/v2/tests/unit/services/report.service.spec.ts

@@ -10,7 +10,7 @@ import {
 } from "@nestjs/common";
 import { Test, TestingModule } from "@nestjs/testing";
 import { ReportType } from "@prisma/client";
-import { PrismaService } from "src/prisma.service";
+import { PrismaService } from "src/database/prisma.service";
 import {
   createMockAssignment,
   createMockPrismaService,