data-primals-engine 1.1.7-rc1 → 1.1.8-rc.1

package/client/src/translations.js

@@ -52,6 +52,8 @@ export const websiteTranslations = {
             "modelcreator.hiddenable.hint": "Une option sera disponible pour afficher cette donnée ou la masquer  (il sera masqué par défaut).",
 
             "tourpoint.importDatapack": "Importez des packs de données pré-construits avec notre galerie de packs : Sites internets, e-commerce, CRM, et plus encore !",
+            "tourpoint.tutorials": "Laisse-vous guider en suivant nos tutoriels pas à pas !",
+
             "add_language": "Ajouter...",
             "select_or_add_language": "Sélectionnez ou ajoutez une langue pour commencer.",
             "field.richtext_t": "Texte enrichi traduit",
@@ -521,8 +523,8 @@ export const websiteTranslations = {
             "prez1.5": "Support des traductions et langues",
             "links.deploy_api": "Déployez votre API",
             "links.documentation": "Documentation",
-            "links.demo": "Essayez maintenant !",
-            "filterstringfield.placeholder.regex": 'Expression régulière',
+            "links.demo": "Démarrer la démo",
+            "filterstringfield.placeholder.regex": 'Expression régulière'
 
         }
     },
@@ -594,6 +596,8 @@ export const websiteTranslations = {
             "api.data.serverStorageFull": "The server has reached its maximum storage capacity. Please try again later.",
 
             "tourpoint.importDatapack": "Import pre-built data packs with our pack gallery: Websites, e-commerce, CRM, and more!",
+            "tourpoint.tutorials": "Let yourself be guided by following our step-by-step tutorials!",
+
             "add_language": "Add...",
             "select_or_add_language": "Select or add a language to get started.",
             "field.richtext_t": "Translated rich text",
@@ -1479,7 +1483,7 @@ export const websiteTranslations = {
             "dataimporter.title": "Import data into {{model}}",
             "dataimporter.hasCsvHeaders": "Does the CSV file contain a header row?",
             "dataimporter.info": "Import your JSON or CSV file containing the required data for your model. Your data will be copied to your personal database. The transfer rate is {{constante}}",
-            "links.demo": "Try the demo!",
+            "links.demo": "Start the demo",
             "filterstringfield.placeholder.regex": 'Regular expression',
             "cgu.h1": "Terms of Use (TOU)",
             "cgu.h1.1": "1. Introduction",
@@ -1925,8 +1929,8 @@ export const websiteTranslations = {
             // channel
             field_channel_name: 'Name',
             field_channel_description: 'Description',
-            field_channel_type: 'Type',
-        },
+            field_channel_type: 'Type'
+        }
     },
     es: {
         translation: {
@@ -1996,6 +2000,8 @@ export const websiteTranslations = {
             "api.data.serverStorageFull": "El servidor ha alcanzado su capacidad máxima de almacenamiento. Inténtelo de nuevo más tarde.",
 
             "tourpoint.importDatapack": "Importa paquetes de datos prediseñados con nuestra galería de paquetes: sitios web, comercio electrónico, CRM y más",
+            "tourpoint.tutorials": "¡Déjate guiar por nuestros tutoriales paso a paso!",
+
             "add_language": "Añadir...",
             "select_or_add_language": "Seleccione o añada un idioma para empezar.",
             "field.richtext_t": "Texto enriquecido traducido",
@@ -2881,7 +2887,7 @@ export const websiteTranslations = {
             "dataimporter.title": "Importar datos a {{model}}",
             "dataimporter.hasCsvHeaders": "¿El archivo CSV contiene una fila de encabezado?",
             "dataimporter.info": "Importa tu archivo JSON o CSV con los datos necesarios para tu modelo. Tus datos se copiarán a tu base de datos personal. La velocidad de transferencia es {{constante}}",
-            "links.demo": "¡Prueba la demo!",
+            "links.demo": "Iniciar la demostración",
             "filterstringfield.placeholder.regex": 'Expresión regular',
             "cgu.h1": "Condiciones Generales de Uso (CGU)",
             "cgu.h1.1": "1. Introducción",
@@ -3332,8 +3338,8 @@ export const websiteTranslations = {
             // channel
             field_channel_name: 'Nombre',
             field_channel_description: 'Descripción',
-            field_channel_type: 'Tipo',
-        },
+            field_channel_type: 'Tipo'
+        }
     },
     pt: {
         translation: {
@@ -3403,6 +3409,7 @@ export const websiteTranslations = {
             "api.data.serverStorageFull": "O servidor atingiu a sua capacidade máxima de armazenamento. Tente novamente mais tarde.",
 
             "tourpoint.importDatapack": "Importe pacotes de dados pré-criados com a nossa galeria de pacotes: sites, comércio eletrónico, CRM e muito mais!",
+            "tourpoint.tutorials": "Deixe-se guiar seguindo os nossos tutoriais passo a passo!",
             "add_language": "Adicionar...",
             "select_or_add_language": "Selecione ou adicione um idioma para começar.",
             "field.richtext_t": "Texto rico traduzido",
@@ -4291,7 +4298,7 @@ export const websiteTranslations = {
             "dataimporter.title": "Importar dados para {{model}}",
             "dataimporter.hasCsvHeaders": "O ficheiro CSV contém uma linha de cabeçalho?",
             "dataimporter.info": "Importe o seu ficheiro JSON ou CSV contendo os dados necessários para o seu modelo. Os seus dados serão copiados para a sua base de dados pessoal. A taxa de transferência é {{constante}}",
-            "links.demo": "Experimente a demonstração!",
+            "links.demo": "Iniciar a demonstração",
             "filterstringfield.placeholder.regex": 'Expressão regular',
             "cgu.h1": "Termos e Condições Gerais de Uso (TCGU)",
             "cgu.h1.1": "1. Introdução",
@@ -4736,8 +4743,8 @@ export const websiteTranslations = {
             // channel
             field_channel_name: 'Nome',
             field_channel_description: 'Descrição',
-            field_channel_type: 'Tipo',
-        },
+            field_channel_type: 'Tipo'
+        }
     },
     de: {
         translation: {
@@ -4795,6 +4802,8 @@ export const websiteTranslations = {
             "api.data.serverStorageFull": "Der Server hat seine maximale Speicherkapazität erreicht. Bitte versuchen Sie es später erneut.",
 
             "tourpoint.importDatapack": "Vorgefertigte Datenpakete mit unserer Packgalerie importieren: Websites, E-Commerce, CRM und mehr!",
+            "tourpoint.tutorials": "Lassen Sie sich von unseren Schritt-für-Schritt-Tutorials leiten!",
+
             "add_language": "Hinzufügen...",
             "select_or_add_language": "Wählen oder fügen Sie eine Sprache hinzu, um zu beginnen.",
             "field.richtext_t": "Übersetzter Rich Text",
@@ -5672,7 +5681,7 @@ export const websiteTranslations = {
             "dataimporter.title": "Daten in {{model}} importieren",
             "dataimporter.hasCsvHeaders": "Enthält die CSV-Datei eine Kopfzeile?",
             "dataimporter.info": "Importieren Sie Ihre JSON- oder CSV-Datei mit den benötigten Daten für Ihr Modell. Ihre Daten werden in Ihre persönliche Datenbank kopiert. Die Übertragungsrate beträgt {{constante}}",
-            "links.demo": "Probieren Sie die Demo aus!",
+            "links.demo": "Demo starten",
             "filterstringfield.placeholder.regex": 'Regulärer Ausdruck',
             "cgu.h1": "Nutzungsbedingungen (TOU)",
             "cgu.h1.1": "1. Einleitung",
@@ -6122,8 +6131,8 @@ export const websiteTranslations = {
             // channel
             field_channel_name: 'Name',
             field_channel_description: 'Beschreibung',
-            field_channel_type: 'Typ',
-        },
+            field_channel_type: 'Typ'
+        }
     },
     it: {
         translation: {
@@ -6193,6 +6202,7 @@ export const websiteTranslations = {
             "api.data.serverStorageFull": "Il server ha raggiunto la capacità massima di archiviazione. Riprova più tardi.",
 
             "tourpoint.importDatapack": "Importa pacchetti di dati predefiniti con la nostra galleria di pacchetti: siti web, e-commerce, CRM e altro ancora!",
+            "tourpoint.tutorials": "Lasciati guidare seguendo i nostri tutorial passo dopo passo!",
             "add_language": "Aggiungi...",
             "select_or_add_language": "Seleziona o aggiungi una lingua per iniziare.",
             "field.richtext_t": "Rich text tradotto",
@@ -7077,7 +7087,7 @@ export const websiteTranslations = {
             "dataimporter.title": "Importa dati in {{model}}",
             "dataimporter.hasCsvHeaders": "Il file CSV contiene una riga di intestazione?",
             "dataimporter.info": "Importa il tuo file JSON o CSV contenente i dati necessari per il tuo modello. I tuoi dati verranno copiati nel tuo database personale. La velocità di trasferimento è {{constante}}",
-            "links.demo": "Prova la demo!",
+            "links.demo": "Avvia la demo",
             "filterstringfield.placeholder.regex": 'Espressione regolare',
             "cgu.h1": "Termini di Utilizzo (TOU)",
             "cgu.h1.1": "1. Introduzione",
@@ -7522,8 +7532,8 @@ export const websiteTranslations = {
             // channel
             field_channel_name: 'Nome',
             field_channel_description: 'Descrizione',
-            field_channel_type: 'Tipo',
-        },
+            field_channel_type: 'Tipo'
+        }
     },
     cs: {
         translation: {
@@ -7593,6 +7603,7 @@ export const websiteTranslations = {
             "api.data.serverStorageFull": "Server dosáhl maximální úložné kapacity. Zkuste to prosím znovu později.",
 
             "tourpoint.importDatapack": "Importujte předpřipravené datové balíčky s naší galerií balíčků: Webové stránky, e-commerce, CRM a další!",
+            "tourpoint.tutorials": "Nechte se vést našimi podrobnými tutoriály!",
             "add_language": "Přidat...",
             "select_or_add_language": "Vyberte nebo přidejte jazyk pro zahájení.",
             "field.richtext_t": "Přeložený formátovaný text",
@@ -8472,7 +8483,7 @@ export const websiteTranslations = {
             "dataimporter.title": "Importovat data do {{model}}",
             "dataimporter.hasCsvHeaders": "Obsahuje soubor CSV řádek záhlaví?",
             "dataimporter.info": "Importujte soubor JSON nebo CSV obsahující požadovaná data pro váš model. Vaše data budou zkopírována do vaší osobní databáze. Přenosová rychlost je {{constante}}",
-            "links.demo": "Vyzkoušejte demo!",
+            "links.demo": "Spustit demo",
             "filterstringfield.placeholder.regex": 'Regulární výraz',
             "cgu.h1": "Podmínky použití (TOU)",
             "cgu.h1.1": "1. Úvod",
@@ -8917,8 +8928,8 @@ export const websiteTranslations = {
             // channel
             field_channel_name: 'Jméno',
             field_channel_description: 'Popis',
-            field_channel_type: 'Typ',
-        },
+            field_channel_type: 'Typ'
+        }
     },
     ru: {
         translation: {
@@ -8988,6 +8999,7 @@ export const websiteTranslations = {
             "api.data.serverStorageFull": "Сервер достиг максимального объёма хранилища. Повторите попытку позже.",
 
             "tourpoint.importDatapack": "Импортируйте готовые пакеты данных с помощью нашей галереи пакетов: веб-сайты, электронная коммерция, CRM и многое другое!",
+            "tourpoint.tutorials": "Доверьтесь нашим пошаговым инструкциям!",
             "add_language": "Добавить...",
             "select_or_add_language": "Выберите или добавьте язык для начала работы",
             "field.richtext_t": "Переведенный форматированный текст",
@@ -9875,7 +9887,7 @@ export const websiteTranslations = {
             "dataimporter.title": "Импортировать данные в {{model}}",
             "dataimporter.hasCsvHeaders": "Содержит ли CSV-файл строку заголовка?",
             "dataimporter.info": "Импортируйте файл JSON или CSV, содержащий необходимые данные для вашей модели. Ваши данные будут скопированы в вашу личную базу данных. Скорость передачи составляет {{constante}}",
-            "links.demo": "Попробуйте демо!",
+            "links.demo": "Запустить демо",
             "filterstringfield.placeholder.regex": 'Регулярное выражение',
             "cgu.h1": "Условия использования (TOU)",
             "cgu.h1.1": "1. Введение",
@@ -10322,8 +10334,8 @@ export const websiteTranslations = {
             // channel
             field_channel_name: 'Имя',
             field_channel_description: 'Описание',
-            field_channel_type: 'Тип',
-        },
+            field_channel_type: 'Тип'
+        }
     },
     ar: {
         translation: {
@@ -10395,6 +10407,8 @@ export const websiteTranslations = {
             "api.data.storageLimitExceeded": "سيتم تجاوز حد التخزين البالغ {{limit}} ميجابايت بهذه الإضافة.",
             "api.data.serverStorageFull": "وصل الخادم إلى الحد الأقصى لسعة التخزين. يُرجى المحاولة مرة أخرى لاحقًا.",
             "tourpoint.importDatapack": "استورد حزم البيانات المعدة مسبقًا باستخدام معرض الحزم لدينا: مواقع الويب، والتجارة الإلكترونية، وإدارة علاقات العملاء، والمزيد!",
+            "tourpoint.tutorials": "دع نفسك تسترشد باتباع دروسنا التعليمية خطوة بخطوة!",
+
             "add_language": "إضافة...",
             "select_or_add_language": "اختر أو أضف لغة للبدء.",
             "field.richtext_t": "نص منسق مترجم",
@@ -11297,7 +11311,7 @@ export const websiteTranslations = {
             "dataimporter.title": "استيراد البيانات إلى {{model}}",
             "dataimporter.hasCsvHeaders": "هل يحتوي ملف CSV على صف رأس؟",
             "dataimporter.info": "استورد ملف JSON أو CSV الذي يحتوي على البيانات المطلوبة لنموذجك. سيتم نسخ بياناتك إلى قاعدة بياناتك الشخصية. معدل النقل ثابت ({{constante}}).",
-            "links.demo": "جرب النسخة التجريبية!",
+            "links.demo": "ابدأ العرض التوضيحي",
             "filterstringfield.placeholder.regex": 'تعبير عادي',
             "cgu.h1": "الشروط العامة للاستخدام (GTU)",
             "cgu.h1.1": "1. المقدمة",
@@ -11743,7 +11757,7 @@ export const websiteTranslations = {
             // channel
             field_channel_name: 'الاسم',
             field_channel_description: 'الوصف',
-            field_channel_type: 'النوع',
+            field_channel_type: 'النوع'
         }
     },
     sv: {
@@ -11814,6 +11828,7 @@ export const websiteTranslations = {
             "api.data.serverStorageFull": "Servern har nått sin maximala lagringskapacitet. Försök igen senare.",
 
             "tourpoint.importDatapack": "Importera färdiga datapaket med vårt paketgalleri: Webbplatser, e-handel, CRM och mer!",
+            "tourpoint.tutorials": "Låt dig vägledas av våra steg-för-steg-handledningar!",
             "add_language": "Lägg till...",
             "select_or_add_language": "Välj eller lägg till ett språk för att komma igång.",
             "field.richtext_t": "Översatt RTF",
@@ -12696,7 +12711,7 @@ export const websiteTranslations = {
             "dataimporter.title": "Importera data till {{model}}",
             "dataimporter.hasCsvHeaders": "Innehåller CSV-filen en rubrikrad?",
             "dataimporter.info": "Importera din JSON- eller CSV-fil som innehåller den data som krävs för din modell. Dina data kommer att kopieras till din personliga databas. Överföringshastigheten är {{constante}}",
-            "links.demo": "Testa demon!",
+            "links.demo": "Starta demon",
             "filterstringfield.placeholder.regex": 'Reguljärt uttryck',
             "cgu.h1": "Användarvillkor (Användarvillkor)",
             "cgu.h1.1": "1. Introduktion",
@@ -13138,7 +13153,7 @@ export const websiteTranslations = {
             // channel
             field_channel_name: 'Namn',
             field_channel_description: 'Beskrivning',
-            field_channel_type: 'Typ',
+            field_channel_type: 'Typ'
         }
     },
     el: {
@@ -13209,6 +13224,7 @@ export const websiteTranslations = {
             "api.data.serverStorageFull": "Ο διακομιστής έχει φτάσει στη μέγιστη χωρητικότητα αποθήκευσης. Παρακαλώ προσπαθήστε ξανά αργότερα.",
 
             "tourpoint.importDatapack": "Εισαγάγετε προκατασκευασμένα πακέτα δεδομένων με τη συλλογή πακέτων μας: Ιστότοποι, ηλεκτρονικό εμπόριο, CRM και πολλά άλλα!",
+            "tourpoint.tutorials": "Ακολουθώντας τα βήμα προς βήμα εκπαιδευτικά μας βίντεο, αφήστε τον εαυτό σας να σας καθοδηγήσει!",
             "add_language": "Προσθήκη...",
             "select_or_add_language": "Επιλέξτε ή προσθέστε μια γλώσσα για να ξεκινήσετε.",
             "field.richtext_t": "Μεταφρασμένο εμπλουτισμένο κείμενο",
@@ -14096,7 +14112,7 @@ export const websiteTranslations = {
             "dataimporter.title": "Εισαγωγή δεδομένων στο {{model}}",
             "dataimporter.hasCsvHeaders": "Περιέχει το αρχείο CSV μια γραμμή κεφαλίδας;",
             "dataimporter.info": "Εισαγάγετε το αρχείο JSON που περιέχει τα απαιτούμενα δεδομένα για το μοντέλο σας. Τα δεδομένα σας θα αντιγραφούν στην προσωπική σας βάση δεδομένων. Ο ρυθμός μεταφοράς είναι {{constante}}",
-            "links.demo": "Δοκιμάστε την επίδειξη!",
+            "links.demo": "Έναρξη της επίδειξης",
             "filterstringfield.placeholder.regex": "Κανονική έκφραση",
             "cgu.h1": "Γενικοί όροι χρήσης (GTU)",
             "cgu.h1.1": "1. Εισαγωγή",
@@ -14545,6 +14561,7 @@ export const websiteTranslations = {
     },
     fa: {
         "translation": {
+            "links.demo": "شروع نسخهٔ نمایشی",
             "cb.searchOperator": "جستجوی یک عملگر...",
             "cb.changeOperator": "تغییر عملگر",
             "cb.deleteBlock": "حذف این بلوک",
@@ -14611,6 +14628,7 @@ export const websiteTranslations = {
             "api.data.serverStorageFull": "سرور به حداکثر ظرفیت ذخیره‌سازی خود رسیده است. لطفاً بعداً دوباره امتحان کنید.",
 
             "tourpoint.importDatapack": "بسته‌های داده از پیش ساخته شده را با گالری بسته‌های ما وارد کنید: وب‌سایت‌ها، تجارت الکترونیک، CRM و موارد دیگر!",
+            "tourpoint.tutorials": "با دنبال کردن آموزش‌های گام به گام ما، خودتان را راهنمایی کنید!",
             "add_language": "اضافه کردن...",
             "select_or_add_language": "برای شروع، یک زبان را انتخاب یا اضافه کنید.",
             "field.richtext_t": "متن غنی ترجمه شده",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "data-primals-engine",
-  "version": "1.1.7-rc1",
+  "version": "1.1.8-rc.1",
   "description": "data-primals-engine is the package responsible from handling large amount of data in a practical and performant way. It can handle large amount of data in a practical and performant way. It can also get workflow models working (for automation), and fully supports internationalisation.",
   "main": "src/engine.js",
   "type": "module",
@@ -102,13 +102,12 @@
     "client"
   ],
   "keywords": [
-    "mongodb",
-    "data",
-    "primals",
+    "data-driven engine",
+    "headless CMS",
+    "backend",
     "automation",
-    "aws",
-    "bucket",
-    "S3"
+    "AWS S3",
+    "MongoDB"
   ],
   "author": "anonympins",
   "license": "MIT",

package/src/engine.js

@@ -41,17 +41,35 @@ const secureContext = tls.createSecureContext({
     ca: caFile, cert: certFile, key: keyFile
 });
 
+export const dbUrl = process.env.CI ? 'mongodb://mongodb:27017' : (process.env.MONGO_DB_URL || 'mongodb://127.0.0.1:27017');
+
 const isTlsActive = !(!process.env.TLS || ["0", "false"].includes(process.env.TLS.toLowerCase()));
 
-// Connection URL
-export const dbUrl = process.env.CI ? 'mongodb://mongodb:27017' : (process.env.MONGO_DB_URL || 'mongodb://127.0.0.1:27017');
-export const MongoClient = new InternalMongoClient(dbUrl, {
-    maxPoolSize: databasePoolSize,
-    tls: isTlsActive,
-    secureContext,
-    tlsAllowInvalidCertificates,
-    tlsAllowInvalidHostnames
-});
+const clientOptions = {
+    maxPoolSize: databasePoolSize
+};
+// On ajoute les options TLS si elles sont activées
+if (isTlsActive) {
+    clientOptions.tls = true;
+    // Chemin vers le certificat de l'autorité de certification (pour faire confiance au serveur)
+    if (process.env.CA_CERT) {
+        clientOptions.tlsCAFile = process.env.CA_CERT;
+    }
+    // Chemin vers le certificat et la clé du CLIENT (pour que le serveur vous fasse confiance)
+    if (process.env.CERT_KEY) {
+        clientOptions.tlsCertificateKeyFile = process.env.CERT_KEY;
+    }
+    // Options pour le développement (à utiliser avec prudence)
+    if (tlsAllowInvalidCertificates) {
+        clientOptions.tlsAllowInvalidCertificates = true;
+    }
+    if (tlsAllowInvalidHostnames) {
+        clientOptions.tlsAllowInvalidHostnames = true;
+    }
+}
+
+export const MongoClient = new InternalMongoClient(dbUrl, clientOptions);
+
 
 // Database Name
 export const MongoDatabase = MongoClient.db(dbName);

package/src/middlewares/middleware-mongodb.js

@@ -112,7 +112,7 @@ function sanitize(target, options = {}) {
 export function middleware(options = {}) {
     const hasOnSanitize = typeof options.onSanitize === 'function';
     return function (req, res, next) {
-        ['body', 'params', 'headers', 'query'].forEach(function (key) {
+        ['body', 'fields', 'params', 'headers', 'query'].forEach(function (key) {
             if (req[key]) {
                 // The _sanitize function mutates the req[key] object in-place.
                 // We only need to capture whether it was sanitized to call the hook.

package/src/modules/data.js

@@ -89,6 +89,8 @@ import {getAllPacks} from "../packs.js";
 import {throttleMiddleware} from "../middlewares/throttle.js";
 import {Config} from "../config.js";
 import {profiles} from "../../client/src/constants.js";
+import {processFilterPlaceholders} from "../../client/src/filter.js";
+import {tutorialsConfig} from "../../client/src/tutorials.js";
 
 // Obtenir le chemin du répertoire courant de manière fiable avec ES Modules
 const __filename = fileURLToPath(import.meta.url);
@@ -1507,6 +1509,128 @@ export async function onInit(defaultEngine) {
         }
     });
 
+    /**
+     * Route pour vérifier si une condition de complétion est remplie.
+     * Utilise la fonction `searchData` existante pour interroger les données.
+     */
+    engine.post('/api/tutorials/check-completion', middlewareAuthenticator, async (req, res) => {
+        try {
+            const { model, filter, limit } = req.fields;
+            const user = req.me;
+
+            if (!model || !filter || limit === undefined) {
+                return res.status(400).json({ error: 'Payload de condition de complétion invalide.' });
+            }
+
+            const processedFilter = processFilterPlaceholders(filter, user);
+
+            // On utilise la fonction de recherche interne de l'application
+            const searchResult = await searchData({
+                query: {
+                    model,
+                    filter: processedFilter,
+                    limit, // Optimisation : pas besoin de plus de résultats
+                    page: 1
+                },
+                user: user
+            });
+
+            // searchData devrait renvoyer un `count` total des documents correspondants
+            const isCompleted = searchResult.count >= limit;
+
+            res.json({ isCompleted });
+
+        } catch (error) {
+            console.error('[Tutoriel Check Error]', error);
+            res.status(500).json({ error: 'Erreur lors de la vérification de la complétion.', details: error.message });
+        }
+    });
+
+
+
+    engine.post('/api/tutorials/set-active', middlewareAuthenticator, async (req, res) => {
+        try {
+            const { tutorialState } = req.fields;
+            const user = req.me;
+
+            if (tutorialState !== null && (typeof tutorialState !== 'object' || !tutorialState.id)) {
+                return res.status(400).json({ error: 'Invalid tutorial state payload.' });
+            }
+
+            // Créer une représentation de l'utilisateur mis à jour pour la réponse
+            const updatedData = { activeTutorial: tutorialState };
+
+            await engine.userProvider.updateUser(user, updatedData);
+
+            // --- MODIFICATION ---
+            res.json({
+                success: true,
+                updatedData // Renvoyer l'objet utilisateur complet
+            });
+
+        } catch (error) {
+            console.error('[Tutoriel Set Active Error]', error);
+            res.status(500).json({ error: 'Error setting active tutorial.', details: error.message });
+        }
+    });
+
+    // ...
+
+    engine.post('/api/tutorials/:tutorialId/claim-rewards', middlewareAuthenticator, async (req, res) => {
+        try {
+            const { tutorialId } = req.params;
+            const user = req.me; // L'objet utilisateur est déjà chargé
+            const tutorial = tutorialsConfig.find(t => t.id === tutorialId);
+
+            if (!tutorial) return res.status(404).json({ error: 'Tutoriel non trouvé.' });
+            if (!tutorial.rewards) return res.status(400).json({ error: 'Ce tutoriel n\'a pas de récompenses.' });
+            if (user.completedTutorials?.includes(tutorialId)) {
+                return res.status(400).json({ error: 'Tutoriel déjà terminé.' });
+            }
+
+            const { xpBonus, skill, achievement, notification } = tutorial.rewards;
+
+            // --- LOGIQUE CORRIGÉE ---
+            let newData= {};
+            newData.xp = newData.xp || 0;
+            newData.achievements = newData.achievements || [];
+            newData.skills = newData.skills || [];
+            newData.completedTutorials = newData.completedTutorials || [];
+
+            // Appliquer les récompenses directement sur l'objet newData
+            if (xpBonus) newData.xp += xpBonus;
+            if (achievement && !newData.achievements.includes(achievement)) newData.achievements.push(achievement);
+            if (skill) {
+                const existingSkill = newData.skills.find(s => s.name === skill.name);
+                if (existingSkill) {
+                    existingSkill.points += skill.points;
+                } else {
+                    newData.skills.push({ name: skill.name, points: skill.points });
+                }
+            }
+
+            newData.completedTutorials.push(tutorialId);
+            newData.activeTutorial = null;
+
+            await engine.userProvider.updateUser(user, newData);
+
+            const translatedNotification = {
+                title: i18n.t(notification.title, notification.title),
+                message: i18n.t(notification.message, notification.message)
+            };
+
+            res.json({
+                success: true,
+                userUpdate: newData, // Renvoyer l'objet utilisateur complet et mis à jour
+                notification: translatedNotification
+            });
+
+        } catch (error) {
+            console.error('[Tutoriel Rewards Error]', error);
+            res.status(500).json({ error: 'Erreur lors de l\'attribution des récompenses.', details: error.message });
+        }
+    });
+
     engine.get('/api/import/progress/:jobId', [middlewareAuthenticator], async (req, res) => {
         const { jobId } = req.params;
         const user = req.me;
@@ -3365,6 +3489,24 @@ async function insertAndResolveRelations(doc, model, collection, me, idMap) {
         return existingDoc._id;
     }
 
+    for (const field of model.fields) {
+        if (field.type === 'relation' && field.relationFilter && docToProcess[field.name]) {
+            const relatedIds = Array.isArray(docToProcess[field.name]) ? docToProcess[field.name] : [docToProcess[field.name]];
+            for (const id of relatedIds) {
+                const targetCollection = await getCollectionForUser(me, field.targetModel);
+                const validationQuery = {
+                    _id: new ObjectId(id), // L'ID doit correspondre
+                    ...field.relationFilter // ET le document doit respecter le filtre
+                };
+                const relatedDoc = await targetCollection.findOne(validationQuery);
+                if (!relatedDoc) {
+                    // Si on ne trouve rien, c'est que l'ID est invalide ou ne respecte pas le filtre.
+                    throw new Error(`La valeur '${id}' pour le champ '${field.name}' ne respecte pas le filtre de relation défini.`);
+                }
+            }
+        }
+    }
+
     // Insertion en conservant éventuellement l'ID original
     const result = docToProcess._id
         ? await collection.insertOne(docToProcess)
@@ -3584,6 +3726,33 @@ const internalEditOrPatchData = async (modelName, filter, data, files, user, isP
             }
         }
 
+        for (const field of model.fields) {
+            // On ne vérifie que si un champ de relation avec un filtre est en cours de modification.
+            if (field.type === 'relation' && field.relationFilter && updateData[field.name] !== undefined) {
+                const relatedIds = Array.isArray(updateData[field.name])
+                    ? updateData[field.name]
+                    : (updateData[field.name] ? [updateData[field.name]] : []);
+
+                for (const id of relatedIds) {
+                    if (!id || !isObjectId(id)) continue; // Ignorer les valeurs null/invalides
+
+                    const targetCollection = await getCollectionForUser(user, field.relation);
+
+                    const validationQuery = {
+                        _id: new ObjectId(id),
+                        ...field.relationFilter
+                    };
+
+                    const relatedDoc = await targetCollection.findOne(validationQuery);
+
+                    if (!relatedDoc) {
+                        // Si on ne trouve rien, c'est que l'ID est invalide ou ne respecte pas le filtre.
+                        throw new Error(`La valeur '${id}' pour le champ '${field.name}' ne respecte pas le filtre de relation défini.`);
+                    }
+                }
+            }
+        }
+
         // 8. Calcul du nouveau hash et préparation des données finales
         const finalStateForHash = { ...existingDocs[0], ...updateData };
         const newHash = getFieldValueHash(model, finalStateForHash);