@programisto/edrm-exams 0.3.10 → 0.3.12

package/dist/modules/edrm-exams/lib/score-utils.d.ts

@@ -0,0 +1,18 @@
+import type { CategoryScore } from '../models/test-result.model.js';
+export interface ComputeScoresResult {
+    score: number;
+    scoresByCategory: CategoryScore[];
+}
+/** Objet ayant au minimum testId et responses (document TestResult ou équivalent). */
+export interface ResultWithResponses {
+    testId: unknown;
+    responses?: Array<{
+        questionId: unknown;
+        score?: number;
+    }>;
+}
+/**
+ * Calcule le score global et les sous-scores par catégorie à partir des réponses d'un TestResult.
+ * Les questions sans categoryId contribuent au score global uniquement (pas d'entrée dans scoresByCategory).
+ */
+export declare function computeScoresByCategory(result: ResultWithResponses): Promise<ComputeScoresResult>;

package/dist/modules/edrm-exams/lib/score-utils.js

@@ -0,0 +1,48 @@
+import Test from '../models/test.model.js';
+import TestQuestion from '../models/test-question.model.js';
+/**
+ * Calcule le score global et les sous-scores par catégorie à partir des réponses d'un TestResult.
+ * Les questions sans categoryId contribuent au score global uniquement (pas d'entrée dans scoresByCategory).
+ */
+export async function computeScoresByCategory(result) {
+    const responses = result.responses || [];
+    let score = 0;
+    const categoryMap = new Map();
+    const test = await Test.findById(result.testId).lean();
+    if (!test) {
+        return { score: 0, scoresByCategory: [] };
+    }
+    for (const res of responses) {
+        const questionId = res.questionId?.toString?.() ?? res.questionId;
+        if (!questionId)
+            continue;
+        const question = await TestQuestion.findById(questionId).lean();
+        if (!question)
+            continue;
+        const responseScore = typeof res.score === 'number' && !isNaN(res.score) ? res.score : 0;
+        const questionMaxScore = typeof question.maxScore === 'number' && !isNaN(question.maxScore) ? question.maxScore : 0;
+        score += responseScore;
+        const catId = question.categoryId;
+        if (catId) {
+            const key = catId.toString?.() ?? String(catId);
+            const existing = categoryMap.get(key);
+            if (existing) {
+                existing.score += responseScore;
+                existing.maxScore += questionMaxScore;
+            }
+            else {
+                categoryMap.set(key, {
+                    categoryId: catId,
+                    score: responseScore,
+                    maxScore: questionMaxScore
+                });
+            }
+        }
+    }
+    const scoresByCategory = Array.from(categoryMap.values()).map(({ categoryId, score: catScore, maxScore: catMax }) => ({
+        categoryId: categoryId,
+        score: catScore,
+        maxScore: catMax
+    }));
+    return { score, scoresByCategory };
+}

package/dist/modules/edrm-exams/listeners/correct.listener.js

@@ -1,6 +1,7 @@
 import { enduranceListener, enduranceEventTypes, enduranceEmitter } from '@programisto/endurance';
 import TestQuestion from '../models/test-question.model.js';
 import { generateLiveMessageAssistant } from '../lib/openai.js';
+import { computeScoresByCategory } from '../lib/score-utils.js';
 import TestResult, { TestState } from '../models/test-result.model.js';
 import CandidateModel from '../models/candidate.model.js';
 import ContactModel from '../models/contact.model.js';
