@programisto/edrm-exams 0.3.14 → 0.3.16

package/dist/modules/edrm-exams/models/candidate.model.d.ts

@@ -7,6 +7,7 @@ export declare enum ExperienceLevel {
     EXPERT = "EXPERT"
 }
 declare class Candidate extends EnduranceSchema {
+    entityId?: Types.ObjectId;
     contact: Types.ObjectId;
     experienceLevel: string;
     yearsOfExperience: number;

package/dist/modules/edrm-exams/models/candidate.model.js

@@ -20,6 +20,7 @@ export var ExperienceLevel;
 })(ExperienceLevel || (ExperienceLevel = {}));
 /* eslint-enable no-unused-vars */
 let Candidate = class Candidate extends EnduranceSchema {
+    entityId;
     contact;
     experienceLevel;
     yearsOfExperience;
@@ -32,6 +33,10 @@ let Candidate = class Candidate extends EnduranceSchema {
         return CandidateModel;
     }
 };
+__decorate([
+    EnduranceModelType.prop({ type: Types.ObjectId, ref: 'Entity', required: false }),
+    __metadata("design:type", Types.ObjectId)
+], Candidate.prototype, "entityId", void 0);
 __decorate([
     EnduranceModelType.prop({ required: true, ref: 'Contact' }),
     __metadata("design:type", Types.ObjectId)

package/dist/modules/edrm-exams/routes/exams.router.js

@@ -8,6 +8,7 @@ import Candidate from '../models/candidate.model.js';
 import ContactModel from '../models/contact.model.js';
 import { generateLiveMessage } from '../lib/openai.js';
 import { computeScoresByCategory } from '../lib/score-utils.js';
+import { Types } from 'mongoose';
 // Fonction utilitaire pour récupérer le nom du job
 async function getJobName(targetJob) {
     // Si c'est déjà une string (ancien format), on la retourne directement
@@ -1166,7 +1167,7 @@ class ExamsRouter extends EnduranceRouter {
          */
         this.put('/test/addCustomQuestion/:id', authenticatedOptions, async (req, res) => {
             const { id } = req.params;
-            const { questionType, instruction, maxScore, time, categoryId } = req.body;
+            const { questionType, instruction, maxScore, time, categoryId, possibleResponses, textType } = req.body;
             try {
                 const test = await Test.findById(id);
                 if (!test) {
@@ -1186,7 +1187,9 @@ class ExamsRouter extends EnduranceRouter {
                     instruction,
                     maxScore,
                     time,
-                    ...(categoryId != null && categoryId !== '' ? { categoryId } : {})
+                    ...(categoryId != null && categoryId !== '' ? { categoryId } : {}),
+                    ...(textType != null && textType !== '' ? { textType } : {}),
+                    ...(questionType === 'MCQ' && Array.isArray(possibleResponses) ? { possibleResponses } : {})
                 });
                 await question.save();
                 test.questions.push({ questionId: question._id, order: test.questions.length });
@@ -1463,25 +1466,44 @@ class ExamsRouter extends EnduranceRouter {
                 if (!test) {
                     return res.status(404).json({ message: 'Test not found' });
                 }
-                const categories = test.categories.map(cat => ({ categoryId: cat.categoryId }));
-                const newResult = new TestResult({
-                    candidateId,
-                    testId,
-                    categories,
-                    state: 'pending',
-                    invitationDate: Date.now()
-                });
-                await newResult.save();
-                // Récupérer l'email du candidat
+                // Récupérer le candidat et le contact (avant de créer le TestResult pour pouvoir utiliser le candidat scopé entité)
                 const candidate = await Candidate.findById(candidateId);
                 if (!candidate) {
                     return res.status(404).json({ message: 'Candidate not found' });
                 }
-                // Récupérer le contact pour obtenir l'email
                 const contact = await ContactModel.findById(candidate.contact);
                 if (!contact) {
                     return res.status(404).json({ message: 'Contact not found' });
                 }
+                // Multi-entité : s'assurer qu'un Candidate existe pour l'entité courante (même contact).
+                // Permet à un candidat déjà présent sur une autre entité de se connecter à l'espace candidat de cette entité.
+                let entityCandidate = candidate;
+                if (req.entity?._id) {
+                    const entityId = req.entity._id instanceof Types.ObjectId ? req.entity._id : new Types.ObjectId(String(req.entity._id));
+                    const existing = await Candidate.findOne({ contact: contact._id, entityId });
+                    if (!existing) {
+                        entityCandidate = new Candidate({
+                            contact: contact._id,
+                            entityId,
+                            skills: Array.isArray(candidate.skills) ? candidate.skills : [],
+                            experienceLevel: candidate.experienceLevel,
+                            yearsOfExperience: candidate.yearsOfExperience ?? 0
+                        });
+                        await entityCandidate.save();
+                    }
+                    else {
+                        entityCandidate = existing;
+                    }
+                }
+                const categories = test.categories.map((cat) => ({ categoryId: cat.categoryId }));
+                const newResult = new TestResult({
+                    candidateId: entityCandidate._id,
+                    testId,
+                    categories,
+                    state: 'pending',
+                    invitationDate: Date.now()
+                });
+                await newResult.save();
                 const email = contact.email;
                 // Construire le lien d'invitation
                 const testLink = (process.env.TEST_INVITATION_LINK || '') + email;

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "@programisto/edrm-exams",
-  "version": "0.3.14",
+  "version": "0.3.16",
   "publishConfig": {
     "access": "public"
   },