@nkhang1902/strapi-plugin-export-import-clsx 1.2.4 → 1.2.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nkhang1902/strapi-plugin-export-import-clsx",
-  "version": "1.2.4",
+  "version": "1.2.6",
   "description": "A powerful Strapi plugin for exporting and importing data with Excel support and advanced filtering",
   "main": "./strapi-server.js",
   "scripts": {

package/server/services/import-service.js

@@ -147,16 +147,23 @@ module.exports = ({ strapi }) => ({
       .map(([fieldName, attr]) => toCamel(fieldName));
   },
 
-  async handleRelations(entry, contentType) {
-    const resolveRelationValue = async (field, value, target) => {
+  async handleRelations(entry, contentType, eventId) {
+    const resolveRelationValue = async (field, value, target, eventId) => {
       const targetAttr = strapi.contentTypes[target].attributes;
       for (const field of SHORTCUT_FIELDS) {
         if (!targetAttr[field]) continue;
+        const filters = {
+          [field]: { $eq: value },
+        };
+        if (targetAttr.event && eventId) {
+          filters.event = {
+            documentId: { $eq: eventId },
+          };
+        }
         const existing = await strapi.documents(target).findFirst({
-          filters: { [field]: { $eq: value } },
+          filters,
         });
         if (existing) return { id: existing.id };
-        // throw new Error(`Not found.`);
         return null;
       }
       return null;
@@ -205,7 +212,7 @@ module.exports = ({ strapi }) => ({
 
         for (const v of values) {
           if (!v || v === "") continue;
-          const resolved = await resolveRelationValue(field, v, target);
+          const resolved = await resolveRelationValue(field, v, target, eventId);
           if (resolved) processed.push(resolved);
         }
 
@@ -393,15 +400,6 @@ module.exports = ({ strapi }) => ({
     const results = { created: 0, updated: 0, errors: [] };
   
     await strapi.db.transaction(async ({ trx }) => {
-      let event = null;
-  
-      if (eventId) {
-        event = await strapi.documents("api::event.event").findFirst(
-          { filters: { documentId: eventId } },
-          { transaction: trx }
-        );
-      }
-  
       let shouldRollback = false;
   
       for (let i = 0; i < entries.length; i++) {
@@ -419,9 +417,7 @@ module.exports = ({ strapi }) => ({
             // if (!existing) throw new Error(`Document with id ${id} not found`);
           }
 
-          if (event && !data.event) data.event = event.name;
-
-          data = await this.handleRelations(data, contentType);
+          data = await this.handleRelations(data, contentType, eventId);
           data = await this.handleComponents(data, existing, contentType);
 
           const sanitizeErrors = [];
@@ -438,7 +434,7 @@ module.exports = ({ strapi }) => ({
             results.updated++;
           } else {
             await strapi.documents(contentType).create(
-              { data },
+              { ...data, event: { documentId: eventId } },
               { transaction: trx }
             );
             results.created++;