@@ -97,6 +98,9 @@ async function correctTest(options) {
         result.state = TestState.Finish;
         // Forcer la sauvegarde des sous-documents responses
         result.markModified('responses');
+        // Calculer les sous-scores par catégorie
+        const { scoresByCategory } = await computeScoresByCategory(result);
+        result.scoresByCategory = scoresByCategory;
         // Calculer le pourcentage de score en évitant la division par zéro
         let scorePercentage = 0;
         if (maxScore > 0) {
@@ -115,6 +119,7 @@ async function correctTest(options) {
             $set: {
                 responses: result.responses,
                 score: finalscore,
+                scoresByCategory: result.scoresByCategory,
                 state: result.state
             }
         });

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

@@ -1,4 +1,5 @@
 import { EnduranceSchema } from '@programisto/endurance';
+import TestCategory from './test-category.models.js';
 declare enum QuestionType {
     MCQ = "MCQ",
     FreeQuestion = "free question",
@@ -19,7 +20,8 @@ declare class TestQuestion extends EnduranceSchema {
     possibleResponses: PossibleResponse[];
     time: number;
     textType: TextType;
-    static getModel(): import("@typegoose/typegoose").ReturnModelType<typeof TestQuestion, import("@typegoose/typegoose/lib/types").BeAnObject>;
+    categoryId?: typeof TestCategory;
+    static getModel(): import("@typegoose/typegoose").ReturnModelType<typeof TestQuestion, import("@typegoose/typegoose/lib/types.js").BeAnObject>;
 }
-declare const TestQuestionModel: import("@typegoose/typegoose").ReturnModelType<typeof TestQuestion, import("@typegoose/typegoose/lib/types").BeAnObject>;
+declare const TestQuestionModel: import("@typegoose/typegoose").ReturnModelType<typeof TestQuestion, import("@typegoose/typegoose/lib/types.js").BeAnObject>;
 export default TestQuestionModel;

package/dist/modules/edrm-exams/models/test-question.model.js

@@ -8,6 +8,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 import { EnduranceSchema, EnduranceModelType } from '@programisto/endurance';
+import TestCategory from './test-category.models.js';
 var QuestionType;
 (function (QuestionType) {
     // eslint-disable-next-line no-unused-vars
@@ -31,6 +32,7 @@ let TestQuestion = class TestQuestion extends EnduranceSchema {
     possibleResponses;
     time;
     textType;
+    categoryId;
     static getModel() {
         return TestQuestionModel;
     }
@@ -59,6 +61,10 @@ __decorate([
     EnduranceModelType.prop({ required: false, enum: TextType, default: TextType.Text }),
     __metadata("design:type", String)
 ], TestQuestion.prototype, "textType", void 0);
+__decorate([
+    EnduranceModelType.prop({ ref: () => TestCategory, required: false }),
+    __metadata("design:type", Object)
+], TestQuestion.prototype, "categoryId", void 0);
 TestQuestion = __decorate([
     EnduranceModelType.modelOptions({
         options: {

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

@@ -12,12 +12,18 @@ interface Response {
     score?: number;
     comment?: string;
 }
+export interface CategoryScore {
+    categoryId: ObjectId;
+    score: number;
+    maxScore: number;
+}
 declare class TestResult extends EnduranceSchema {
     testId: typeof Test;
     candidateId: typeof User;
     state: TestState;
     responses: Response[];
     score?: number;
+    scoresByCategory?: CategoryScore[];
     startTime?: Date;
     endTime?: Date;
     static getModel(): import("@typegoose/typegoose").ReturnModelType<typeof TestResult, import("@typegoose/typegoose/lib/types.js").BeAnObject>;

package/dist/modules/edrm-exams/models/test-result.model.js

@@ -25,6 +25,7 @@ let TestResult = class TestResult extends EnduranceSchema {
     state;
     responses;
     score;
+    scoresByCategory;
     startTime;
     endTime;
     static getModel() {
@@ -51,6 +52,10 @@ __decorate([
     EnduranceModelType.prop(),
     __metadata("design:type", Number)
 ], TestResult.prototype, "score", void 0);
+__decorate([
+    EnduranceModelType.prop({ type: [Object], required: false }),
+    __metadata("design:type", Array)
+], TestResult.prototype, "scoresByCategory", void 0);
 __decorate([
     EnduranceModelType.prop(),
     __metadata("design:type", Date)

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

@@ -7,6 +7,7 @@ import TestJob from '../models/test-job.model.js';
 import Candidate from '../models/candidate.model.js';
 import ContactModel from '../models/contact.model.js';
 import { generateLiveMessage, generateLiveMessageAssistant } from '../lib/openai.js';
+import { computeScoresByCategory } from '../lib/score-utils.js';
 // 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
@@ -25,6 +26,23 @@ async function getJobName(targetJob) {
     }
     return 'Job inconnu';
 }
+/** Entité par défaut : les tests sans entityId lui sont rattachés (slug programisto/progamisto ou isDefault). */
+function isDefaultEntity(req) {
+    if (!req?.entity)
+        return false;
+    const slug = req.entity.slug;
+    return req.entity.isDefault === true || slug === 'programisto' || slug === 'progamisto';
+}
+/** Vérifie qu'un test appartient à l'entité courante (pour GET/UPDATE/DELETE). Pour l'entité par défaut, un test sans entityId est accepté. */
+function testBelongsToEntity(test, req) {
+    if (!req?.entity?._id)
+        return true;
+    const testEid = test?.entityId?.toString?.() ?? (test?.entityId != null ? String(test.entityId) : '');
+    const reqEid = req.entity._id?.toString?.() ?? String(req.entity._id);
+    if (isDefaultEntity(req))
+        return testEid === reqEid || testEid === '';
+    return testEid === reqEid;
+}
 // Fonction pour migrer automatiquement un test si nécessaire
 async function migrateTestIfNeeded(test) {
     if (typeof test.targetJob === 'string') {
@@ -452,7 +470,7 @@ class ExamsRouter extends EnduranceRouter {
                 if (!test) {
                     return res.status(404).json({ message: 'Test non trouvé' });
                 }
-                if (req.entity?._id && test.entityId && !test.entityId.equals(req.entity._id)) {
+                if (!testBelongsToEntity(test, req)) {
                     return res.status(404).json({ message: 'Test non trouvé' });
                 }
                 if (title)
@@ -543,7 +561,7 @@ class ExamsRouter extends EnduranceRouter {
                 if (!test) {
                     return res.status(404).json({ message: 'Test not found' });
                 }
-                if (req.entity?._id && test.entityId && !test.entityId.equals(req.entity._id)) {
+                if (!testBelongsToEntity(test, req)) {
                     return res.status(404).json({ message: 'Test not found' });
                 }
                 for (let i = 0; i < test.questions.length; i++) {
@@ -587,7 +605,7 @@ class ExamsRouter extends EnduranceRouter {
                     return res.status(404).json({ message: 'no test founded with this id' });
                 }
                 // Vérifier que le test appartient à l'entité courante (multi-entités)
-                if (req.entity?._id && test.entityId && !test.entityId.equals(req.entity._id)) {
+                if (!testBelongsToEntity(test, req)) {
                     return res.status(404).json({ message: 'no test founded with this id' });
                 }
                 // Migration automatique si nécessaire
@@ -677,9 +695,22 @@ class ExamsRouter extends EnduranceRouter {
                 const sortOrder = req.query.sortOrder || 'desc';
                 // Construction de la requête de recherche
                 const query = {};
-                // Filtre par entité (contexte multi-entités)
+                // Filtre par entité. Entité par défaut (programisto/progamisto ou isDefault) = tests sans entityId inclus.
                 if (req.entity?._id) {
-                    query.entityId = req.entity._id;
+                    if (isDefaultEntity(req)) {
+                        query.$and = query.$and || [];
+                        query.$and.push({
+                            $or: [
+                                { entityId: req.entity._id },
+                                { entityId: req.entity._id.toString?.() ?? String(req.entity._id) },
+                                { entityId: { $exists: false } },
+                                { entityId: null }
+                            ]
+                        });
+                    }
+                    else {
+                        query.entityId = req.entity._id;
+                    }
                 }
                 // Filtres
                 if (targetJob !== 'all') {
@@ -802,7 +833,7 @@ class ExamsRouter extends EnduranceRouter {
                 let test = await Test.findById(testId);
                 if (!test)
                     return res.status(404).json({ message: 'Test not found' });
-                if (req.entity?._id && test.entityId && !test.entityId.equals(req.entity._id)) {
+                if (!testBelongsToEntity(test, req)) {
                     return res.status(404).json({ message: 'Test not found' });
                 }
                 test = await Test.findByIdAndUpdate(testId, { $pull: { categories: { categoryId: category._id } } }, { new: true });
@@ -858,7 +889,7 @@ class ExamsRouter extends EnduranceRouter {
                 if (!test) {
                     return res.status(404).json({ message: 'Test not found' });
                 }
-                if (req.entity?._id && test.entityId && !test.entityId.equals(req.entity._id)) {
+                if (!testBelongsToEntity(test, req)) {
                     return res.status(404).json({ message: 'Test not found' });
                 }
                 const categoryExists = test.categories.some(cat => cat.categoryId.equals(category._id));
@@ -931,7 +962,7 @@ class ExamsRouter extends EnduranceRouter {
                 if (!test) {
                     return res.status(404).json({ message: 'Test not found' });
                 }
-                if (req.entity?._id && test.entityId && !test.entityId.equals(req.entity._id)) {
+                if (!testBelongsToEntity(test, req)) {
                     return res.status(404).json({ message: 'Test not found' });
                 }
                 const questions = [];
@@ -984,7 +1015,7 @@ class ExamsRouter extends EnduranceRouter {
             if (!test) {
                 return res.status(404).json({ message: 'no test founded with this id' });
             }
-            if (req.entity?._id && test.entityId && !test.entityId.equals(req.entity._id)) {
+            if (!testBelongsToEntity(test, req)) {
                 return res.status(404).json({ message: 'no test founded with this id' });
             }
             // Supprimer la question du tableau questions en filtrant par questionId
@@ -1023,7 +1054,7 @@ class ExamsRouter extends EnduranceRouter {
             if (!test) {
                 return res.status(404).json({ message: 'no test founded with this id' });
             }
-            if (req.entity?._id && test.entityId && !test.entityId.equals(req.entity._id)) {
+            if (!testBelongsToEntity(test, req)) {
                 return res.status(404).json({ message: 'no test founded with this id' });
             }
             for (const questionId of test.questions) {
@@ -1062,7 +1093,7 @@ class ExamsRouter extends EnduranceRouter {
          */
         this.put('/test/modifyQuestion/:id', authenticatedOptions, async (req, res) => {
             const { id } = req.params;
-            const { instruction, maxScore, time, possibleResponses, textType } = req.body;
+            const { instruction, maxScore, time, possibleResponses, textType, categoryId } = req.body;
             try {
                 const question = await TestQuestion.findById(id);
                 if (!question) {
@@ -1083,6 +1114,18 @@ class ExamsRouter extends EnduranceRouter {
                 if (possibleResponses) {
                     question.possibleResponses = possibleResponses;
                 }
+                if (categoryId !== undefined) {
+                    if (categoryId === null || categoryId === '') {
+                        question.categoryId = undefined;
+                    }
+                    else {
+                        const category = await TestCategory.findById(categoryId);
+                        if (!category) {
+                            return res.status(400).json({ message: 'Catégorie non trouvée' });
+                        }
+                        question.categoryId = categoryId;
+                    }
+                }
                 await question.save();
                 res.status(200).json({ message: 'question modified with sucess' });
             }
@@ -1129,20 +1172,27 @@ class ExamsRouter extends EnduranceRouter {
          */
         this.put('/test/addCustomQuestion/:id', authenticatedOptions, async (req, res) => {
             const { id } = req.params;
-            const { questionType, instruction, maxScore, time } = req.body;
+            const { questionType, instruction, maxScore, time, categoryId } = req.body;
             try {
                 const test = await Test.findById(id);
                 if (!test) {
                     return res.status(404).json({ message: 'no test founded with this id' });
                 }
-                if (req.entity?._id && test.entityId && !test.entityId.equals(req.entity._id)) {
+                if (!testBelongsToEntity(test, req)) {
                     return res.status(404).json({ message: 'no test founded with this id' });
                 }
+                if (categoryId != null && categoryId !== '') {
+                    const category = await TestCategory.findById(categoryId);
+                    if (!category) {
+                        return res.status(400).json({ message: 'Catégorie non trouvée' });
+                    }
+                }
                 const question = new TestQuestion({
                     questionType,
                     instruction,
                     maxScore,
-                    time
+                    time,
+                    ...(categoryId != null && categoryId !== '' ? { categoryId } : {})
                 });
                 await question.save();
                 test.questions.push({ questionId: question._id, order: test.questions.length });
@@ -1196,7 +1246,7 @@ class ExamsRouter extends EnduranceRouter {
                 if (!test) {
                     return res.status(404).json({ message: 'no test founded with this id' });
                 }
-                if (req.entity?._id && test.entityId && !test.entityId.equals(req.entity._id)) {
+                if (!testBelongsToEntity(test, req)) {
                     return res.status(404).json({ message: 'no test founded with this id' });
                 }
                 const otherQuestionsIds = test.questions.map(question => question.questionId);
@@ -1249,7 +1299,7 @@ class ExamsRouter extends EnduranceRouter {
                 if (!test) {
                     return res.status(404).json({ message: 'Test not found' });
                 }
-                if (req.entity?._id && test.entityId && !test.entityId.equals(req.entity._id)) {
+                if (!testBelongsToEntity(test, req)) {
                     return res.status(404).json({ message: 'Test not found' });
                 }
                 for (let i = test.questions.length - 1; i > 0; i--) {
@@ -1302,7 +1352,7 @@ class ExamsRouter extends EnduranceRouter {
                 if (!test) {
                     return res.status(404).json({ message: 'no test founded with this id' });
                 }
-                if (req.entity?._id && test.entityId && !test.entityId.equals(req.entity._id)) {
+                if (!testBelongsToEntity(test, req)) {
                     return res.status(404).json({ message: 'no test founded with this id' });
                 }
                 test.invitationText = invitationText;
@@ -1762,6 +1812,8 @@ class ExamsRouter extends EnduranceRouter {
                     response.comment = parsedResult.comment;
                 }
                 result.score = finalscore;
+                const { scoresByCategory } = await computeScoresByCategory(result);
+                result.scoresByCategory = scoresByCategory;
                 await result.save();
                 res.status(200).json({ data: finalscore });
             }
@@ -1899,7 +1951,7 @@ class ExamsRouter extends EnduranceRouter {
                 if (!test) {
                     return res.status(404).json({ message: 'Test non trouvé' });
                 }
-                if (req.entity?._id && test.entityId && !test.entityId.equals(req.entity._id)) {
+                if (!testBelongsToEntity(test, req)) {
                     return res.status(404).json({ message: 'Test non trouvé' });
                 }
                 let categoriesToUse = [];
@@ -2034,7 +2086,7 @@ class ExamsRouter extends EnduranceRouter {
                 if (!test) {
                     return res.status(404).json({ message: 'Test non trouvé' });
                 }
-                if (req.entity?._id && test.entityId && !test.entityId.equals(req.entity._id)) {
+                if (!testBelongsToEntity(test, req)) {
                     return res.status(404).json({ message: 'Test non trouvé' });
                 }
                 // Construction de la requête
@@ -2320,8 +2372,10 @@ class ExamsRouter extends EnduranceRouter {
                     response.score = score;
                 if (typeof comment === 'string')
                     response.comment = comment;
-                // Recalculer le score global
-                result.score = (result.responses || []).reduce((sum, r) => sum + (r.score || 0), 0);
+                // Recalculer le score global et les sous-scores par catégorie
+                const { score: globalScore, scoresByCategory } = await computeScoresByCategory(result);
+                result.score = globalScore;
+                result.scoresByCategory = scoresByCategory;
                 await result.save();
                 return res.status(200).json({
                     message: 'Correction manuelle enregistrée',

package/package.json

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