Merge pull request #732 from freeCodeCamp/main

Create a new pull request by comparing changes across two branches

Author: GulajavaMinistudio

.github/CODEOWNERS

@@ -38,14 +38,12 @@ pnpm-lock.yaml
 /curriculum/challenges/english/* @freecodecamp/curriculum
 
 # -------------------------------------------------
-# Files that need attention from Staff
+# Files that need attention from i18n & dev team
 # -------------------------------------------------
 
-# README, LICENSE, etc.
-/*.md @freeCodeCamp/staff
-
 # i18n Quotes
-**/motivation.json @freeCodeCamp/staff @freeCodeCamp/i18n
+**/motivation.json @freeCodeCamp/dev-team @freeCodeCamp/i18n
+
 
 # -------------------------------------------------
 # Files that need attention from the mobile team

.github/workflows/node.js-tests.yml

@@ -68,7 +68,7 @@ jobs:
       - name: Lint Source Files
         run: |
           echo pnpm version $(pnpm -v)
-          pnpm turbo lint
+          pnpm lint
 
   # DONT REMOVE THIS JOB.
   # TODO: Refactor and use re-usable workflow and shared artifacts

api/__mocks__/exam-environment-exam.ts

@@ -255,6 +255,7 @@ export const generatedExam: ExamEnvironmentGeneratedExam = {
 export const examAttempt: ExamEnvironmentExamAttempt = {
   examId,
   generatedExamId: generatedExam.id,
+  examModerationId: null,
   id: oid(),
   questionSets: [
     {

api/package.json

@@ -51,7 +51,6 @@
     "dotenv-cli": "7.3.0",
     "eslint": "^9.39.1",
     "eslint-plugin-jsdoc": "48.2.1",
-    "jsdom": "^26.1.0",
     "msw": "^2.7.0",
     "prisma": "6.16.2",
     "supertest": "6.3.3",

api/prisma/exam-environment.prisma

@@ -118,26 +118,31 @@ type ExamEnvironmentTagConfig {
 
 /// An attempt at an exam in the Exam Environment App
 model ExamEnvironmentExamAttempt {
-  id              String @id @default(auto()) @map("_id") @db.ObjectId
+  id               String  @id @default(auto()) @map("_id") @db.ObjectId
   /// Foriegn key to user
-  userId          String @db.ObjectId
+  userId           String  @db.ObjectId
   /// Foreign key to exam
-  examId          String @db.ObjectId
+  examId           String  @db.ObjectId
   /// Foreign key to generated exam id
-  generatedExamId String @db.ObjectId
+  generatedExamId  String  @db.ObjectId
+  /// Un-enforced foreign key to moderation
+  examModerationId String? @db.ObjectId
 
   questionSets ExamEnvironmentQuestionSetAttempt[]
   /// Time exam was started
   startTime    DateTime
   /// Version of the record
   /// The default must be incremented by 1, if anything in the schema changes
-  version      Int                                 @default(3)
+  version      Int                                 @default(4)
 
   // Relations
-  user                          user                            @relation(fields: [userId], references: [id], onDelete: Cascade)
-  exam                          ExamEnvironmentExam             @relation(fields: [examId], references: [id], onDelete: Cascade)
-  generatedExam                 ExamEnvironmentGeneratedExam    @relation(fields: [generatedExamId], references: [id])
-  ExamEnvironmentExamModeration ExamEnvironmentExamModeration[]
+  user                          user                           @relation(fields: [userId], references: [id], onDelete: Cascade)
+  exam                          ExamEnvironmentExam            @relation(fields: [examId], references: [id], onDelete: Cascade)
+  generatedExam                 ExamEnvironmentGeneratedExam   @relation(fields: [generatedExamId], references: [id])
+  // Ideally, there could be a way to add a one-way optional relation here, but Prisma does not allow that:
+  // Error parsing attribute "@relation": The relation fields `examAttempt` on Model `ExamEnvironmentExamModeration` and `examModeration` on Model `ExamEnvironmentExamAttempt` both provide the `references` argument in the @relation attribute. You have to provide it only on one of the two fields.
+  // examModeration ExamEnvironmentExamModeration? @relation(fields: [examModerationId], references: [id])
+  examEnvironmentExamModeration ExamEnvironmentExamModeration?
 }
 
 type ExamEnvironmentQuestionSetAttempt {

api/src/exam-environment/routes/exam-environment.test.ts

@@ -590,6 +590,7 @@ describe('/exam-environment/', () => {
           userId: defaultUserId,
           examId: mock.examId,
           generatedExamId: generatedExam!.id,
+          examModerationId: null,
           questionSets: [],
           // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
           startTime: expect.any(Date),

api/src/exam-environment/routes/exam-environment.ts

@@ -458,6 +458,7 @@ async function postExamGeneratedExamHandler(
         userId: user.id,
         examId: exam.id,
         generatedExamId: generatedExam.id,
+        examModerationId: null,
         startTime: new Date(),
         questionSets: []
       }

api/src/exam-environment/utils/exam-environment.test.ts

@@ -518,6 +518,7 @@ describe('Exam Environment Schema', () => {
         data: {
           examId: oid(),
           generatedExamId: oid(),
+          examModerationId: null,
           questionSets: [
             {
               id: oid(),

api/src/routes/helpers/certificate-utils.ts

@@ -1,26 +1,18 @@
 import { Prisma } from '@prisma/client';
 import {
   certSlugTypeMap,
-  certIds
+  certToIdMap,
+  Certification
 } from '../../../../shared/config/certification-settings.js';
 import { normalizeDate } from '../../utils/normalize.js';
 
-const {
-  legacyInfosecQaId,
-  respWebDesignId,
-  frontEndDevLibsId,
-  jsAlgoDataStructId,
-  dataVis2018Id,
-  apisMicroservicesId
-} = certIds;
-
 const fullStackCertificateIds = [
-  respWebDesignId,
-  jsAlgoDataStructId,
-  frontEndDevLibsId,
-  dataVis2018Id,
-  apisMicroservicesId,
-  legacyInfosecQaId
+  certToIdMap[Certification.RespWebDesign],
+  certToIdMap[Certification.JsAlgoDataStruct],
+  certToIdMap[Certification.FrontEndDevLibs],
+  certToIdMap[Certification.DataVis],
+  certToIdMap[Certification.BackEndDevApis],
+  certToIdMap[Certification.LegacyInfoSecQa]
 ];
 
 /**

api/src/routes/protected/certificate.test.ts

@@ -16,6 +16,8 @@ import {
   setupServer,
   superRequest
 } from '../../../vitest.utils.js';
+import { getChallenges } from '../../utils/get-challenges.js';
+import { createCertLookup } from './certificate.js';
 
 describe('certificate routes', () => {
   setupServer();
@@ -461,3 +463,32 @@ describe('certificate routes', () => {
     });
   });
 });
+
+describe('createCertLookup', () => {
+  let challenges: ReturnType<typeof getChallenges>;
+
+  beforeAll(() => {
+    // TODO: create a mock challenges array specific to these tests.
+    challenges = getChallenges();
+  });
+
+  test('should create a lookup for all certifications', () => {
+    const certLookup = createCertLookup(challenges);
+
+    for (const cert of Object.values(Certification)) {
+      const certData = certLookup[cert];
+      expect(certData).toHaveProperty('id');
+      expect(certData).toHaveProperty('tests');
+      expect(certData).toHaveProperty('challengeType');
+    }
+  });
+
+  test('each certification should have a unique challenge id', () => {
+    const certLookup = createCertLookup(challenges);
+    const ids = Object.values(certLookup)
+      .map(({ id }) => id)
+      .sort();
+    const uniqueIds = Array.from(new Set(ids)).sort();
+    expect(uniqueIds).toEqual(ids);
+  });
+});