data-primals-engine 1.5.2 → 1.6.0

package/test/data.integration.test.js

@@ -1,1207 +1,1207 @@
-// __tests__/data.integration.test.js
-import { ObjectId } from 'mongodb';
-import {vi, expect, describe, it, afterEach,beforeEach, beforeAll, afterAll} from 'vitest';
-import fs from 'fs/promises';
-import path from 'path';
-import os from 'os';
-import { Config } from '../src/config.js';
-import {
-    insertData,
-    editData,
-    deleteData,
-    searchData, installPack, deleteModels, createModel, patchData
-} from '../src/index.js';
-
-import {
-    modelsCollection as getAppModelsCollection,
-    getCollection,
-    getCollectionForUser as getAppUserCollection, getCollectionForUser
-} from '../src/modules/mongodb.js';
-import {getRandom} from "../src/core.js";
-import {generateUniqueName, initEngine} from "../src/setenv.js";
-import {purgeData} from "../src/modules/data/data.history.js";
-import {removeFile} from "../src/modules/file.js";
-
-let testModelsColInstance;
-let testDatasColInstance;
-
-// Cette fonction va remplacer la logique de votre beforeEach pour la création de contexte
-async function setupTestContext() {
-
-    const currentTestModelName = generateUniqueName('relatedModel');
-    const currentRelatedModelName = generateUniqueName('comprehensiveModel');
-
-    // Créer un utilisateur unique pour ce test
-    const currentTestUser = {
-        username: generateUniqueName('testuserDataIntegration'),
-        userPlan: 'premium',
-        email: generateUniqueName('test') + '@example.com'
-    };
-
-    // Initialize collection instances after the engine is ready
-    testModelsColInstance = getAppModelsCollection;
-    testDatasColInstance = await getAppUserCollection(currentTestUser);
-
-    const relatedModelDefinition = {
-        name: currentRelatedModelName,
-        _user: currentTestUser.username,
-        description: 'Model for testing relations',
-        fields: [
-            {name: 'relatedName', type: 'string', required: true, unique: true},
-            {name: 'relatedValue', type: 'number'}
-        ],
-        maxRequestData: 10
-    };
-
-    const comprehensiveTestModelDefinition = {
-        name: currentTestModelName,
-        _user: currentTestUser.username,
-        description: 'A model with all field types and constraints for testing',
-        fields: [
-            // String types
-            {name: 'stringRequired', type: 'string', required: true, hint: 'A required string'},
-            {name: 'stringUnique', type: 'string', unique: true, hint: 'A unique string'},
-            {name: 'stringMaxLength', type: 'string', maxlength: 5, hint: 'String with max length 5'},
-            {name: 'stringDefault', type: 'string', default: 'defaultString'},
-            {name: 'string_tLang', type: 'string_t', hint: 'Localizable string'},
-            {name: 'richtextField', type: 'richtext', maxlength: 200},
-            {name: 'passwordField', type: 'password'},
-            {name: 'emailField', type: 'email'},
-            {name: 'phoneField', type: 'phone'},
-            {name: 'urlField', type: 'url'},
-            // Number types
-            {name: 'number', type: 'number'},
-            {name: 'numberMinMax', type: 'number', min: 10, max: 20},
-            {name: 'numberStep', type: 'number', step: 0.5},
-            {name: 'numberDefault', type: 'number', default: 42},
-            // Boolean
-            {name: 'booleanField', type: 'boolean'},
-            {name: 'booleanDefault', type: 'boolean', default: true},
-            // Date & Datetime
-            {name: 'dateField', type: 'date'},
-            {name: 'datetimeField', type: 'datetime', default: 'now'},
-            {name: 'dateMinMax', type: 'date', min: '2023-01-01', max: '2023-12-31'},
-            // Enum
-            {name: 'enumField', type: 'enum', items: ['alpha', 'beta', 'gamma']},
-            {name: 'enumDefault', type: 'enum', items: ['one', 'two'], default: 'one'},
-            // Array
-            {name: 'arrayString', type: 'array', itemsType: 'string', maxItems: 2},
-            {name: 'arrayNumber', type: 'array', itemsType: 'number', minItems: 1},
-            {name: 'arrayEnum', type: 'array', itemsType: 'enum', items: ['a', 'b']},
-            // Relation
-            {name: 'relationSingle', type: 'relation', relation: currentRelatedModelName},
-            {name: 'relationMultiple', type: 'relation', relation: currentRelatedModelName, multiple: true},
-            // File (metadata validation)
-            {name: 'fileField', type: 'file', mimeTypes: ['image/png', 'application/pdf', 'text/plain'], maxSize: 1024 * 10}, // 10KB
-            // Color
-            {name: 'colorField', type: 'color'},
-            // Code
-            {name: 'codeJsonField', type: 'code', language: 'json'},
-            {name: 'codeJsField', type: 'code', language: 'javascript', maxlength: 100},
-            // Object (simple validation, structure not deeply validated by default dataTypes.object)
-            {name: 'objectField', type: 'object'},
-            // Model & ModelField (validation of string format, not existence)
-            {name: 'modelNameField', type: 'model'},
-            {name: 'modelFieldNameField', type: 'modelField'} // Note: modelField type expects an object {model: 'modelName', field: 'fieldName'}
-        ],
-        maxRequestData: 50
-    };
-
-    if( await testModelsColInstance.find({ $or: [{name: comprehensiveTestModelDefinition.name}, {name: relatedModelDefinition.name}]})) {
-        // Insérer les modèles en base
-        await testModelsColInstance.insertMany([
-            comprehensiveTestModelDefinition,
-            relatedModelDefinition
-        ]);
-    }
-    await testDatasColInstance.deleteMany({ _user: currentTestUser.username });
-
-    const purge = async ()=>{
-        await purgeData(currentTestUser);
-    }
-
-    // Retourner toutes les variables nécessaires pour un test
-    return {
-        currentTestUser,
-        comprehensiveTestModelDefinition,
-        relatedModelDefinition,
-        purge
-    };
-}
-
-let engine;
-describe('Data integration tests (CRUD, validation...)', () => {
-
-    beforeAll(async () =>{
-        Config.Set("modules", ["mongodb", "data", "file", "bucket", "workflow","user", "assistant"]);
-        engine = await initEngine();
-
-    })
-    describe('insertData avec comprehensiveTestModel', () => {
-        it('devrait insérer des données valides pour tous les types de champs', async () => {
-
-            const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await setupTestContext();
-            // 1. Créer un suffixe unique pour cette exécution de test
-            const testSuffix = getRandom(1000, 9999); // Génère un nombre aléatoire
-
-            // 2. Insérer les documents liés avec des noms uniques garantis
-            const relatedDoc1 = await insertData(relatedModelDefinition.name, {
-                relatedName: `Rel1_Unique_${testSuffix}`, // Nom unique
-                relatedValue: 100
-            }, {}, currentTestUser, false);
-
-            const relatedDoc2 = await insertData(relatedModelDefinition.name, {
-                relatedName: `Rel2_Unique_${testSuffix}`, // Nom unique
-                relatedValue: 200
-            }, {}, currentTestUser, false);
-
-            // S'assurer que les insertions précédentes ont réussi avant de continuer
-            expect(relatedDoc1.success, "L'insertion du document lié 1 a échoué").toBe(true);
-            expect(relatedDoc2.success, "L'insertion du document lié 2 a échoué").toBe(true);
-
-            // --- FIN DU SETUP AMÉLIORÉ ---
-
-            const validData = {
-                stringRequired: 'Valid String',
-                stringUnique: `UniqueValueForInsert_${testSuffix}`, // Valeur unique garantie
-                stringMaxLength: '12345',
-                string_tLang: 'Bonjour',
-                richtextField: '<p>Valid rich text</p>',
-                passwordField: 'validPassword123',
-                emailField: 'valid@example.com',
-                phoneField: '+1234567890',
-                urlField: 'https://example.com',
-                number: 123,
-                numberMinMax: 15,
-                numberStep: 10.5,
-                booleanField: true,
-                dateField: '2023-07-15',
-                dateMinMax: '2023-06-01',
-                enumField: 'alpha',
-                arrayString: ['one', 'two'],
-                arrayNumber: [1, 2, 3],
-                arrayEnum: ['a'],
-                relationSingle: relatedDoc1.insertedIds[0].toString(),
-                relationMultiple: [relatedDoc1.insertedIds[0].toString(), relatedDoc2.insertedIds[0].toString()],
-                // Le mock de fichier est OK, pas besoin de le rendre unique
-                fileField: { name: 'test.png', type: 'image/png', size: 1024 * 5, guid: `dummy-guid-png-${testSuffix}` },
-                colorField: '#FF0000',
-                codeJsonField: { "key": "value" },
-                codeJsField: 'console.log("hello");',
-                objectField: { a: 1, b: "test" },
-                modelNameField: 'someModelName',
-                modelFieldNameField: { model: 'someModelName', field: 'someFieldName' }
-            };
-
-            const result = await insertData(comprehensiveTestModelDefinition.name, validData, {}, currentTestUser, false);
-            expect(result.success, `L'insertion principale a échoué: ${result.error}`).toBe(true);
-            expect(result.insertedIds).toHaveLength(1);
-
-            console.log(result);
-            const insertedDoc = await testDatasColInstance.findOne({ _id: new ObjectId(result.insertedIds[0]) });
-            expect(insertedDoc).not.toBeNull();
-            expect(insertedDoc.stringRequired).toBe('Valid String');
-            expect(insertedDoc.stringUnique).toBe(`UniqueValueForInsert_${testSuffix}`); // Vérifier la valeur unique
-            expect(insertedDoc.stringDefault).toBe('defaultString');
-            expect(new Date(insertedDoc.datetimeField).getFullYear()).toBe(new Date().getFullYear());
-            expect(insertedDoc.booleanDefault).toBe(true);
-            expect(insertedDoc.relationSingle.toString()).toBe(relatedDoc1.insertedIds[0].toString());
-
-            await purge();
-        }, 10000);
-
-        describe('Validations des champs à l\'insertion', () => {
-            // --- STRING VALIDATIONS ---
-            it('devrait rejeter un string requis non fourni', async () => {
-                const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await setupTestContext();
-                const result = await insertData(comprehensiveTestModelDefinition.name, { stringUnique: 'test' /* stringRequired manquant */ }, {}, currentTestUser, false);
-                expect(result.success).toBe(false);
-                expect(result.error).toContain('stringRequired');
-                await purge();
-            });
-
-            it('devrait rejeter un string trop long pour maxlength', async () => {
-                const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await setupTestContext();
-                const result = await insertData(comprehensiveTestModelDefinition.name, { stringRequired: 'req', stringMaxLength: '123456' }, {}, currentTestUser, false);
-                expect(result.success).toBe(false);
-                expect(result.error).toContain('stringMaxLength');
-                await purge();
-            });
-
-            it('devrait rejeter une valeur dupliquée pour un champ unique (stringUnique)', async () => {
-                const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await setupTestContext();
-                await insertData(comprehensiveTestModelDefinition.name, { stringRequired: 'req1', stringUnique: 'duplicateMe', 'passwordField': 'pass', number: 1, enumField: 'test' }, {}, currentTestUser, false);
-                const result = await insertData(comprehensiveTestModelDefinition.name, { stringRequired: 'req2', stringUnique: 'duplicateMe', 'passwordField': 'pass', number: 1, enumField: 'test' }, {}, currentTestUser, false);
-                expect(result.success).toBe(false);
-                await purge();
-            });
-
-            // --- NUMBER VALIDATIONS ---
-            it('devrait rejeter un number non numérique', async () => {
-                const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await setupTestContext();
-                const result = await insertData(comprehensiveTestModelDefinition.name, { stringRequired: 'req', number: 'not-a-number' }, {}, currentTestUser, false);
-                expect(result.success).toBe(false);
-                expect(result.error).toContain('number');
-                await purge();
-            });
-
-            it('devrait rejeter un number infur à min (numberMinMax)', async () => {
-                const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await setupTestContext();
-                const result = await insertData(comprehensiveTestModelDefinition.name, { stringRequired: 'req', numberMinMax: 5 }, {}, currentTestUser, false);
-                expect(result.success).toBe(false);
-                expect(result.error).toContain('numberMinMax');
-                await purge();
-            });
-
-            it('devrait rejeter un number supérieur à max (numberMinMax)', async () => {
-                const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await setupTestContext();
-                const result = await insertData(comprehensiveTestModelDefinition.name, { stringRequired: 'req', numberMinMax: 25 }, {}, currentTestUser, false);
-                expect(result.success).toBe(false);
-                expect(result.error).toContain('numberMinMax');
-                await purge();
-            });
-
-            // --- ARRAY VALIDATIONS ---
-            it('devrait rejeter un array avec trop d\'items (arrayString maxItems: 2)', async () => {
-                const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await setupTestContext();
-                const result = await insertData(comprehensiveTestModelDefinition.name, { stringRequired: 'req', arrayString: ['a', 'b', 'c'] }, {}, currentTestUser, false);
-                expect(result.success).toBe(false);
-                expect(result.error).toContain('arrayString');
-                await purge();
-            });
-
-            it('devrait rejeter un array avec pas assez d\'items (arrayNumber minItems: 1)', async () => {
-                const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await setupTestContext();
-                const result = await insertData(comprehensiveTestModelDefinition.name, { stringRequired: 'req', arrayNumber: [] }, {}, currentTestUser, false);
-                expect(result.success).toBe(false);
-                expect(result.error).toContain('arrayNumber');
-                await purge();
-            });
-
-            it('devrait rejeter un array avec un item de type incorrect (arrayNumber)', async () => {
-                const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await setupTestContext();
-                const result = await insertData(comprehensiveTestModelDefinition.name, { stringRequired: 'req', arrayNumber: [1, 'not-a-number', 3] }, {}, currentTestUser, false);
-                expect(result.success).toBe(false);
-                expect(result.error).toContain('arrayNumber');
-                await purge();
-            });
-
-            // --- FILE VALIDATIONS (metadata) ---
-            it('devrait rejeter un file avec un mimeType non autorisé', async () => {
-                const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await setupTestContext();
-                const mockFile = { name: 'test.txt', type: 'text/csv', size: 1024, guid: 'dummy-txt' };
-                const result = await insertData(comprehensiveTestModelDefinition.name, { stringRequired: 'req', fileField: mockFile }, {}, currentTestUser, false);
-                expect(result.success).toBe(false);
-                expect(result.error).toContain('image/png'); // Ou un message plus spécifique sur mimeTypes
-                expect(result.error).toContain('text/plain'); // Ou un message plus spécifique sur mimeTypes
-                await purge();
-            });
-
-            it('devrait rejeter un file avec une taille supérieure à maxSize', async () => {
-                const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await setupTestContext();
-                const mockFile = { name: 'large.png', type: 'image/png', size: 1024 * 15, guid: 'dummy-large' }; // 15KB > 10KB
-                const result = await insertData(comprehensiveTestModelDefinition.name, { stringRequired: 'req', fileField: mockFile }, {}, currentTestUser, false);
-                expect(result.success).toBe(false);
-                expect(result.error).toContain('fileField'); // Ou un message plus spécifique sur maxSize
-                await purge();
-            });
-
-            // --- EMAIL, URL, PHONE, COLOR (basic format) ---
-            it('devrait rejeter un email invalide', async () => {
-                const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await setupTestContext();
-                const result = await insertData(comprehensiveTestModelDefinition.name, { stringRequired: 'req', emailField: 'not-an-email' }, {}, currentTestUser, false);
-                expect(result.success).toBe(false);
-                expect(result.error).toContain('emailField');
-                await purge();
-            });
-            it('devrait rejeter une URL invalide', async () => {
-                const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await setupTestContext();
-                const result = await insertData(comprehensiveTestModelDefinition.name, { stringRequired: 'req', urlField: 'not a url' }, {}, currentTestUser, false);
-                expect(result.success).toBe(false);
-                expect(result.error).toContain('urlField');
-                await purge();
-            });
-            it('devrait rejeter une couleur invalide', async () => {
-                const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await setupTestContext();
-                const result = await insertData(comprehensiveTestModelDefinition.name, { stringRequired: 'req', colorField: '#GGHHII' }, {}, currentTestUser, false);
-                expect(result.success).toBe(false);
-                expect(result.error).toContain('colorField');
-                await purge();
-            });
-
-            // --- DATE / DATETIME VALIDATIONS ---
-            it('devrait rejeter une date invalide (format)', async () => {
-                const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await setupTestContext();
-                const result = await insertData(comprehensiveTestModelDefinition.name, { stringRequired: 'req', dateField: 'not-a-date' }, {}, currentTestUser, false);
-                expect(result.success).toBe(false);
-                expect(result.error).toContain('dateField');
-                await purge();
-            });
-            it('devrait rejeter une date en dehors de min/max (dateMinMax)', async () => {
-                const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await setupTestContext();
-                const result = await insertData(comprehensiveTestModelDefinition.name, { stringRequired: 'req', dateMinMax: '2024-01-01' }, {}, currentTestUser, false);
-                expect(result.success).toBe(false);
-                expect(result.error).toContain('dateMinMax');
-                await purge();
-            });
-
-            // TODO: Ajouter des tests pour les autres types et contraintes (password, richtext, code, object, model, modelField)
-            // Pour 'code' avec language 'json', tester l'insertion d'un JSON invalide si la validation va jusque-là.
-            // Pour 'relation', tester l'insertion d'un ObjectId non existant (si la validation vérifie l'existence).
-        });
-
-        // --- NOUVEAU TEST POUR $find ---
-        it('devrait insérer des données avec des relations référencées par $find', async () => {
-            // 1. Insérer les documents liés qui seront trouvés par $find
-            const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await setupTestContext();
-            const relatedDocA = await insertData(relatedModelDefinition.name, { relatedName: 'FindMeA', relatedValue: 111 }, {}, currentTestUser, false);
-            const relatedDocB = await insertData(relatedModelDefinition.name, { relatedName: 'FindMeB', relatedValue: 222 }, {}, currentTestUser, false);
-            const relatedDocC = await insertData(relatedModelDefinition.name, { relatedName: 'FindMeC', relatedValue: 222 }, {}, currentTestUser, false);
-
-            const relatedIdA = relatedDocA.insertedIds[0];
-            const relatedIdB = relatedDocB.insertedIds[0];
-            const relatedIdC = relatedDocC.insertedIds[0];
-
-            // 2. Prr les données du document principal utilisant $find
-            const dataWithFindRelations = {
-                stringRequired: 'DocWithFind',
-                stringUnique: 'UniqueFindValue',
-                passwordField: 'findPass',
-                enumField: 'beta',
-                number: 99,
-                // Utiliser $find pour la relation simple
-                relationSingle: { $find: { $eq: ["$relatedName", 'FindMeA'] } },
-                // Utiliser un tableau de $find pour la relation multiple
-                relationMultiple: { $find: { $eq: ["$relatedValue", 222] } },
-                // Inclure d'autres champs requis ou avec défauts si nécessaire
-                stringMaxLength: 'short',
-                emailField: 'find@example.com',
-                phoneField: '+19876543210',
-                urlField: 'https://find.example.com',
-                numberMinMax: 18,
-                dateField: '2023-11-20',
-                dateMinMax: '2023-11-20',
-                arrayNumber: [10],
-                fileField: { name: 'find.png', type: 'image/png', size: 1024, guid: 'dummy-find-png' },
-                colorField: '#123456',
-                codeJsonField: { "find": true },
-                codeJsField: 'console.log("find");',
-                objectField: { find: "test" },
-                modelNameField: 'findModel',
-                modelFieldNameField: { model: 'findModel', field: 'findField' }
-            };
-
-            // 3. Insérer le document principal
-            const result = await insertData(comprehensiveTestModelDefinition.name, dataWithFindRelations, {}, currentTestUser, false);
-
-            // 4. Vérifier le résultat de l'insertion
-            expect(result.success, `Insertion with $find failed: ${result.error}`).toBe(true);
-            expect(result.insertedIds).toHaveLength(1);
-
-            // 5. Récupérer le document inséré depuis la base de données
-            const insertedDoc = await testDatasColInstance.findOne({ _id: new ObjectId(result.insertedIds[0]) });
-            expect(insertedDoc).not.toBeNull();
-
-            console.log({insertedDoc: insertedDoc, relatedIdB})
-            expect(insertedDoc.relationSingle).toBe(relatedIdA.toString());
-
-            expect(insertedDoc.relationMultiple).toBeInstanceOf(Array);
-            expect(insertedDoc.relationMultiple).toHaveLength(2);
-            // Convertir les ObjectIds en string pour une comparaison facile
-            const insertedRelationMultipleIds = insertedDoc.relationMultiple.map(id => id.toString());
-            expect(insertedRelationMultipleIds).toContain(relatedIdB.toString());
-            expect(insertedRelationMultipleIds).toContain(relatedIdC.toString());
-
-            // Vérifier d'autres champs pour s'assurer que le reste des données est correct
-            expect(insertedDoc.stringRequired).toBe('DocWithFind');
-            expect(insertedDoc.enumField).toBe('beta');
-
-            await purge();
-        }, 10000); // Augmenter le timeout si nécessaire
-
-        it('devrait insérer des données avec un nouveau fichier et le sauvegarder', async () => {
-            const { currentTestUser, comprehensiveTestModelDefinition, purge } = await setupTestContext();
-
-            // --- Simuler un vrai fichier uploadé comme le ferait formidable/multer ---
-            const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), 'data-primals-test-'));
-            const filePath = path.join(tmpDir, 'test-upload.txt');
-            const fileContent = 'Ceci est un vrai test de fichier binaire.';
-            await fs.writeFile(filePath, fileContent);
-            const stats = await fs.stat(filePath);
-
-            const uploadedFile = {
-                filepath: filePath,
-                originalFilename: 'test-upload-on-insert.txt',
-                mimetype: 'text/plain',
-                size: stats.size,
-                lastModifiedDate: new Date(),
-                hash: 'test-hash' // Optionnel, mais souvent présent
-            };
-            // --- Fin de la simulation ---
-
-            const dataWithFile = {
-                stringRequired: 'DocWithNewFile',
-                stringUnique: 'UniqueFileValueForInsert',
-                passwordField: 'filePass',
-                enumField: 'gamma',
-                number: 123
-                // Le champ 'fileField' est absent ici, il sera fourni dans l'objet 'files'
-            };
-
-            const result = await insertData(comprehensiveTestModelDefinition.name, dataWithFile, { 'fileField[0]': uploadedFile }, currentTestUser, false);
-
-            expect(result.success, `L'insertion avec un nouveau fichier a échoué: ${result.error}`).toBe(true);
-            expect(result.insertedIds).toHaveLength(1);
-
-            const query = await searchData( { model: comprehensiveTestModelDefinition.name, filter: { _id: new ObjectId(result.insertedIds[0])}}, currentTestUser);
-            const insertedDoc = query.data[0];
-            expect(insertedDoc).not.toBeNull();
-            console.log(insertedDoc.fileField)
-            expect(insertedDoc.fileField).toBeInstanceOf(Object);
-            expect(insertedDoc.fileField.newFile).toBeUndefined(); // La propriété 'newFile' était une hallucination
-            expect(insertedDoc.fileField._id).toBeDefined();
-            expect(insertedDoc.fileField.name).toBe('test-upload-on-insert.txt');
-            expect(insertedDoc.fileField.guid).toBeDefined();
-
-            await removeFile(insertedDoc.fileField.guid, currentTestUser);
-
-            // Nettoyage du répertoire et fichier temporaire
-            await fs.rm(tmpDir, { recursive: true, force: true });
-            await purge();
-        });
-    });
-
-    describe('editData avec comprehensiveTestModel', async () => {
-        let docToEditId;
-        let relatedDocId;
-
-        const initTest = async () => {
-            const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await setupTestContext();
-            // Insert a base document and a related document to be used in edit tests
-            const relatedInsert = await insertData(relatedModelDefinition.name, { relatedName: 'RelForEdit', relatedValue: 50 }, {}, currentTestUser, false);
-            relatedDocId = relatedInsert.insertedIds[0];
-
-            const initialData = {
-                stringRequired: 'Initial',
-                stringUnique: 'UniqueForEdit',
-                enumField: 'alpha',
-                passwordField: 'initialPass',
-                relationSingle: relatedDocId
-            };
-            const insertResult = await insertData(comprehensiveTestModelDefinition.name, initialData, {}, currentTestUser, false);
-            docToEditId = insertResult.insertedIds[0];
-
-            return { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge };
-        };
-        it('devrait modifier des données valides', async () => {
-            const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await initTest();
-            const dataToEdit = { stringRequired: 'Edited String', numberMinMax: 12 };
-            const result = await editData(comprehensiveTestModelDefinition.name, docToEditId, dataToEdit, {}, currentTestUser);
-
-            expect(result.success, `Edit failed: ${result.error}`).toBe(true);
-            expect(result.modifiedCount).toBe(1);
-
-            const editedDoc = await testDatasColInstance.findOne({ _id: new ObjectId(docToEditId) });
-            expect(editedDoc.stringRequired).toBe('Edited String');
-            expect(editedDoc.numberMinMax).toBe(12);
-
-            await purge();
-        });
-
-        it('devrait rejeter une modification avec un string requis vide', async () => {
-            const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await initTest();
-            const result = await editData(comprehensiveTestModelDefinition.name, docToEditId, { stringRequired: '' }, {}, currentTestUser);
-            expect(result.success).toBe(false);
-            expect(result.error).toContain('stringRequired');
-
-            await purge();
-        });
-
-        it('devrait rejeter une modification avec un number hors des bornes (numberMinMax)', async () => {
-            const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await initTest();
-            const result = await editData(comprehensiveTestModelDefinition.name, docToEditId, { stringRequired: 'test', numberMinMax: 50 }, {}, currentTestUser);
-            expect(result.success).toBe(false);
-            expect(result.error).toContain('numberMinMax');
-            await purge();
-        });
-
-        it('devrait rejeter une modification qui viole une contrainte unique (stringUnique)', async ({skip}) => {
-            const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await initTest();
-            // Insert another doc to create the unique conflict
-
-            await insertData(comprehensiveTestModelDefinition.name, { stringRequired: 'Other', stringUnique: 'UniqueValue', enumField: 'beta', passwordField: 'pass' }, {}, currentTestUser, false);
-            // Insert another doc to create the unique conflict
-            const res1 = await insertData(comprehensiveTestModelDefinition.name, { stringRequired: 'Other', stringUnique: 'ExistingUniqueValue', enumField: 'beta', passwordField: 'pass' }, {}, currentTestUser, false);
-
-            const result = await editData(comprehensiveTestModelDefinition.name, { stringUnique: 'ExistingUniqueValue'}, { stringRequired: 'Other', stringUnique: 'UniqueValue', enumField: 'beta', passwordField: 'pass' }, {}, currentTestUser);
-            expect(result.success).toBe(false);
-            expect(result.error).toContain('UniqueValue');
-            expect(result.error).toContain('stringUnique');
-            await purge();
-        });
-
-        // TODO: Ajouter plus de tests de validation pour editData, similaires à ceux de insertData
-    });
-
-    describe('$push operation using patchData', () =>{
-        describe('$push sur tableau existant', () => {
-            let docToPatchId;
-            let setupContext;
-
-            beforeEach(async () => {
-                setupContext = await setupTestContext();
-                const { currentTestUser, comprehensiveTestModelDefinition } = setupContext;
-
-                const initialData = {
-                    stringRequired: 'InitialForPush',
-                    stringUnique: 'UniqueForPush',
-                    enumField: 'alpha',
-                    passwordField: 'pushPass',
-                    arrayString: ['tag1'],
-                    arrayNumber: [100]
-                };
-                const insertResult = await insertData(comprehensiveTestModelDefinition.name, initialData, {}, currentTestUser, false);
-                docToPatchId = insertResult.insertedIds[0];
-            });
-
-            afterEach(async () => {
-                await setupContext.purge();
-            });
-
-            it('devrait ajouter une seule valeur à un tableau existant', async () => {
-                const { currentTestUser, comprehensiveTestModelDefinition } = setupContext;
-
-                const result = await patchData(comprehensiveTestModelDefinition.name, { _id: docToPatchId }, { arrayString: { $push: 'tag2' } }, {}, currentTestUser);
-
-                expect(result.success, `patchData avec $push a échoué: ${result.error}`).toBe(true);
-                expect(result.modifiedCount).toBe(1);
-
-                const patchedDoc = await testDatasColInstance.findOne({ _id: new ObjectId(docToPatchId) });
-                expect(patchedDoc.arrayString).toEqual(['tag1', 'tag2']);
-            });
-
-            it('devrait ajouter plusieurs valeurs à un tableau existant', async () => {
-                const { currentTestUser, comprehensiveTestModelDefinition } = setupContext;
-
-                const result = await patchData(comprehensiveTestModelDefinition.name, { _id: docToPatchId }, { arrayNumber: { $push: [200, 300] } }, {}, currentTestUser);
-
-                expect(result.success, `patchData avec $push multiple a échoué: ${result.error}`).toBe(true);
-                expect(result.modifiedCount).toBe(1);
-
-                const patchedDoc = await testDatasColInstance.findOne({ _id: new ObjectId(docToPatchId) });
-                expect(patchedDoc.arrayNumber).toEqual([100, 200, 300]);
-            });
-
-            it('devrait rejeter un push si la valeur est invalide', async () => {
-                const { currentTestUser, comprehensiveTestModelDefinition } = setupContext;
-
-                // Tenter de pusher un nombre dans un tableau de strings
-                const result = await patchData(comprehensiveTestModelDefinition.name, { _id: docToPatchId }, { arrayString: { $push: 12345 } }, {}, currentTestUser);
-
-                expect(result.success).toBe(false);
-                expect(result.error).toContain("Valeur invalide fournie pour le tableau 'arrayString'");
-            });
-
-            it('devrait rejeter un push si une des valeurs du tableau est invalide', async () => {
-                const { currentTestUser, comprehensiveTestModelDefinition } = setupContext;
-
-                // Tenter de pusher un tableau contenant une valeur invalide
-                const result = await patchData(comprehensiveTestModelDefinition.name, { _id: docToPatchId }, { arrayNumber: { $push: [400, 'not-a-number', 500] } }, {}, currentTestUser);
-
-                expect(result.success).toBe(false);
-                expect(result.error).toContain("Valeur invalide fournie pour le tableau 'arrayNumber'");
-            });
-
-        });
-        describe('$push sur un tableau inexistant', () => {
-            it('devrait créer le tableau et pusher les valeurs s\'il n\'existe pas', async () => {
-            // On utilise un setup de contexte complètement isolé pour ce test
-                const { currentTestUser, comprehensiveTestModelDefinition, purge } = await setupTestContext();
-
-                const initialData = { stringRequired: 'NoArrayField', stringUnique: 'UniqueForNoArrayPush', enumField: 'beta', passwordField: 'pass' };
-                const insertResult = await insertData(comprehensiveTestModelDefinition.name, initialData, {}, currentTestUser, false);
-                const newDocId = insertResult.insertedIds[0];
-
-                const result = await patchData(comprehensiveTestModelDefinition.name, { _id: newDocId }, { arrayString: { $push: ['first', 'second'] } }, {}, currentTestUser);
-
-                expect(result.success, `patchData sur un tableau inexistant a échoué: ${result.error}`).toBe(true);
-                expect(result.modifiedCount).toBe(1);
-
-                const patchedDoc = await testDatasColInstance.findOne({ _id: new ObjectId(newDocId) });
-                expect(patchedDoc.arrayString).toEqual(['first', 'second']);
-                await purge();
-            });
-        });
-    });
-
-    // --- Tests deleteData (repris de votre exemple, peuvent être gardés tels quels ou adaptés) ---
-    describe('deleteData (tests existants)', () => {
-        it('supprimer des données par ID (deleteData)', async () => {
-            const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await setupTestContext();
-            const dataToDelete = { name: 'Objet à supprimer', value: 300 };
-            // Utiliser le modèle simple pour ces tests delete pour ne pas avoir à remplir tous les champs requis de comprehensive
-            const simpleModel = { name: 'simpleDeleteModel', _user: currentTestUser.username, description: '', fields: [{ name: 'name', type: 'string' }, { name: 'value', type: 'number' }] };
-            await testModelsColInstance.insertOne(simpleModel);
-
-            const insertResult = await insertData(simpleModel.name, dataToDelete, {}, currentTestUser, false);
-            const docId = insertResult.insertedIds[0];
-
-            const deleteResult = await deleteData(simpleModel.name, [docId], currentTestUser);
-
-            expect(deleteResult.success).toBe(true);
-            expect(deleteResult.deletedCount).toBe(1);
-
-            const deletedDoc = await testDatasColInstance.findOne({ _id: new ObjectId(docId) });
-            expect(deletedDoc).toBeNull();
-            await purge();
-            await purge();
-        });
-
-        it('supprimer des données par filtre (deleteData)', async () => {
-            const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await setupTestContext();
-            const simpleModel = { name: 'deleteModelTest', _user: currentTestUser.username, description: '',fields: [{ name: 'name', type: 'string' }, { name: 'value', type: 'number' }] };
-            await testModelsColInstance.insertOne(simpleModel);
-
-            await insertData(simpleModel.name, { name: 'Item Filtrable 1', value: 401 }, {}, currentTestUser, false);
-            await insertData(simpleModel.name, { name: 'Item Filtrable 2', value: 402 }, {}, currentTestUser, false);
-            await insertData(simpleModel.name, { name: 'Autre Item', value: 403 }, {}, currentTestUser, false);
-
-            const filter = { $regexMatch: {
-                input: '$name',
-                regex: "^Item Filtrable"
-            } };
-            const deleteResult = await deleteData(simpleModel.name, filter, currentTestUser);
-
-            expect(deleteResult.success).toBe(true);
-            expect(deleteResult.deletedCount).toBe(2);
-
-            const remainingCount = await testDatasColInstance.countDocuments({ _user: currentTestUser.username, _model: simpleModel.name, name: { $regex: "^Item Filtrable" } });
-            expect(remainingCount).toBe(0);
-            const totalRemaining = await testDatasColInstance.countDocuments({ _user: currentTestUser.username, _model: simpleModel.name });
-            expect(totalRemaining).toBe(1);
-            await purge();
-        });
-    });
-
-    describe('searchData avec comprehensiveTestModel et filtres $find', async () => {
-        let docId1, docId2;
-        let relatedDocId_A1, relatedDocId_A2, relatedDocId_B1;
-
-        const initTest =async () => {
-            const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await setupTestContext();
-
-            // Insérer des documents liés
-            const relA1 = await insertData(relatedModelDefinition.name, { relatedName: 'Rel_Search_A1', relatedValue: 101 }, {}, currentTestUser, false);
-            relatedDocId_A1 = relA1.insertedIds[0].toString();
-            const relA2 = await insertData(relatedModelDefinition.name, { relatedName: 'Rel_Search_A2', relatedValue: 102 }, {}, currentTestUser, false);
-            relatedDocId_A2 = relA2.insertedIds[0].toString();
-            const relB1 = await insertData(relatedModelDefinition.name, { relatedName: 'Rel_Search_B1', relatedValue: 201 }, {}, currentTestUser, false);
-            relatedDocId_B1 = relB1.insertedIds[0].toString();
-
-            // Insérer des documents principaux
-            const data1 = {
-                stringRequired: 'SearchDoc1',
-                stringUnique: 'UniqueSearch1',
-                enumField: 'alpha',
-                passwordField: 'searchPass1',
-                relationSingle: relatedDocId_A1,
-                relationMultiple: [relatedDocId_A1, relatedDocId_A2],
-                number: 10
-            };
-            const insertResult1 = await insertData(comprehensiveTestModelDefinition.name, data1, {}, currentTestUser, false);
-            docId1 = insertResult1.insertedIds[0].toString();
-
-            const data2 = {
-                stringRequired: 'SearchDoc2',
-                stringUnique: 'UniqueSearch2',
-                enumField: 'beta',
-                passwordField: 'searchPass2',
-                relationSingle: relatedDocId_B1,
-                relationMultiple: [relatedDocId_B1],
-                number: 20
-            };
-            const insertResult2 = await insertData(comprehensiveTestModelDefinition.name, data2, {}, currentTestUser, false);
-            docId2 = insertResult2.insertedIds[0].toString();
-
-            return { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge };
-        };
-
-        it('devrait trouver un document par une condition sur une relation simple ($find)', async () => {
-            const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await initTest();
-            const searchParams = {
-                model: comprehensiveTestModelDefinition.name,
-                filter: {
-                    relationSingle: {
-                        "$find": { "$and": [{"$eq": ["$$this.relatedValue", 101]}] }
-                    }
-                },
-                autoExpand: true,
-                depth: 8
-            };
-            const { data, count } = await searchData(searchParams, currentTestUser);
-            expect(count).toBe(1);
-            expect(data).toHaveLength(1);
-            expect(data[0]._id.toString()).toBe(docId1.toString());
-            // Vérifier que la relation est bien populée si depth > 0
-            expect(data[0].relationSingle).toBeInstanceOf(Object);
-            expect(data[0].relationSingle.relatedName).toBe('Rel_Search_A1');
-            await purge();
-        });
-
-        it('ne devrait pas trouver de document si la condition $find sur relation simple ne correspond pas', async () => {
-            const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await initTest();
-            const searchParams = {
-                model: comprehensiveTestModelDefinition.name,
-                filter: {
-                    relationSingle: {
-                        "$find": { "$eq": ["$$this.relatedName", "NonExistentRelName"] }
-                    }
-                },
-                depth: 1
-            };
-            const { data, count } = await searchData(searchParams, currentTestUser);
-            expect(count).toBe(0);
-            expect(data).toHaveLength(0);
-            await purge();
-        });
-
-        it('devrait trouver des documents par une condition sur une relation multiple ($find)', async () => {
-            const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await initTest();
-            const searchParams = {
-                model: comprehensiveTestModelDefinition.name,
-                filter: {
-                    $and: [{$ne:["$stringRequired", null]}, {
-                        relationMultiple: { // Le champ qui est un tableau de relations
-                            "$find": {"$eq": ["$$this.relatedValue", 102]} // Condition sur les documents liés
-                        }
-                    }]
-                },
-                depth: 1
-            };
-            const { data, count } = await searchData(searchParams, currentTestUser);
-            expect(count).toBe(1);
-            expect(data).toHaveLength(1);
-            expect(data[0]._id.toString()).toBe(docId1.toString());
-            // Note: searchData with depth > 0 will populate the relationMultiple array
-            expect(data[0].relationMultiple).toBeInstanceOf(Array);
-            expect(data[0].relationMultiple.some(rel => rel.relatedValue === 102)).toBe(true);
-            await purge();
-        });
-
-
-        it('devrait trouver des documents en combinant un filtre normal et un filtre $find', async () => {
-            const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await initTest();
-            const searchParams = {
-                model: comprehensiveTestModelDefinition.name,
-                filter: {
-                    stringRequired: "SearchDoc1", // Filtre sur le modèle principal
-                    relationSingle: {
-                        "$find": {"$gt": ["$$this.relatedValue", 100] } // Filtre sur la relation
-                    }
-                },
-                depth: 1
-            };
-            const { data, count } = await searchData(searchParams,currentTestUser);
-            expect(count).toBe(1);
-            expect(data).toHaveLength(1);
-            expect(data[0]._id.toString()).toBe(docId1.toString());
-            await purge();
-        });
-
-        it('devrait retourner un tableau vide si $find ne correspond à aucun document lié', async () => {
-            const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await initTest();
-            const searchParams = {
-                model: comprehensiveTestModelDefinition.name,
-                filter: {
-                    relationMultiple: {
-                        "$find": { "$eq": ["$$this.relatedName", "NonExistentRelNameForMultiple"] }
-                    }
-                },
-                depth: 1
-            };
-            const { data, count } = await searchData(searchParams,currentTestUser);
-            expect(count).toBe(0);
-            expect(data).toHaveLength(0);
-            await purge();
-        });
-
-        // --- NOUVEAUX TESTS POUR LE SHORTHAND $find ---
-
-        it('devrait trouver un document en utilisant un filtre $find simple (shorthand)', async () => {
-            const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await initTest();
-            const searchParams = {
-                model: comprehensiveTestModelDefinition.name,
-                filter: {
-                    relationSingle: {
-                        "$find": { "relatedValue": 101 } // Utilisation du shorthand { champ: valeur }
-                    }
-                },
-                depth: 1
-            };
-            const { data, count } = await searchData(searchParams, currentTestUser);
-            expect(count).toBe(1);
-            expect(data).toHaveLength(1);
-            expect(data[0]._id.toString()).toBe(docId1.toString());
-            await purge();
-        });
-
-        it('devrait trouver un document en utilisant un filtre $find simple avec plusieurs conditions (AND implicite)', async () => {
-            const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await initTest();
-            const searchParams = {
-                model: comprehensiveTestModelDefinition.name,
-                filter: {
-                    relationSingle: {
-                        "$find": {
-                            "relatedName": "Rel_Search_A1",
-                            "relatedValue": 101
-                        }
-                    }
-                },
-                depth: 1
-            };
-            const { data, count } = await searchData(searchParams, currentTestUser);
-            expect(count).toBe(1);
-            expect(data).toHaveLength(1);
-            expect(data[0]._id.toString()).toBe(docId1.toString());
-            await purge();
-        });
-
-        it('ne devrait pas trouver de document si une des conditions du $find simple échoue', async () => {
-            const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await initTest();
-            const searchParams = {
-                model: comprehensiveTestModelDefinition.name,
-                filter: {
-                    relationSingle: {
-                        "$find": {
-                            "relatedName": "Rel_Search_A1", // Correspond
-                            "relatedValue": 999 // Ne correspond pas
-                        }
-                    }
-                },
-                depth: 1
-            };
-            const { data, count } = await searchData(searchParams, currentTestUser);
-            expect(count).toBe(0);
-            expect(data).toHaveLength(0);
-            await purge();
-        });
-
-        it('devrait trouver un document via une relation multiple en utilisant un filtre $find simple', async () => {
-            const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await initTest();
-            const searchParams = {
-                model: comprehensiveTestModelDefinition.name,
-                filter: {
-                    relationMultiple: {
-                        "$find": { "relatedValue": 102 } // Devrait trouver docId1 car il a une relation vers relA2
-                    }
-                },
-                depth: 1
-            };
-            const { data, count } = await searchData(searchParams, currentTestUser);
-            expect(count).toBe(1);
-            expect(data).toHaveLength(1);
-            expect(data[0]._id.toString()).toBe(docId1.toString());
-            await purge();
-        });
-
-    });
-
-    describe('installPack', () => {
-        let testPacksColInstance;
-
-        beforeAll(() => {
-            // Note: l'initialisation est déjà faite dans le beforeAll global.
-            // On s'assure juste d'avoir une référence si on en a besoin spécifiquement ici.
-            // Si vous n'avez pas suivi l'étape 1, vous pouvez l'initialiser ici.
-            testPacksColInstance = getCollection('packs');
-        });
-
-        beforeEach(async () => {
-            // On supprime les données de ce test
-        });
-
-        it('devrait installer un pack, créer les modèles et insérer les données avec relations via $link', async () => {
-            const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await setupTestContext();
-            // 1. Définir le pack de données mock
-            const mockPack = {
-                private: false,
-                name: 'test-pack-for-install',
-                models: [
-                    {
-                        name: 'packUser',
-                        description: 'Modèle pour les utilisateurs du pack',
-                        fields: [
-                            { name: 'username', type: 'string', required: true, unique: true },
-                            { name: 'level', type: 'number', default: 1 }
-                        ]
-                    },
-                    {
-                        name: 'packItem',
-                        description: 'Modèle pour les items du pack',
-                        fields: [
-                            { name: 'itemName', type: 'string', required: true },
-                            { name: 'owner', type: 'relation', relation: 'packUser' }
-                        ]
-                    }
-                ],
-                data: {
-                    all: { // 'all' pour les données non spécifiques à une langue
-                        packUser: [
-                            { username: 'playerOne' },
-                            { username: 'playerTwo', level: 5 }
-                        ],
-                        packItem: [
-                            // La nouvelle syntaxe $link pour résoudre les relations
-                            { itemName: 'Sword', owner: { $link: { _model: 'packUser', username: 'playerOne' } } },
-                            { itemName: 'Shield', owner: { $link: { _model: 'packUser', username: 'playerTwo' } } }
-                        ]
-                    }
-                }
-            };
-
-            // 2. Insérer le pack dans la collection pour le rendre disponible au test
-            const packInsertResult = await testPacksColInstance.insertOne(mockPack);
-            const packId = packInsertResult.insertedId.toString();
-
-            // 3. Appeler la fonction à tester avec la nouvelle signature
-            const result = await installPack(packId, currentTestUser, 'en');
-
-            // 4. Assertions sur le résumé de l'installation
-            expect(result.success, `L'installation du pack a échoué: ${result.errors?.join('; ')}`).toBe(true);
-            expect(result.summary.models.installed).toHaveLength(2);
-            expect(result.summary.datas.inserted).toBe(4); // 2 utilisateurs + 2 items
-            expect(result.summary.datas.updated).toBe(2); // 2 items mis à jour avec la relation
-
-            // 5. Vérifier la création des modèles
-            const userModel = await testModelsColInstance.findOne({ name: 'packUser', _user: currentTestUser.username });
-            expect(userModel).not.toBeNull();
-            const itemModel = await testModelsColInstance.findOne({ name: 'packItem', _user: currentTestUser.username });
-            expect(itemModel).not.toBeNull();
-            expect(itemModel.fields.find(f => f.name === 'owner').relation).toBe('packUser');
-
-            // 6. Vérifier l'insertion des données
-            const insertedUsers = await testDatasColInstance.find({ _model: 'packUser', _user: currentTestUser.username }).toArray();
-            expect(insertedUsers).toHaveLength(2);
-            const insertedItems = await testDatasColInstance.find({ _model: 'packItem', _user: currentTestUser.username }).toArray();
-            expect(insertedItems).toHaveLength(2);
-
-            // 7. Vérifier la résolution des relations via $link
-            const playerOne = insertedUsers.find(u => u.username === 'playerOne');
-            const sword = insertedItems.find(i => i.itemName === 'Sword');
-            expect(sword.owner.toString()).toBe(playerOne._id.toString());
-
-            const playerTwo = insertedUsers.find(u => u.username === 'playerTwo');
-            const shield = insertedItems.find(i => i.itemName === 'Shield');
-            expect(shield.owner.toString()).toBe(playerTwo._id.toString());
-            await purge();
-        }, 10000);
-
-        it("ne devrait installer que les modèles valides d'un pack et rapporter les erreurs", async () => {
-            const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await setupTestContext();
-            const mockPackWithInvalidModel = {
-                name: 'invalid-model-pack',
-                private: false,
-                models: [
-                    {
-                        // 'name' est requis, on l'omet pour causer une erreur
-                        description: 'Modèle invalide sans nom',
-                        fields: []
-                    },
-                    { // Un modèle valide pour s'assurer que l'installation continue
-                        name: 'validPackModel',
-                        description: 'Un modèle valide',
-                        fields: [{ name: 'title', type: 'string' }]
-                    }
-                ],
-                data: {}
-            };
-
-            const packInsertResult = await testPacksColInstance.insertOne(mockPackWithInvalidModel);
-            const packId = packInsertResult.insertedId.toString();
-
-            const result = await installPack(packId, currentTestUser, 'en');
-
-            // Le succès global est faux s'il y a des erreurs
-            expect(result.success).toBe(false);
-            expect(result.errors).toHaveLength(1);
-            expect(result.errors[0]).toContain("Failed to install model 'unknown'"); // Le nom est inconnu
-
-            // Vérifier le résumé de l'option
-            expect(result.summary.models.failed).toHaveLength(1);
-            expect(result.summary.models.failed[0]).toBe('unknown');
-            expect(result.summary.models.installed).toHaveLength(1);
-            expect(result.summary.models.installed[0]).toBe('validPackModel');
-
-            // Vérifier en BDD que le modèle valide a bien été créé
-            const validModel = await testModelsColInstance.findOne({ name: 'validPackModel', _user: currentTestUser.username });
-            expect(validModel).not.toBeNull();
-            await purge();
-        });
-
-        it('devrait correctement insérer des données JSON depuis un pack', async () => {
-            const { currentTestUser } = await setupTestContext();
-            // 1. Définir le pack avec des données JSON
-            const mockPackWithJson = {
-                name: 'test-pack-with-json',
-                private: false,
-                models: [
-                    {
-                        name: 'packConfig',
-                        description: 'Modèle avec un champ JSON',
-                        fields: [
-                            { name: 'configName', type: 'string', required: true },
-                            { name: 'settings', type: 'code', language: 'json' }
-                        ]
-                    }
-                ],
-                data: {
-                    all: {
-                        packConfig: [
-                            {
-                                configName: 'mainConfig',
-                                settings: {
-                                    theme: 'dark',
-                                    notifications: {
-                                        enabled: true,
-                                        level: 'important'
-                                    }
-                                }
-                            }
-                        ]
-                    }
-                }
-            };
-
-            // 2. Insérer le pack
-            const packInsertResult = await testPacksColInstance.insertOne(mockPackWithJson);
-            const packId = packInsertResult.insertedId.toString();
-
-            // 3. Appeler la fonction à tester
-            const result = await installPack(packId, currentTestUser, 'en');
-
-            // 4. Assertions
-            expect(result.success, `L'installation du pack JSON a échoué: ${result.errors?.join('; ')}`).toBe(true);
-            expect(result.summary.models.installed).toHaveLength(1);
-            expect(result.summary.datas.inserted).toBe(1);
-
-            // 5. Vérifier les données insérées en BDD
-            const datasCol = await getCollectionForUser(currentTestUser);
-            const insertedConfig = await datasCol.findOne({ _model: 'packConfig', _user: currentTestUser.username });
-
-            expect(insertedConfig).not.toBeNull();
-            expect(insertedConfig.configName).toBe('mainConfig');
-            expect(typeof insertedConfig.settings).toBe('object');
-            expect(insertedConfig.settings).toEqual({
-                theme: 'dark',
-                notifications: {
-                    enabled: true,
-                    level: 'important'
-                }
-            });
-
-            await getCollection('packs').deleteMany({ _id: packId});
-        });
-    });
-    // In test/data.integration.test.js
-
-    describe('relationFilter validation', () => {
-        let user;
-        let activeProductId, inactiveProductId;
-
-        // Model names are kept in French to match the database, but variables are in English.
-        const productModel = {
-            name: 'produitTestFiltre',
-            description: '',
-            fields: [
-                { name: 'name', type: 'string' },
-                { name: 'actif', type: 'boolean', default: false }
-            ]
-        };
-        const orderModel = {
-            name: 'commandeTestFiltre',
-            description: '',
-            fields: [
-                { name: 'ref', type: 'string' },
-                {
-                    name: 'produit',
-                    type: 'relation',
-                    relation: 'produitTestFiltre',
-                    relationFilter: { "$eq":["$actif", true] } // Only link active products
-                }
-            ]
-        };
-
-        // Set up the context once for all tests in this describe block.
-        beforeAll(async () => {
-            user = await engine.userProvider.findUserByUsername('demo');
-            // Cleanup before starting to ensure a clean state
-            await deleteModels({ name: productModel.name, _user: user.username });
-            await deleteModels({ name: orderModel.name, _user: user.username });
-            await deleteData(productModel.name, {}, user);
-            await deleteData(orderModel.name, {}, user);
-
-            // Create models
-            await createModel({ ...productModel, _user: user.username });
-            await createModel({ ...orderModel, _user: user.username });
-
-            // Create test data
-            const activeProduct = await insertData(productModel.name, { name: 'Active Product', actif: true }, {}, user);
-            const inactiveProduct = await insertData(productModel.name, { name: 'Inactive Product', actif: false }, {}, user);
-
-            activeProductId = activeProduct.insertedIds[0];
-            inactiveProductId = inactiveProduct.insertedIds[0];
-        });
-
-        // Clean up everything after all tests in this block have run.
-        afterAll(async () => {
-            await deleteModels({ name: productModel.name, _user: user.username });
-            await deleteModels({ name: orderModel.name, _user: user.username });
-            await deleteData(productModel.name, {}, user);
-            await deleteData(orderModel.name, {}, user);
-            const coll = await getCollectionForUser(user);
-            await coll.drop();
-        });
-
-        it('should ALLOW inserting data with a valid relation', async () => {
-            const result = await insertData(orderModel.name, { ref: 'CMD-OK', produit: activeProductId }, {}, user);
-            expect(result.success).toBe(true);
-            expect(result.insertedIds).toHaveLength(1);
-            // Cleanup the created order for test isolation
-            await deleteData(orderModel.name, result.insertedIds, user);
-        });
-
-        it('should REJECT inserting data with a relation that does not respect the filter', async () => {
-            const result = await insertData(orderModel.name, { ref: 'CMD-FAIL', produit: inactiveProductId }, {}, user);
-            expect(result.success).toBe(false);
-            expect(result.error).toContain('produit');
-        });
-
-        it('should ALLOW updating data with a valid relation', async () => {
-            // First, create a valid order
-            const initialOrder = await insertData(orderModel.name, { ref: 'CMD-TO-EDIT', produit: activeProductId }, {}, user);
-
-            // Update it (even with the same value, this tests the code path)
-            const result = await editData(orderModel.name, { _id: initialOrder.insertedIds[0] }, { produit: activeProductId }, {}, user);
-
-            expect(result.success).toBe(true);
-            // The hash might not change if only metadata like _updatedAt changes, so modifiedCount can be 0 or 1.
-            expect(result.modifiedCount).toBeGreaterThanOrEqual(0);
-
-            // Cleanup
-            await deleteData(orderModel.name, initialOrder.insertedIds, user);
-        });
-
-        it('should REJECT updating data with a relation that does not respect the filter', async () => {
-            // First, create a valid order
-            const initialOrder = await insertData(orderModel.name, { ref: 'CMD-TO-EDIT-FAIL', produit: activeProductId }, {}, user);
-
-            // Attempt to link it to an inactive product, expecting it to fail.
-            const result = await editData(orderModel.name, { _id: initialOrder.insertedIds[0] }, { produit: inactiveProductId }, {}, user);
-            expect(result.success).toBe(false);
-            expect(result.error).toContain('produit');
-            // Cleanup
-            await deleteData(orderModel.name, initialOrder.insertedIds, user);
-        });
-    });
-
+// __tests__/data.integration.test.js
+import { ObjectId } from 'mongodb';
+import {vi, expect, describe, it, afterEach,beforeEach, beforeAll, afterAll} from 'vitest';
+import fs from 'fs/promises';
+import path from 'path';
+import os from 'os';
+import { Config } from '../src/config.js';
+import {
+    insertData,
+    editData,
+    deleteData,
+    searchData, installPack, deleteModels, createModel, patchData
+} from '../src/index.js';
+
+import {
+    modelsCollection as getAppModelsCollection,
+    getCollection,
+    getCollectionForUser as getAppUserCollection, getCollectionForUser
+} from '../src/modules/mongodb.js';
+import {getRandom} from "../src/core.js";
+import {generateUniqueName, initEngine} from "../src/setenv.js";
+import {purgeData} from "../src/modules/data/data.history.js";
+import {removeFile} from "../src/modules/file.js";
+
+let testModelsColInstance;
+let testDatasColInstance;
+
+// Cette fonction va remplacer la logique de votre beforeEach pour la création de contexte
+async function setupTestContext() {
+
+    const currentTestModelName = generateUniqueName('relatedModel');
+    const currentRelatedModelName = generateUniqueName('comprehensiveModel');
+
+    // Créer un utilisateur unique pour ce test
+    const currentTestUser = {
+        username: generateUniqueName('testuserDataIntegration'),
+        userPlan: 'premium',
+        email: generateUniqueName('test') + '@example.com'
+    };
+
+    // Initialize collection instances after the engine is ready
+    testModelsColInstance = getAppModelsCollection;
+    testDatasColInstance = await getAppUserCollection(currentTestUser);
+
+    const relatedModelDefinition = {
+        name: currentRelatedModelName,
+        _user: currentTestUser.username,
+        description: 'Model for testing relations',
+        fields: [
+            {name: 'relatedName', type: 'string', required: true, unique: true},
+            {name: 'relatedValue', type: 'number'}
+        ],
+        maxRequestData: 10
+    };
+
+    const comprehensiveTestModelDefinition = {
+        name: currentTestModelName,
+        _user: currentTestUser.username,
+        description: 'A model with all field types and constraints for testing',
+        fields: [
+            // String types
+            {name: 'stringRequired', type: 'string', required: true, hint: 'A required string'},
+            {name: 'stringUnique', type: 'string', unique: true, hint: 'A unique string'},
+            {name: 'stringMaxLength', type: 'string', maxlength: 5, hint: 'String with max length 5'},
+            {name: 'stringDefault', type: 'string', default: 'defaultString'},
+            {name: 'string_tLang', type: 'string_t', hint: 'Localizable string'},
+            {name: 'richtextField', type: 'richtext', maxlength: 200},
+            {name: 'passwordField', type: 'password'},
+            {name: 'emailField', type: 'email'},
+            {name: 'phoneField', type: 'phone'},
+            {name: 'urlField', type: 'url'},
+            // Number types
+            {name: 'number', type: 'number'},
+            {name: 'numberMinMax', type: 'number', min: 10, max: 20},
+            {name: 'numberStep', type: 'number', step: 0.5},
+            {name: 'numberDefault', type: 'number', default: 42},
+            // Boolean
+            {name: 'booleanField', type: 'boolean'},
+            {name: 'booleanDefault', type: 'boolean', default: true},
+            // Date & Datetime
+            {name: 'dateField', type: 'date'},
+            {name: 'datetimeField', type: 'datetime', default: 'now'},
+            {name: 'dateMinMax', type: 'date', min: '2023-01-01', max: '2023-12-31'},
+            // Enum
+            {name: 'enumField', type: 'enum', items: ['alpha', 'beta', 'gamma']},
+            {name: 'enumDefault', type: 'enum', items: ['one', 'two'], default: 'one'},
+            // Array
+            {name: 'arrayString', type: 'array', itemsType: 'string', maxItems: 2},
+            {name: 'arrayNumber', type: 'array', itemsType: 'number', minItems: 1},
+            {name: 'arrayEnum', type: 'array', itemsType: 'enum', items: ['a', 'b']},
+            // Relation
+            {name: 'relationSingle', type: 'relation', relation: currentRelatedModelName},
+            {name: 'relationMultiple', type: 'relation', relation: currentRelatedModelName, multiple: true},
+            // File (metadata validation)
+            {name: 'fileField', type: 'file', mimeTypes: ['image/png', 'application/pdf', 'text/plain'], maxSize: 1024 * 10}, // 10KB
+            // Color
+            {name: 'colorField', type: 'color'},
+            // Code
+            {name: 'codeJsonField', type: 'code', language: 'json'},
+            {name: 'codeJsField', type: 'code', language: 'javascript', maxlength: 100},
+            // Object (simple validation, structure not deeply validated by default dataTypes.object)
+            {name: 'objectField', type: 'object'},
+            // Model & ModelField (validation of string format, not existence)
+            {name: 'modelNameField', type: 'model'},
+            {name: 'modelFieldNameField', type: 'modelField'} // Note: modelField type expects an object {model: 'modelName', field: 'fieldName'}
+        ],
+        maxRequestData: 50
+    };
+
+    if( await testModelsColInstance.find({ $or: [{name: comprehensiveTestModelDefinition.name}, {name: relatedModelDefinition.name}]})) {
+        // Insérer les modèles en base
+        await testModelsColInstance.insertMany([
+            comprehensiveTestModelDefinition,
+            relatedModelDefinition
+        ]);
+    }
+    await testDatasColInstance.deleteMany({ _user: currentTestUser.username });
+
+    const purge = async ()=>{
+        await purgeData(currentTestUser);
+    }
+
+    // Retourner toutes les variables nécessaires pour un test
+    return {
+        currentTestUser,
+        comprehensiveTestModelDefinition,
+        relatedModelDefinition,
+        purge
+    };
+}
+
+let engine;
+describe('Data integration tests (CRUD, validation...)', () => {
+
+    beforeAll(async () =>{
+        Config.Set("modules", ["mongodb", "data", "file", "bucket", "workflow","user", "assistant"]);
+        engine = await initEngine();
+
+    })
+    describe('insertData avec comprehensiveTestModel', () => {
+        it('devrait insérer des données valides pour tous les types de champs', async () => {
+
+            const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await setupTestContext();
+            // 1. Créer un suffixe unique pour cette exécution de test
+            const testSuffix = getRandom(1000, 9999); // Génère un nombre aléatoire
+
+            // 2. Insérer les documents liés avec des noms uniques garantis
+            const relatedDoc1 = await insertData(relatedModelDefinition.name, {
+                relatedName: `Rel1_Unique_${testSuffix}`, // Nom unique
+                relatedValue: 100
+            }, {}, currentTestUser, false);
+
+            const relatedDoc2 = await insertData(relatedModelDefinition.name, {
+                relatedName: `Rel2_Unique_${testSuffix}`, // Nom unique
+                relatedValue: 200
+            }, {}, currentTestUser, false);
+
+            // S'assurer que les insertions précédentes ont réussi avant de continuer
+            expect(relatedDoc1.success, "L'insertion du document lié 1 a échoué").toBe(true);
+            expect(relatedDoc2.success, "L'insertion du document lié 2 a échoué").toBe(true);
+
+            // --- FIN DU SETUP AMÉLIORÉ ---
+
+            const validData = {
+                stringRequired: 'Valid String',
+                stringUnique: `UniqueValueForInsert_${testSuffix}`, // Valeur unique garantie
+                stringMaxLength: '12345',
+                string_tLang: 'Bonjour',
+                richtextField: '<p>Valid rich text</p>',
+                passwordField: 'validPassword123',
+                emailField: 'valid@example.com',
+                phoneField: '+1234567890',
+                urlField: 'https://example.com',
+                number: 123,
+                numberMinMax: 15,
+                numberStep: 10.5,
+                booleanField: true,
+                dateField: '2023-07-15',
+                dateMinMax: '2023-06-01',
+                enumField: 'alpha',
+                arrayString: ['one', 'two'],
+                arrayNumber: [1, 2, 3],
+                arrayEnum: ['a'],
+                relationSingle: relatedDoc1.insertedIds[0].toString(),
+                relationMultiple: [relatedDoc1.insertedIds[0].toString(), relatedDoc2.insertedIds[0].toString()],
+                // Le mock de fichier est OK, pas besoin de le rendre unique
+                fileField: { name: 'test.png', type: 'image/png', size: 1024 * 5, guid: `dummy-guid-png-${testSuffix}` },
+                colorField: '#FF0000',
+                codeJsonField: { "key": "value" },
+                codeJsField: 'console.log("hello");',
+                objectField: { a: 1, b: "test" },
+                modelNameField: 'someModelName',
+                modelFieldNameField: { model: 'someModelName', field: 'someFieldName' }
+            };
+
+            const result = await insertData(comprehensiveTestModelDefinition.name, validData, {}, currentTestUser, false);
+            expect(result.success, `L'insertion principale a échoué: ${result.error}`).toBe(true);
+            expect(result.insertedIds).toHaveLength(1);
+
+            console.log(result);
+            const insertedDoc = await testDatasColInstance.findOne({ _id: new ObjectId(result.insertedIds[0]) });
+            expect(insertedDoc).not.toBeNull();
+            expect(insertedDoc.stringRequired).toBe('Valid String');
+            expect(insertedDoc.stringUnique).toBe(`UniqueValueForInsert_${testSuffix}`); // Vérifier la valeur unique
+            expect(insertedDoc.stringDefault).toBe('defaultString');
+            expect(new Date(insertedDoc.datetimeField).getFullYear()).toBe(new Date().getFullYear());
+            expect(insertedDoc.booleanDefault).toBe(true);
+            expect(insertedDoc.relationSingle.toString()).toBe(relatedDoc1.insertedIds[0].toString());
+
+            await purge();
+        }, 10000);
+
+        describe('Validations des champs à l\'insertion', () => {
+            // --- STRING VALIDATIONS ---
+            it('devrait rejeter un string requis non fourni', async () => {
+                const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await setupTestContext();
+                const result = await insertData(comprehensiveTestModelDefinition.name, { stringUnique: 'test' /* stringRequired manquant */ }, {}, currentTestUser, false);
+                expect(result.success).toBe(false);
+                expect(result.error).toContain('stringRequired');
+                await purge();
+            });
+
+            it('devrait rejeter un string trop long pour maxlength', async () => {
+                const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await setupTestContext();
+                const result = await insertData(comprehensiveTestModelDefinition.name, { stringRequired: 'req', stringMaxLength: '123456' }, {}, currentTestUser, false);
+                expect(result.success).toBe(false);
+                expect(result.error).toContain('stringMaxLength');
+                await purge();
+            });
+
+            it('devrait rejeter une valeur dupliquée pour un champ unique (stringUnique)', async () => {
+                const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await setupTestContext();
+                await insertData(comprehensiveTestModelDefinition.name, { stringRequired: 'req1', stringUnique: 'duplicateMe', 'passwordField': 'pass', number: 1, enumField: 'test' }, {}, currentTestUser, false);
+                const result = await insertData(comprehensiveTestModelDefinition.name, { stringRequired: 'req2', stringUnique: 'duplicateMe', 'passwordField': 'pass', number: 1, enumField: 'test' }, {}, currentTestUser, false);
+                expect(result.success).toBe(false);
+                await purge();
+            });
+
+            // --- NUMBER VALIDATIONS ---
+            it('devrait rejeter un number non numérique', async () => {
+                const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await setupTestContext();
+                const result = await insertData(comprehensiveTestModelDefinition.name, { stringRequired: 'req', number: 'not-a-number' }, {}, currentTestUser, false);
+                expect(result.success).toBe(false);
+                expect(result.error).toContain('number');
+                await purge();
+            });
+
+            it('devrait rejeter un number infur à min (numberMinMax)', async () => {
+                const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await setupTestContext();
+                const result = await insertData(comprehensiveTestModelDefinition.name, { stringRequired: 'req', numberMinMax: 5 }, {}, currentTestUser, false);
+                expect(result.success).toBe(false);
+                expect(result.error).toContain('numberMinMax');
+                await purge();
+            });
+
+            it('devrait rejeter un number supérieur à max (numberMinMax)', async () => {
+                const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await setupTestContext();
+                const result = await insertData(comprehensiveTestModelDefinition.name, { stringRequired: 'req', numberMinMax: 25 }, {}, currentTestUser, false);
+                expect(result.success).toBe(false);
+                expect(result.error).toContain('numberMinMax');
+                await purge();
+            });
+
+            // --- ARRAY VALIDATIONS ---
+            it('devrait rejeter un array avec trop d\'items (arrayString maxItems: 2)', async () => {
+                const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await setupTestContext();
+                const result = await insertData(comprehensiveTestModelDefinition.name, { stringRequired: 'req', arrayString: ['a', 'b', 'c'] }, {}, currentTestUser, false);
+                expect(result.success).toBe(false);
+                expect(result.error).toContain('arrayString');
+                await purge();
+            });
+
+            it('devrait rejeter un array avec pas assez d\'items (arrayNumber minItems: 1)', async () => {
+                const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await setupTestContext();
+                const result = await insertData(comprehensiveTestModelDefinition.name, { stringRequired: 'req', arrayNumber: [] }, {}, currentTestUser, false);
+                expect(result.success).toBe(false);
+                expect(result.error).toContain('arrayNumber');
+                await purge();
+            });
+
+            it('devrait rejeter un array avec un item de type incorrect (arrayNumber)', async () => {
+                const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await setupTestContext();
+                const result = await insertData(comprehensiveTestModelDefinition.name, { stringRequired: 'req', arrayNumber: [1, 'not-a-number', 3] }, {}, currentTestUser, false);
+                expect(result.success).toBe(false);
+                expect(result.error).toContain('arrayNumber');
+                await purge();
+            });
+
+            // --- FILE VALIDATIONS (metadata) ---
+            it('devrait rejeter un file avec un mimeType non autorisé', async () => {
+                const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await setupTestContext();
+                const mockFile = { name: 'test.txt', type: 'text/csv', size: 1024, guid: 'dummy-txt' };
+                const result = await insertData(comprehensiveTestModelDefinition.name, { stringRequired: 'req', fileField: mockFile }, {}, currentTestUser, false);
+                expect(result.success).toBe(false);
+                expect(result.error).toContain('image/png'); // Ou un message plus spécifique sur mimeTypes
+                expect(result.error).toContain('text/plain'); // Ou un message plus spécifique sur mimeTypes
+                await purge();
+            });
+
+            it('devrait rejeter un file avec une taille supérieure à maxSize', async () => {
+                const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await setupTestContext();
+                const mockFile = { name: 'large.png', type: 'image/png', size: 1024 * 15, guid: 'dummy-large' }; // 15KB > 10KB
+                const result = await insertData(comprehensiveTestModelDefinition.name, { stringRequired: 'req', fileField: mockFile }, {}, currentTestUser, false);
+                expect(result.success).toBe(false);
+                expect(result.error).toContain('fileField'); // Ou un message plus spécifique sur maxSize
+                await purge();
+            });
+
+            // --- EMAIL, URL, PHONE, COLOR (basic format) ---
+            it('devrait rejeter un email invalide', async () => {
+                const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await setupTestContext();
+                const result = await insertData(comprehensiveTestModelDefinition.name, { stringRequired: 'req', emailField: 'not-an-email' }, {}, currentTestUser, false);
+                expect(result.success).toBe(false);
+                expect(result.error).toContain('emailField');
+                await purge();
+            });
+            it('devrait rejeter une URL invalide', async () => {
+                const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await setupTestContext();
+                const result = await insertData(comprehensiveTestModelDefinition.name, { stringRequired: 'req', urlField: 'not a url' }, {}, currentTestUser, false);
+                expect(result.success).toBe(false);
+                expect(result.error).toContain('urlField');
+                await purge();
+            });
+            it('devrait rejeter une couleur invalide', async () => {
+                const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await setupTestContext();
+                const result = await insertData(comprehensiveTestModelDefinition.name, { stringRequired: 'req', colorField: '#GGHHII' }, {}, currentTestUser, false);
+                expect(result.success).toBe(false);
+                expect(result.error).toContain('colorField');
+                await purge();
+            });
+
+            // --- DATE / DATETIME VALIDATIONS ---
+            it('devrait rejeter une date invalide (format)', async () => {
+                const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await setupTestContext();
+                const result = await insertData(comprehensiveTestModelDefinition.name, { stringRequired: 'req', dateField: 'not-a-date' }, {}, currentTestUser, false);
+                expect(result.success).toBe(false);
+                expect(result.error).toContain('dateField');
+                await purge();
+            });
+            it('devrait rejeter une date en dehors de min/max (dateMinMax)', async () => {
+                const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await setupTestContext();
+                const result = await insertData(comprehensiveTestModelDefinition.name, { stringRequired: 'req', dateMinMax: '2024-01-01' }, {}, currentTestUser, false);
+                expect(result.success).toBe(false);
+                expect(result.error).toContain('dateMinMax');
+                await purge();
+            });
+
+            // TODO: Ajouter des tests pour les autres types et contraintes (password, richtext, code, object, model, modelField)
+            // Pour 'code' avec language 'json', tester l'insertion d'un JSON invalide si la validation va jusque-là.
+            // Pour 'relation', tester l'insertion d'un ObjectId non existant (si la validation vérifie l'existence).
+        });
+
+        // --- NOUVEAU TEST POUR $find ---
+        it('devrait insérer des données avec des relations référencées par $find', async () => {
+            // 1. Insérer les documents liés qui seront trouvés par $find
+            const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await setupTestContext();
+            const relatedDocA = await insertData(relatedModelDefinition.name, { relatedName: 'FindMeA', relatedValue: 111 }, {}, currentTestUser, false);
+            const relatedDocB = await insertData(relatedModelDefinition.name, { relatedName: 'FindMeB', relatedValue: 222 }, {}, currentTestUser, false);
+            const relatedDocC = await insertData(relatedModelDefinition.name, { relatedName: 'FindMeC', relatedValue: 222 }, {}, currentTestUser, false);
+
+            const relatedIdA = relatedDocA.insertedIds[0];
+            const relatedIdB = relatedDocB.insertedIds[0];
+            const relatedIdC = relatedDocC.insertedIds[0];
+
+            // 2. Prr les données du document principal utilisant $find
+            const dataWithFindRelations = {
+                stringRequired: 'DocWithFind',
+                stringUnique: 'UniqueFindValue',
+                passwordField: 'findPass',
+                enumField: 'beta',
+                number: 99,
+                // Utiliser $find pour la relation simple
+                relationSingle: { $find: { $eq: ["$relatedName", 'FindMeA'] } },
+                // Utiliser un tableau de $find pour la relation multiple
+                relationMultiple: { $find: { $eq: ["$relatedValue", 222] } },
+                // Inclure d'autres champs requis ou avec défauts si nécessaire
+                stringMaxLength: 'short',
+                emailField: 'find@example.com',
+                phoneField: '+19876543210',
+                urlField: 'https://find.example.com',
+                numberMinMax: 18,
+                dateField: '2023-11-20',
+                dateMinMax: '2023-11-20',
+                arrayNumber: [10],
+                fileField: { name: 'find.png', type: 'image/png', size: 1024, guid: 'dummy-find-png' },
+                colorField: '#123456',
+                codeJsonField: { "find": true },
+                codeJsField: 'console.log("find");',
+                objectField: { find: "test" },
+                modelNameField: 'findModel',
+                modelFieldNameField: { model: 'findModel', field: 'findField' }
+            };
+
+            // 3. Insérer le document principal
+            const result = await insertData(comprehensiveTestModelDefinition.name, dataWithFindRelations, {}, currentTestUser, false);
+
+            // 4. Vérifier le résultat de l'insertion
+            expect(result.success, `Insertion with $find failed: ${result.error}`).toBe(true);
+            expect(result.insertedIds).toHaveLength(1);
+
+            // 5. Récupérer le document inséré depuis la base de données
+            const insertedDoc = await testDatasColInstance.findOne({ _id: new ObjectId(result.insertedIds[0]) });
+            expect(insertedDoc).not.toBeNull();
+
+            console.log({insertedDoc: insertedDoc, relatedIdB})
+            expect(insertedDoc.relationSingle).toBe(relatedIdA.toString());
+
+            expect(insertedDoc.relationMultiple).toBeInstanceOf(Array);
+            expect(insertedDoc.relationMultiple).toHaveLength(2);
+            // Convertir les ObjectIds en string pour une comparaison facile
+            const insertedRelationMultipleIds = insertedDoc.relationMultiple.map(id => id.toString());
+            expect(insertedRelationMultipleIds).toContain(relatedIdB.toString());
+            expect(insertedRelationMultipleIds).toContain(relatedIdC.toString());
+
+            // Vérifier d'autres champs pour s'assurer que le reste des données est correct
+            expect(insertedDoc.stringRequired).toBe('DocWithFind');
+            expect(insertedDoc.enumField).toBe('beta');
+
+            await purge();
+        }, 10000); // Augmenter le timeout si nécessaire
+
+        it('devrait insérer des données avec un nouveau fichier et le sauvegarder', async () => {
+            const { currentTestUser, comprehensiveTestModelDefinition, purge } = await setupTestContext();
+
+            // --- Simuler un vrai fichier uploadé comme le ferait formidable/multer ---
+            const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), 'data-primals-test-'));
+            const filePath = path.join(tmpDir, 'test-upload.txt');
+            const fileContent = 'Ceci est un vrai test de fichier binaire.';
+            await fs.writeFile(filePath, fileContent);
+            const stats = await fs.stat(filePath);
+
+            const uploadedFile = {
+                filepath: filePath,
+                originalFilename: 'test-upload-on-insert.txt',
+                mimetype: 'text/plain',
+                size: stats.size,
+                lastModifiedDate: new Date(),
+                hash: 'test-hash' // Optionnel, mais souvent présent
+            };
+            // --- Fin de la simulation ---
+
+            const dataWithFile = {
+                stringRequired: 'DocWithNewFile',
+                stringUnique: 'UniqueFileValueForInsert',
+                passwordField: 'filePass',
+                enumField: 'gamma',
+                number: 123
+                // Le champ 'fileField' est absent ici, il sera fourni dans l'objet 'files'
+            };
+
+            const result = await insertData(comprehensiveTestModelDefinition.name, dataWithFile, { 'fileField[0]': uploadedFile }, currentTestUser, false);
+
+            expect(result.success, `L'insertion avec un nouveau fichier a échoué: ${result.error}`).toBe(true);
+            expect(result.insertedIds).toHaveLength(1);
+
+            const query = await searchData( { model: comprehensiveTestModelDefinition.name, filter: { _id: new ObjectId(result.insertedIds[0])}}, currentTestUser);
+            const insertedDoc = query.data[0];
+            expect(insertedDoc).not.toBeNull();
+            console.log(insertedDoc.fileField)
+            expect(insertedDoc.fileField).toBeInstanceOf(Object);
+            expect(insertedDoc.fileField.newFile).toBeUndefined(); // La propriété 'newFile' était une hallucination
+            expect(insertedDoc.fileField._id).toBeDefined();
+            expect(insertedDoc.fileField.name).toBe('test-upload-on-insert.txt');
+            expect(insertedDoc.fileField.guid).toBeDefined();
+
+            await removeFile(insertedDoc.fileField.guid, currentTestUser);
+
+            // Nettoyage du répertoire et fichier temporaire
+            await fs.rm(tmpDir, { recursive: true, force: true });
+            await purge();
+        });
+    });
+
+    describe('editData avec comprehensiveTestModel', async () => {
+        let docToEditId;
+        let relatedDocId;
+
+        const initTest = async () => {
+            const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await setupTestContext();
+            // Insert a base document and a related document to be used in edit tests
+            const relatedInsert = await insertData(relatedModelDefinition.name, { relatedName: 'RelForEdit', relatedValue: 50 }, {}, currentTestUser, false);
+            relatedDocId = relatedInsert.insertedIds[0];
+
+            const initialData = {
+                stringRequired: 'Initial',
+                stringUnique: 'UniqueForEdit',
+                enumField: 'alpha',
+                passwordField: 'initialPass',
+                relationSingle: relatedDocId
+            };
+            const insertResult = await insertData(comprehensiveTestModelDefinition.name, initialData, {}, currentTestUser, false);
+            docToEditId = insertResult.insertedIds[0];
+
+            return { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge };
+        };
+        it('devrait modifier des données valides', async () => {
+            const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await initTest();
+            const dataToEdit = { stringRequired: 'Edited String', numberMinMax: 12 };
+            const result = await editData(comprehensiveTestModelDefinition.name, docToEditId, dataToEdit, {}, currentTestUser);
+
+            expect(result.success, `Edit failed: ${result.error}`).toBe(true);
+            expect(result.modifiedCount).toBe(1);
+
+            const editedDoc = await testDatasColInstance.findOne({ _id: new ObjectId(docToEditId) });
+            expect(editedDoc.stringRequired).toBe('Edited String');
+            expect(editedDoc.numberMinMax).toBe(12);
+
+            await purge();
+        });
+
+        it('devrait rejeter une modification avec un string requis vide', async () => {
+            const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await initTest();
+            const result = await editData(comprehensiveTestModelDefinition.name, docToEditId, { stringRequired: '' }, {}, currentTestUser);
+            expect(result.success).toBe(false);
+            expect(result.error).toContain('stringRequired');
+
+            await purge();
+        });
+
+        it('devrait rejeter une modification avec un number hors des bornes (numberMinMax)', async () => {
+            const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await initTest();
+            const result = await editData(comprehensiveTestModelDefinition.name, docToEditId, { stringRequired: 'test', numberMinMax: 50 }, {}, currentTestUser);
+            expect(result.success).toBe(false);
+            expect(result.error).toContain('numberMinMax');
+            await purge();
+        });
+
+        it('devrait rejeter une modification qui viole une contrainte unique (stringUnique)', async ({skip}) => {
+            const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await initTest();
+            // Insert another doc to create the unique conflict
+
+            await insertData(comprehensiveTestModelDefinition.name, { stringRequired: 'Other', stringUnique: 'UniqueValue', enumField: 'beta', passwordField: 'pass' }, {}, currentTestUser, false);
+            // Insert another doc to create the unique conflict
+            const res1 = await insertData(comprehensiveTestModelDefinition.name, { stringRequired: 'Other', stringUnique: 'ExistingUniqueValue', enumField: 'beta', passwordField: 'pass' }, {}, currentTestUser, false);
+
+            const result = await editData(comprehensiveTestModelDefinition.name, { stringUnique: 'ExistingUniqueValue'}, { stringRequired: 'Other', stringUnique: 'UniqueValue', enumField: 'beta', passwordField: 'pass' }, {}, currentTestUser);
+            expect(result.success).toBe(false);
+            expect(result.error).toContain('UniqueValue');
+            expect(result.error).toContain('stringUnique');
+            await purge();
+        });
+
+        // TODO: Ajouter plus de tests de validation pour editData, similaires à ceux de insertData
+    });
+
+    describe('$push operation using patchData', () =>{
+        describe('$push sur tableau existant', () => {
+            let docToPatchId;
+            let setupContext;
+
+            beforeEach(async () => {
+                setupContext = await setupTestContext();
+                const { currentTestUser, comprehensiveTestModelDefinition } = setupContext;
+
+                const initialData = {
+                    stringRequired: 'InitialForPush',
+                    stringUnique: 'UniqueForPush',
+                    enumField: 'alpha',
+                    passwordField: 'pushPass',
+                    arrayString: ['tag1'],
+                    arrayNumber: [100]
+                };
+                const insertResult = await insertData(comprehensiveTestModelDefinition.name, initialData, {}, currentTestUser, false);
+                docToPatchId = insertResult.insertedIds[0];
+            });
+
+            afterEach(async () => {
+                await setupContext.purge();
+            });
+
+            it('devrait ajouter une seule valeur à un tableau existant', async () => {
+                const { currentTestUser, comprehensiveTestModelDefinition } = setupContext;
+
+                const result = await patchData(comprehensiveTestModelDefinition.name, { _id: docToPatchId }, { arrayString: { $push: 'tag2' } }, {}, currentTestUser);
+
+                expect(result.success, `patchData avec $push a échoué: ${result.error}`).toBe(true);
+                expect(result.modifiedCount).toBe(1);
+
+                const patchedDoc = await testDatasColInstance.findOne({ _id: new ObjectId(docToPatchId) });
+                expect(patchedDoc.arrayString).toEqual(['tag1', 'tag2']);
+            });
+
+            it('devrait ajouter plusieurs valeurs à un tableau existant', async () => {
+                const { currentTestUser, comprehensiveTestModelDefinition } = setupContext;
+
+                const result = await patchData(comprehensiveTestModelDefinition.name, { _id: docToPatchId }, { arrayNumber: { $push: [200, 300] } }, {}, currentTestUser);
+
+                expect(result.success, `patchData avec $push multiple a échoué: ${result.error}`).toBe(true);
+                expect(result.modifiedCount).toBe(1);
+
+                const patchedDoc = await testDatasColInstance.findOne({ _id: new ObjectId(docToPatchId) });
+                expect(patchedDoc.arrayNumber).toEqual([100, 200, 300]);
+            });
+
+            it('devrait rejeter un push si la valeur est invalide', async () => {
+                const { currentTestUser, comprehensiveTestModelDefinition } = setupContext;
+
+                // Tenter de pusher un nombre dans un tableau de strings
+                const result = await patchData(comprehensiveTestModelDefinition.name, { _id: docToPatchId }, { arrayString: { $push: 12345 } }, {}, currentTestUser);
+
+                expect(result.success).toBe(false);
+                expect(result.error).toContain("Valeur invalide fournie pour le tableau 'arrayString'");
+            });
+
+            it('devrait rejeter un push si une des valeurs du tableau est invalide', async () => {
+                const { currentTestUser, comprehensiveTestModelDefinition } = setupContext;
+
+                // Tenter de pusher un tableau contenant une valeur invalide
+                const result = await patchData(comprehensiveTestModelDefinition.name, { _id: docToPatchId }, { arrayNumber: { $push: [400, 'not-a-number', 500] } }, {}, currentTestUser);
+
+                expect(result.success).toBe(false);
+                expect(result.error).toContain("Valeur invalide fournie pour le tableau 'arrayNumber'");
+            });
+
+        });
+        describe('$push sur un tableau inexistant', () => {
+            it('devrait créer le tableau et pusher les valeurs s\'il n\'existe pas', async () => {
+            // On utilise un setup de contexte complètement isolé pour ce test
+                const { currentTestUser, comprehensiveTestModelDefinition, purge } = await setupTestContext();
+
+                const initialData = { stringRequired: 'NoArrayField', stringUnique: 'UniqueForNoArrayPush', enumField: 'beta', passwordField: 'pass' };
+                const insertResult = await insertData(comprehensiveTestModelDefinition.name, initialData, {}, currentTestUser, false);
+                const newDocId = insertResult.insertedIds[0];
+
+                const result = await patchData(comprehensiveTestModelDefinition.name, { _id: newDocId }, { arrayString: { $push: ['first', 'second'] } }, {}, currentTestUser);
+
+                expect(result.success, `patchData sur un tableau inexistant a échoué: ${result.error}`).toBe(true);
+                expect(result.modifiedCount).toBe(1);
+
+                const patchedDoc = await testDatasColInstance.findOne({ _id: new ObjectId(newDocId) });
+                expect(patchedDoc.arrayString).toEqual(['first', 'second']);
+                await purge();
+            });
+        });
+    });
+
+    // --- Tests deleteData (repris de votre exemple, peuvent être gardés tels quels ou adaptés) ---
+    describe('deleteData (tests existants)', () => {
+        it('supprimer des données par ID (deleteData)', async () => {
+            const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await setupTestContext();
+            const dataToDelete = { name: 'Objet à supprimer', value: 300 };
+            // Utiliser le modèle simple pour ces tests delete pour ne pas avoir à remplir tous les champs requis de comprehensive
+            const simpleModel = { name: 'simpleDeleteModel', _user: currentTestUser.username, description: '', fields: [{ name: 'name', type: 'string' }, { name: 'value', type: 'number' }] };
+            await testModelsColInstance.insertOne(simpleModel);
+
+            const insertResult = await insertData(simpleModel.name, dataToDelete, {}, currentTestUser, false);
+            const docId = insertResult.insertedIds[0];
+
+            const deleteResult = await deleteData(simpleModel.name, [docId], currentTestUser);
+
+            expect(deleteResult.success).toBe(true);
+            expect(deleteResult.deletedCount).toBe(1);
+
+            const deletedDoc = await testDatasColInstance.findOne({ _id: new ObjectId(docId) });
+            expect(deletedDoc).toBeNull();
+            await purge();
+            await purge();
+        });
+
+        it('supprimer des données par filtre (deleteData)', async () => {
+            const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await setupTestContext();
+            const simpleModel = { name: 'deleteModelTest', _user: currentTestUser.username, description: '',fields: [{ name: 'name', type: 'string' }, { name: 'value', type: 'number' }] };
+            await testModelsColInstance.insertOne(simpleModel);
+
+            await insertData(simpleModel.name, { name: 'Item Filtrable 1', value: 401 }, {}, currentTestUser, false);
+            await insertData(simpleModel.name, { name: 'Item Filtrable 2', value: 402 }, {}, currentTestUser, false);
+            await insertData(simpleModel.name, { name: 'Autre Item', value: 403 }, {}, currentTestUser, false);
+
+            const filter = { $regexMatch: {
+                input: '$name',
+                regex: "^Item Filtrable"
+            } };
+            const deleteResult = await deleteData(simpleModel.name, filter, currentTestUser);
+
+            expect(deleteResult.success).toBe(true);
+            expect(deleteResult.deletedCount).toBe(2);
+
+            const remainingCount = await testDatasColInstance.countDocuments({ _user: currentTestUser.username, _model: simpleModel.name, name: { $regex: "^Item Filtrable" } });
+            expect(remainingCount).toBe(0);
+            const totalRemaining = await testDatasColInstance.countDocuments({ _user: currentTestUser.username, _model: simpleModel.name });
+            expect(totalRemaining).toBe(1);
+            await purge();
+        });
+    });
+
+    describe('searchData avec comprehensiveTestModel et filtres $find', async () => {
+        let docId1, docId2;
+        let relatedDocId_A1, relatedDocId_A2, relatedDocId_B1;
+
+        const initTest =async () => {
+            const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await setupTestContext();
+
+            // Insérer des documents liés
+            const relA1 = await insertData(relatedModelDefinition.name, { relatedName: 'Rel_Search_A1', relatedValue: 101 }, {}, currentTestUser, false);
+            relatedDocId_A1 = relA1.insertedIds[0].toString();
+            const relA2 = await insertData(relatedModelDefinition.name, { relatedName: 'Rel_Search_A2', relatedValue: 102 }, {}, currentTestUser, false);
+            relatedDocId_A2 = relA2.insertedIds[0].toString();
+            const relB1 = await insertData(relatedModelDefinition.name, { relatedName: 'Rel_Search_B1', relatedValue: 201 }, {}, currentTestUser, false);
+            relatedDocId_B1 = relB1.insertedIds[0].toString();
+
+            // Insérer des documents principaux
+            const data1 = {
+                stringRequired: 'SearchDoc1',
+                stringUnique: 'UniqueSearch1',
+                enumField: 'alpha',
+                passwordField: 'searchPass1',
+                relationSingle: relatedDocId_A1,
+                relationMultiple: [relatedDocId_A1, relatedDocId_A2],
+                number: 10
+            };
+            const insertResult1 = await insertData(comprehensiveTestModelDefinition.name, data1, {}, currentTestUser, false);
+            docId1 = insertResult1.insertedIds[0].toString();
+
+            const data2 = {
+                stringRequired: 'SearchDoc2',
+                stringUnique: 'UniqueSearch2',
+                enumField: 'beta',
+                passwordField: 'searchPass2',
+                relationSingle: relatedDocId_B1,
+                relationMultiple: [relatedDocId_B1],
+                number: 20
+            };
+            const insertResult2 = await insertData(comprehensiveTestModelDefinition.name, data2, {}, currentTestUser, false);
+            docId2 = insertResult2.insertedIds[0].toString();
+
+            return { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge };
+        };
+
+        it('devrait trouver un document par une condition sur une relation simple ($find)', async () => {
+            const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await initTest();
+            const searchParams = {
+                model: comprehensiveTestModelDefinition.name,
+                filter: {
+                    relationSingle: {
+                        "$find": { "$and": [{"$eq": ["$$this.relatedValue", 101]}] }
+                    }
+                },
+                autoExpand: true,
+                depth: 8
+            };
+            const { data, count } = await searchData(searchParams, currentTestUser);
+            expect(count).toBe(1);
+            expect(data).toHaveLength(1);
+            expect(data[0]._id.toString()).toBe(docId1.toString());
+            // Vérifier que la relation est bien populée si depth > 0
+            expect(data[0].relationSingle).toBeInstanceOf(Object);
+            expect(data[0].relationSingle.relatedName).toBe('Rel_Search_A1');
+            await purge();
+        });
+
+        it('ne devrait pas trouver de document si la condition $find sur relation simple ne correspond pas', async () => {
+            const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await initTest();
+            const searchParams = {
+                model: comprehensiveTestModelDefinition.name,
+                filter: {
+                    relationSingle: {
+                        "$find": { "$eq": ["$$this.relatedName", "NonExistentRelName"] }
+                    }
+                },
+                depth: 1
+            };
+            const { data, count } = await searchData(searchParams, currentTestUser);
+            expect(count).toBe(0);
+            expect(data).toHaveLength(0);
+            await purge();
+        });
+
+        it('devrait trouver des documents par une condition sur une relation multiple ($find)', async () => {
+            const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await initTest();
+            const searchParams = {
+                model: comprehensiveTestModelDefinition.name,
+                filter: {
+                    $and: [{$ne:["$stringRequired", null]}, {
+                        relationMultiple: { // Le champ qui est un tableau de relations
+                            "$find": {"$eq": ["$$this.relatedValue", 102]} // Condition sur les documents liés
+                        }
+                    }]
+                },
+                depth: 1
+            };
+            const { data, count } = await searchData(searchParams, currentTestUser);
+            expect(count).toBe(1);
+            expect(data).toHaveLength(1);
+            expect(data[0]._id.toString()).toBe(docId1.toString());
+            // Note: searchData with depth > 0 will populate the relationMultiple array
+            expect(data[0].relationMultiple).toBeInstanceOf(Array);
+            expect(data[0].relationMultiple.some(rel => rel.relatedValue === 102)).toBe(true);
+            await purge();
+        });
+
+
+        it('devrait trouver des documents en combinant un filtre normal et un filtre $find', async () => {
+            const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await initTest();
+            const searchParams = {
+                model: comprehensiveTestModelDefinition.name,
+                filter: {
+                    stringRequired: "SearchDoc1", // Filtre sur le modèle principal
+                    relationSingle: {
+                        "$find": {"$gt": ["$$this.relatedValue", 100] } // Filtre sur la relation
+                    }
+                },
+                depth: 1
+            };
+            const { data, count } = await searchData(searchParams,currentTestUser);
+            expect(count).toBe(1);
+            expect(data).toHaveLength(1);
+            expect(data[0]._id.toString()).toBe(docId1.toString());
+            await purge();
+        });
+
+        it('devrait retourner un tableau vide si $find ne correspond à aucun document lié', async () => {
+            const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await initTest();
+            const searchParams = {
+                model: comprehensiveTestModelDefinition.name,
+                filter: {
+                    relationMultiple: {
+                        "$find": { "$eq": ["$$this.relatedName", "NonExistentRelNameForMultiple"] }
+                    }
+                },
+                depth: 1
+            };
+            const { data, count } = await searchData(searchParams,currentTestUser);
+            expect(count).toBe(0);
+            expect(data).toHaveLength(0);
+            await purge();
+        });
+
+        // --- NOUVEAUX TESTS POUR LE SHORTHAND $find ---
+
+        it('devrait trouver un document en utilisant un filtre $find simple (shorthand)', async () => {
+            const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await initTest();
+            const searchParams = {
+                model: comprehensiveTestModelDefinition.name,
+                filter: {
+                    relationSingle: {
+                        "$find": { "relatedValue": 101 } // Utilisation du shorthand { champ: valeur }
+                    }
+                },
+                depth: 1
+            };
+            const { data, count } = await searchData(searchParams, currentTestUser);
+            expect(count).toBe(1);
+            expect(data).toHaveLength(1);
+            expect(data[0]._id.toString()).toBe(docId1.toString());
+            await purge();
+        });
+
+        it('devrait trouver un document en utilisant un filtre $find simple avec plusieurs conditions (AND implicite)', async () => {
+            const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await initTest();
+            const searchParams = {
+                model: comprehensiveTestModelDefinition.name,
+                filter: {
+                    relationSingle: {
+                        "$find": {
+                            "relatedName": "Rel_Search_A1",
+                            "relatedValue": 101
+                        }
+                    }
+                },
+                depth: 1
+            };
+            const { data, count } = await searchData(searchParams, currentTestUser);
+            expect(count).toBe(1);
+            expect(data).toHaveLength(1);
+            expect(data[0]._id.toString()).toBe(docId1.toString());
+            await purge();
+        });
+
+        it('ne devrait pas trouver de document si une des conditions du $find simple échoue', async () => {
+            const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await initTest();
+            const searchParams = {
+                model: comprehensiveTestModelDefinition.name,
+                filter: {
+                    relationSingle: {
+                        "$find": {
+                            "relatedName": "Rel_Search_A1", // Correspond
+                            "relatedValue": 999 // Ne correspond pas
+                        }
+                    }
+                },
+                depth: 1
+            };
+            const { data, count } = await searchData(searchParams, currentTestUser);
+            expect(count).toBe(0);
+            expect(data).toHaveLength(0);
+            await purge();
+        });
+
+        it('devrait trouver un document via une relation multiple en utilisant un filtre $find simple', async () => {
+            const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await initTest();
+            const searchParams = {
+                model: comprehensiveTestModelDefinition.name,
+                filter: {
+                    relationMultiple: {
+                        "$find": { "relatedValue": 102 } // Devrait trouver docId1 car il a une relation vers relA2
+                    }
+                },
+                depth: 1
+            };
+            const { data, count } = await searchData(searchParams, currentTestUser);
+            expect(count).toBe(1);
+            expect(data).toHaveLength(1);
+            expect(data[0]._id.toString()).toBe(docId1.toString());
+            await purge();
+        });
+
+    });
+
+    describe('installPack', () => {
+        let testPacksColInstance;
+
+        beforeAll(() => {
+            // Note: l'initialisation est déjà faite dans le beforeAll global.
+            // On s'assure juste d'avoir une référence si on en a besoin spécifiquement ici.
+            // Si vous n'avez pas suivi l'étape 1, vous pouvez l'initialiser ici.
+            testPacksColInstance = getCollection('packs');
+        });
+
+        beforeEach(async () => {
+            // On supprime les données de ce test
+        });
+
+        it('devrait installer un pack, créer les modèles et insérer les données avec relations via $link', async () => {
+            const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await setupTestContext();
+            // 1. Définir le pack de données mock
+            const mockPack = {
+                private: false,
+                name: 'test-pack-for-install',
+                models: [
+                    {
+                        name: 'packUser',
+                        description: 'Modèle pour les utilisateurs du pack',
+                        fields: [
+                            { name: 'username', type: 'string', required: true, unique: true },
+                            { name: 'level', type: 'number', default: 1 }
+                        ]
+                    },
+                    {
+                        name: 'packItem',
+                        description: 'Modèle pour les items du pack',
+                        fields: [
+                            { name: 'itemName', type: 'string', required: true },
+                            { name: 'owner', type: 'relation', relation: 'packUser' }
+                        ]
+                    }
+                ],
+                data: {
+                    all: { // 'all' pour les données non spécifiques à une langue
+                        packUser: [
+                            { username: 'playerOne' },
+                            { username: 'playerTwo', level: 5 }
+                        ],
+                        packItem: [
+                            // La nouvelle syntaxe $link pour résoudre les relations
+                            { itemName: 'Sword', owner: { $link: { _model: 'packUser', username: 'playerOne' } } },
+                            { itemName: 'Shield', owner: { $link: { _model: 'packUser', username: 'playerTwo' } } }
+                        ]
+                    }
+                }
+            };
+
+            // 2. Insérer le pack dans la collection pour le rendre disponible au test
+            const packInsertResult = await testPacksColInstance.insertOne(mockPack);
+            const packId = packInsertResult.insertedId.toString();
+
+            // 3. Appeler la fonction à tester avec la nouvelle signature
+            const result = await installPack(packId, currentTestUser, 'en');
+
+            // 4. Assertions sur le résumé de l'installation
+            expect(result.success, `L'installation du pack a échoué: ${result.errors?.join('; ')}`).toBe(true);
+            expect(result.summary.models.installed).toHaveLength(2);
+            expect(result.summary.datas.inserted).toBe(4); // 2 utilisateurs + 2 items
+            expect(result.summary.datas.updated).toBe(2); // 2 items mis à jour avec la relation
+
+            // 5. Vérifier la création des modèles
+            const userModel = await testModelsColInstance.findOne({ name: 'packUser', _user: currentTestUser.username });
+            expect(userModel).not.toBeNull();
+            const itemModel = await testModelsColInstance.findOne({ name: 'packItem', _user: currentTestUser.username });
+            expect(itemModel).not.toBeNull();
+            expect(itemModel.fields.find(f => f.name === 'owner').relation).toBe('packUser');
+
+            // 6. Vérifier l'insertion des données
+            const insertedUsers = await testDatasColInstance.find({ _model: 'packUser', _user: currentTestUser.username }).toArray();
+            expect(insertedUsers).toHaveLength(2);
+            const insertedItems = await testDatasColInstance.find({ _model: 'packItem', _user: currentTestUser.username }).toArray();
+            expect(insertedItems).toHaveLength(2);
+
+            // 7. Vérifier la résolution des relations via $link
+            const playerOne = insertedUsers.find(u => u.username === 'playerOne');
+            const sword = insertedItems.find(i => i.itemName === 'Sword');
+            expect(sword.owner.toString()).toBe(playerOne._id.toString());
+
+            const playerTwo = insertedUsers.find(u => u.username === 'playerTwo');
+            const shield = insertedItems.find(i => i.itemName === 'Shield');
+            expect(shield.owner.toString()).toBe(playerTwo._id.toString());
+            await purge();
+        }, 10000);
+
+        it("ne devrait installer que les modèles valides d'un pack et rapporter les erreurs", async () => {
+            const { currentTestUser, comprehensiveTestModelDefinition, relatedModelDefinition, purge } = await setupTestContext();
+            const mockPackWithInvalidModel = {
+                name: 'invalid-model-pack',
+                private: false,
+                models: [
+                    {
+                        // 'name' est requis, on l'omet pour causer une erreur
+                        description: 'Modèle invalide sans nom',
+                        fields: []
+                    },
+                    { // Un modèle valide pour s'assurer que l'installation continue
+                        name: 'validPackModel',
+                        description: 'Un modèle valide',
+                        fields: [{ name: 'title', type: 'string' }]
+                    }
+                ],
+                data: {}
+            };
+
+            const packInsertResult = await testPacksColInstance.insertOne(mockPackWithInvalidModel);
+            const packId = packInsertResult.insertedId.toString();
+
+            const result = await installPack(packId, currentTestUser, 'en');
+
+            // Le succès global est faux s'il y a des erreurs
+            expect(result.success).toBe(false);
+            expect(result.errors).toHaveLength(1);
+            expect(result.errors[0]).toContain("Failed to install model 'unknown'"); // Le nom est inconnu
+
+            // Vérifier le résumé de l'option
+            expect(result.summary.models.failed).toHaveLength(1);
+            expect(result.summary.models.failed[0]).toBe('unknown');
+            expect(result.summary.models.installed).toHaveLength(1);
+            expect(result.summary.models.installed[0]).toBe('validPackModel');
+
+            // Vérifier en BDD que le modèle valide a bien été créé
+            const validModel = await testModelsColInstance.findOne({ name: 'validPackModel', _user: currentTestUser.username });
+            expect(validModel).not.toBeNull();
+            await purge();
+        });
+
+        it('devrait correctement insérer des données JSON depuis un pack', async () => {
+            const { currentTestUser } = await setupTestContext();
+            // 1. Définir le pack avec des données JSON
+            const mockPackWithJson = {
+                name: 'test-pack-with-json',
+                private: false,
+                models: [
+                    {
+                        name: 'packConfig',
+                        description: 'Modèle avec un champ JSON',
+                        fields: [
+                            { name: 'configName', type: 'string', required: true },
+                            { name: 'settings', type: 'code', language: 'json' }
+                        ]
+                    }
+                ],
+                data: {
+                    all: {
+                        packConfig: [
+                            {
+                                configName: 'mainConfig',
+                                settings: {
+                                    theme: 'dark',
+                                    notifications: {
+                                        enabled: true,
+                                        level: 'important'
+                                    }
+                                }
+                            }
+                        ]
+                    }
+                }
+            };
+
+            // 2. Insérer le pack
+            const packInsertResult = await testPacksColInstance.insertOne(mockPackWithJson);
+            const packId = packInsertResult.insertedId.toString();
+
+            // 3. Appeler la fonction à tester
+            const result = await installPack(packId, currentTestUser, 'en');
+
+            // 4. Assertions
+            expect(result.success, `L'installation du pack JSON a échoué: ${result.errors?.join('; ')}`).toBe(true);
+            expect(result.summary.models.installed).toHaveLength(1);
+            expect(result.summary.datas.inserted).toBe(1);
+
+            // 5. Vérifier les données insérées en BDD
+            const datasCol = await getCollectionForUser(currentTestUser);
+            const insertedConfig = await datasCol.findOne({ _model: 'packConfig', _user: currentTestUser.username });
+
+            expect(insertedConfig).not.toBeNull();
+            expect(insertedConfig.configName).toBe('mainConfig');
+            expect(typeof insertedConfig.settings).toBe('object');
+            expect(insertedConfig.settings).toEqual({
+                theme: 'dark',
+                notifications: {
+                    enabled: true,
+                    level: 'important'
+                }
+            });
+
+            await getCollection('packs').deleteMany({ _id: packId});
+        });
+    });
+    // In test/data.integration.test.js
+
+    describe('relationFilter validation', () => {
+        let user;
+        let activeProductId, inactiveProductId;
+
+        // Model names are kept in French to match the database, but variables are in English.
+        const productModel = {
+            name: 'produitTestFiltre',
+            description: '',
+            fields: [
+                { name: 'name', type: 'string' },
+                { name: 'actif', type: 'boolean', default: false }
+            ]
+        };
+        const orderModel = {
+            name: 'commandeTestFiltre',
+            description: '',
+            fields: [
+                { name: 'ref', type: 'string' },
+                {
+                    name: 'produit',
+                    type: 'relation',
+                    relation: 'produitTestFiltre',
+                    relationFilter: { "$eq":["$actif", true] } // Only link active products
+                }
+            ]
+        };
+
+        // Set up the context once for all tests in this describe block.
+        beforeAll(async () => {
+            user = await engine.userProvider.findUserByUsername('demo');
+            // Cleanup before starting to ensure a clean state
+            await deleteModels({ name: productModel.name, _user: user.username });
+            await deleteModels({ name: orderModel.name, _user: user.username });
+            await deleteData(productModel.name, {}, user);
+            await deleteData(orderModel.name, {}, user);
+
+            // Create models
+            await createModel({ ...productModel, _user: user.username });
+            await createModel({ ...orderModel, _user: user.username });
+
+            // Create test data
+            const activeProduct = await insertData(productModel.name, { name: 'Active Product', actif: true }, {}, user);
+            const inactiveProduct = await insertData(productModel.name, { name: 'Inactive Product', actif: false }, {}, user);
+
+            activeProductId = activeProduct.insertedIds[0];
+            inactiveProductId = inactiveProduct.insertedIds[0];
+        });
+
+        // Clean up everything after all tests in this block have run.
+        afterAll(async () => {
+            await deleteModels({ name: productModel.name, _user: user.username });
+            await deleteModels({ name: orderModel.name, _user: user.username });
+            await deleteData(productModel.name, {}, user);
+            await deleteData(orderModel.name, {}, user);
+            const coll = await getCollectionForUser(user);
+            await coll.drop();
+        });
+
+        it('should ALLOW inserting data with a valid relation', async () => {
+            const result = await insertData(orderModel.name, { ref: 'CMD-OK', produit: activeProductId }, {}, user);
+            expect(result.success).toBe(true);
+            expect(result.insertedIds).toHaveLength(1);
+            // Cleanup the created order for test isolation
+            await deleteData(orderModel.name, result.insertedIds, user);
+        });
+
+        it('should REJECT inserting data with a relation that does not respect the filter', async () => {
+            const result = await insertData(orderModel.name, { ref: 'CMD-FAIL', produit: inactiveProductId }, {}, user);
+            expect(result.success).toBe(false);
+            expect(result.error).toContain('produit');
+        });
+
+        it('should ALLOW updating data with a valid relation', async () => {
+            // First, create a valid order
+            const initialOrder = await insertData(orderModel.name, { ref: 'CMD-TO-EDIT', produit: activeProductId }, {}, user);
+
+            // Update it (even with the same value, this tests the code path)
+            const result = await editData(orderModel.name, { _id: initialOrder.insertedIds[0] }, { produit: activeProductId }, {}, user);
+
+            expect(result.success).toBe(true);
+            // The hash might not change if only metadata like _updatedAt changes, so modifiedCount can be 0 or 1.
+            expect(result.modifiedCount).toBeGreaterThanOrEqual(0);
+
+            // Cleanup
+            await deleteData(orderModel.name, initialOrder.insertedIds, user);
+        });
+
+        it('should REJECT updating data with a relation that does not respect the filter', async () => {
+            // First, create a valid order
+            const initialOrder = await insertData(orderModel.name, { ref: 'CMD-TO-EDIT-FAIL', produit: activeProductId }, {}, user);
+
+            // Attempt to link it to an inactive product, expecting it to fail.
+            const result = await editData(orderModel.name, { _id: initialOrder.insertedIds[0] }, { produit: inactiveProductId }, {}, user);
+            expect(result.success).toBe(false);
+            expect(result.error).toContain('produit');
+            // Cleanup
+            await deleteData(orderModel.name, initialOrder.insertedIds, user);
+        });
+    });
+
 });