strapi-plugin-magic-mail 2.3.3 → 2.3.5

package/dist/server/index.js

@@ -5543,7 +5543,7 @@ function requireOauth() {
   });
   return oauth;
 }
-const version = "2.3.2";
+const version = "2.3.4";
 const require$$2 = {
   version
 };
@@ -5976,14 +5976,20 @@ function requireEmailDesigner() {
     },
     /**
      * Get template by numeric ID (for backward compatibility)
+     * Note: Document Service cannot filter by internal 'id' field,
+     * so we use entityService as fallback for numeric IDs
      */
     async findById(id) {
-      const results = await strapi2.documents(EMAIL_TEMPLATE_UID).findMany({
-        filters: { id },
-        limit: 1,
+      strapi2.log.info(`[magic-mail] [LOOKUP] Finding template by numeric ID: ${id}`);
+      const result = await strapi2.entityService.findOne(EMAIL_TEMPLATE_UID, id, {
         populate: ["versions"]
       });
-      return results.length > 0 ? results[0] : null;
+      if (result) {
+        strapi2.log.info(`[magic-mail] [SUCCESS] Found template by ID ${id}: documentId=${result.documentId}, name="${result.name}"`);
+      } else {
+        strapi2.log.warn(`[magic-mail] [WARNING] Template with ID ${id} not found`);
+      }
+      return result;
     },
     /**
      * Get template by reference ID
@@ -6039,18 +6045,21 @@ function requireEmailDesigner() {
     },
     /**
      * Update template with automatic version snapshot
+     * @param {string|number} idOrDocumentId - Either numeric id or documentId
+     * @param {Object} data - Update data
      */
-    async update(documentId, data) {
-      strapi2.log.info(`[magic-mail] [UPDATE] Updating template documentId: ${documentId}`);
-      const template = await this.findOne(documentId);
+    async update(idOrDocumentId, data) {
+      strapi2.log.info(`[magic-mail] [UPDATE] Updating template: ${idOrDocumentId}`);
+      const template = await this.findOne(idOrDocumentId);
       if (!template) {
         throw new Error("Template not found");
       }
-      strapi2.log.info(`[magic-mail] [INFO] Found template: documentId=${template.documentId}, name="${template.name}"`);
+      const actualDocumentId = template.documentId;
+      strapi2.log.info(`[magic-mail] [INFO] Found template: documentId=${actualDocumentId}, name="${template.name}"`);
       const hasVersioning = await strapi2.plugin("magic-mail").service("license-guard").hasFeature("email-designer-versioning");
       if (hasVersioning) {
         strapi2.log.info("[magic-mail] [SAVE] Creating version snapshot before update...");
-        await this.createVersion(template.documentId, {
+        await this.createVersion(actualDocumentId, {
           name: template.name,
           subject: template.subject,
           design: template.design,
@@ -6066,7 +6075,7 @@ function requireEmailDesigner() {
         strapi2.log.warn("[magic-mail] [WARNING]  Removed versions field from update data");
       }
       const updated = await strapi2.documents(EMAIL_TEMPLATE_UID).update({
-        documentId,
+        documentId: actualDocumentId,
         data: updateData
       });
       strapi2.log.info(`[magic-mail] [SUCCESS] Template updated: documentId=${updated.documentId}`);
@@ -6074,42 +6083,47 @@ function requireEmailDesigner() {
     },
     /**
      * Delete template and all its versions
+     * @param {string|number} idOrDocumentId - Either numeric id or documentId
      */
-    async delete(documentId) {
-      strapi2.log.info(`[magic-mail] [DELETE]  Deleting template documentId: ${documentId}`);
-      const template = await this.findOne(documentId);
+    async delete(idOrDocumentId) {
+      strapi2.log.info(`[magic-mail] [DELETE] Deleting template: ${idOrDocumentId}`);
+      const template = await this.findOne(idOrDocumentId);
       if (!template) {
         throw new Error("Template not found");
       }
-      strapi2.log.info(`[magic-mail] [DELETE]  Template: documentId=${template.documentId}, name="${template.name}"`);
+      const actualDocumentId = template.documentId;
+      strapi2.log.info(`[magic-mail] [DELETE] Template: documentId=${actualDocumentId}, name="${template.name}"`);
       const allVersions = await strapi2.documents(EMAIL_TEMPLATE_VERSION_UID).findMany({
         filters: {
           template: {
-            documentId: template.documentId
+            documentId: actualDocumentId
           }
         }
       });
-      strapi2.log.info(`[magic-mail] [DELETE]  Found ${allVersions.length} versions to delete`);
+      strapi2.log.info(`[magic-mail] [DELETE] Found ${allVersions.length} versions to delete`);
       for (const version2 of allVersions) {
         try {
           await strapi2.documents(EMAIL_TEMPLATE_VERSION_UID).delete({
             documentId: version2.documentId
           });
-          strapi2.log.info(`[magic-mail] [DELETE]  Deleted version #${version2.versionNumber}`);
+          strapi2.log.info(`[magic-mail] [DELETE] Deleted version #${version2.versionNumber}`);
         } catch (versionError) {
-          strapi2.log.warn(`[magic-mail] [WARNING]  Failed to delete version: ${versionError.message}`);
+          strapi2.log.warn(`[magic-mail] [WARNING] Failed to delete version: ${versionError.message}`);
         }
       }
-      const result = await strapi2.documents(EMAIL_TEMPLATE_UID).delete({ documentId });
+      const result = await strapi2.documents(EMAIL_TEMPLATE_UID).delete({
+        documentId: actualDocumentId
+      });
       strapi2.log.info(`[magic-mail] [SUCCESS] Template "${template.name}" and ${allVersions.length} versions deleted`);
       return result;
     },
     /**
      * Duplicate template
+     * @param {string|number} idOrDocumentId - Either numeric id or documentId
      */
-    async duplicate(documentId) {
-      strapi2.log.info(`[magic-mail] [INFO] Duplicating template documentId: ${documentId}`);
-      const original = await this.findOne(documentId);
+    async duplicate(idOrDocumentId) {
+      strapi2.log.info(`[magic-mail] [INFO] Duplicating template: ${idOrDocumentId}`);
+      const original = await this.findOne(idOrDocumentId);
       if (!original) {
         throw new Error("Template not found");
       }
@@ -6167,16 +6181,15 @@ function requireEmailDesigner() {
     },
     /**
      * Get all versions for a template
+     * @param {string|number} idOrDocumentId - Either numeric id or documentId
      */
-    async getVersions(templateDocumentId) {
-      strapi2.log.info(`[magic-mail] [VERSION] Fetching versions for template documentId: ${templateDocumentId}`);
-      const template = await strapi2.documents(EMAIL_TEMPLATE_UID).findOne({
-        documentId: templateDocumentId,
-        populate: ["versions"]
-      });
+    async getVersions(idOrDocumentId) {
+      strapi2.log.info(`[magic-mail] [VERSION] Fetching versions for template: ${idOrDocumentId}`);
+      const template = await this.findOne(idOrDocumentId);
       if (!template) {
         throw new Error("Template not found");
       }
+      const actualDocumentId = template.documentId;
       strapi2.log.info(`[magic-mail] [PACKAGE] Template has ${template.versions?.length || 0} versions`);
       if (template.versions && template.versions.length > 0) {
         const sortedVersions = [...template.versions].sort((a, b) => b.versionNumber - a.versionNumber);
@@ -6185,7 +6198,7 @@ function requireEmailDesigner() {
       const versions = await strapi2.documents(EMAIL_TEMPLATE_VERSION_UID).findMany({
         filters: {
           template: {
-            documentId: templateDocumentId
+            documentId: actualDocumentId
           }
         },
         sort: [{ versionNumber: "desc" }]
@@ -6195,9 +6208,16 @@ function requireEmailDesigner() {
     },
     /**
      * Restore template from a specific version
+     * @param {string|number} idOrDocumentId - Either numeric id or documentId of template
+     * @param {string} versionDocumentId - documentId of version to restore
      */
-    async restoreVersion(templateDocumentId, versionDocumentId) {
-      strapi2.log.info(`[magic-mail] [RESTORE] Restoring template ${templateDocumentId} from version ${versionDocumentId}`);
+    async restoreVersion(idOrDocumentId, versionDocumentId) {
+      strapi2.log.info(`[magic-mail] [RESTORE] Restoring template ${idOrDocumentId} from version ${versionDocumentId}`);
+      const template = await this.findOne(idOrDocumentId);
+      if (!template) {
+        throw new Error("Template not found");
+      }
+      const actualDocumentId = template.documentId;
       const version2 = await strapi2.documents(EMAIL_TEMPLATE_VERSION_UID).findOne({
         documentId: versionDocumentId,
         populate: ["template"]
@@ -6205,10 +6225,10 @@ function requireEmailDesigner() {
       if (!version2) {
         throw new Error("Version not found");
       }
-      if (version2.template?.documentId !== templateDocumentId) {
+      if (version2.template?.documentId !== actualDocumentId) {
         throw new Error("Version does not belong to this template");
       }
-      const restored = await this.update(templateDocumentId, {
+      const restored = await this.update(actualDocumentId, {
         name: version2.name,
         subject: version2.subject,
         design: version2.design,
@@ -6221,9 +6241,16 @@ function requireEmailDesigner() {
     },
     /**
      * Delete a single version
+     * @param {string|number} idOrDocumentId - Either numeric id or documentId of template
+     * @param {string} versionDocumentId - documentId of version to delete
      */
-    async deleteVersion(templateDocumentId, versionDocumentId) {
-      strapi2.log.info(`[magic-mail] [DELETE]  Deleting version ${versionDocumentId}`);
+    async deleteVersion(idOrDocumentId, versionDocumentId) {
+      strapi2.log.info(`[magic-mail] [DELETE] Deleting version ${versionDocumentId}`);
+      const template = await this.findOne(idOrDocumentId);
+      if (!template) {
+        throw new Error("Template not found");
+      }
+      const actualDocumentId = template.documentId;
       const version2 = await strapi2.documents(EMAIL_TEMPLATE_VERSION_UID).findOne({
         documentId: versionDocumentId,
         populate: ["template"]
@@ -6231,7 +6258,7 @@ function requireEmailDesigner() {
       if (!version2) {
         throw new Error("Version not found");
       }
-      if (version2.template?.documentId !== templateDocumentId) {
+      if (version2.template?.documentId !== actualDocumentId) {
         throw new Error("Version does not belong to this template");
       }
       await strapi2.documents(EMAIL_TEMPLATE_VERSION_UID).delete({
@@ -6242,13 +6269,11 @@ function requireEmailDesigner() {
     },
     /**
      * Delete all versions for a template
+     * @param {string|number} idOrDocumentId - Either numeric id or documentId
      */
-    async deleteAllVersions(templateDocumentId) {
-      strapi2.log.info(`[magic-mail] [DELETE]  Deleting all versions for template ${templateDocumentId}`);
-      const template = await strapi2.documents(EMAIL_TEMPLATE_UID).findOne({
-        documentId: templateDocumentId,
-        populate: ["versions"]
-      });
+    async deleteAllVersions(idOrDocumentId) {
+      strapi2.log.info(`[magic-mail] [DELETE] Deleting all versions for template ${idOrDocumentId}`);
+      const template = await this.findOne(idOrDocumentId);
       if (!template) {
         throw new Error("Template not found");
       }

package/dist/server/index.mjs

@@ -5533,7 +5533,7 @@ function requireOauth() {
   });
   return oauth;
 }
-const version = "2.3.2";
+const version = "2.3.4";
 const require$$2 = {
   version
 };
@@ -5966,14 +5966,20 @@ function requireEmailDesigner() {
     },
     /**
      * Get template by numeric ID (for backward compatibility)
+     * Note: Document Service cannot filter by internal 'id' field,
+     * so we use entityService as fallback for numeric IDs
      */
     async findById(id) {
-      const results = await strapi2.documents(EMAIL_TEMPLATE_UID).findMany({
-        filters: { id },
-        limit: 1,
+      strapi2.log.info(`[magic-mail] [LOOKUP] Finding template by numeric ID: ${id}`);
+      const result = await strapi2.entityService.findOne(EMAIL_TEMPLATE_UID, id, {
         populate: ["versions"]
       });
-      return results.length > 0 ? results[0] : null;
+      if (result) {
+        strapi2.log.info(`[magic-mail] [SUCCESS] Found template by ID ${id}: documentId=${result.documentId}, name="${result.name}"`);
+      } else {
+        strapi2.log.warn(`[magic-mail] [WARNING] Template with ID ${id} not found`);
+      }
+      return result;
     },
     /**
      * Get template by reference ID
@@ -6029,18 +6035,21 @@ function requireEmailDesigner() {
     },
     /**
      * Update template with automatic version snapshot
+     * @param {string|number} idOrDocumentId - Either numeric id or documentId
+     * @param {Object} data - Update data
      */
-    async update(documentId, data) {
-      strapi2.log.info(`[magic-mail] [UPDATE] Updating template documentId: ${documentId}`);
-      const template = await this.findOne(documentId);
+    async update(idOrDocumentId, data) {
+      strapi2.log.info(`[magic-mail] [UPDATE] Updating template: ${idOrDocumentId}`);
+      const template = await this.findOne(idOrDocumentId);
       if (!template) {
         throw new Error("Template not found");
       }
-      strapi2.log.info(`[magic-mail] [INFO] Found template: documentId=${template.documentId}, name="${template.name}"`);
+      const actualDocumentId = template.documentId;
+      strapi2.log.info(`[magic-mail] [INFO] Found template: documentId=${actualDocumentId}, name="${template.name}"`);
       const hasVersioning = await strapi2.plugin("magic-mail").service("license-guard").hasFeature("email-designer-versioning");
       if (hasVersioning) {
         strapi2.log.info("[magic-mail] [SAVE] Creating version snapshot before update...");
-        await this.createVersion(template.documentId, {
+        await this.createVersion(actualDocumentId, {
           name: template.name,
           subject: template.subject,
           design: template.design,
@@ -6056,7 +6065,7 @@ function requireEmailDesigner() {
         strapi2.log.warn("[magic-mail] [WARNING]  Removed versions field from update data");
       }
       const updated = await strapi2.documents(EMAIL_TEMPLATE_UID).update({
-        documentId,
+        documentId: actualDocumentId,
         data: updateData
       });
       strapi2.log.info(`[magic-mail] [SUCCESS] Template updated: documentId=${updated.documentId}`);
@@ -6064,42 +6073,47 @@ function requireEmailDesigner() {
     },
     /**
      * Delete template and all its versions
+     * @param {string|number} idOrDocumentId - Either numeric id or documentId
      */
-    async delete(documentId) {
-      strapi2.log.info(`[magic-mail] [DELETE]  Deleting template documentId: ${documentId}`);
-      const template = await this.findOne(documentId);
+    async delete(idOrDocumentId) {
+      strapi2.log.info(`[magic-mail] [DELETE] Deleting template: ${idOrDocumentId}`);
+      const template = await this.findOne(idOrDocumentId);
       if (!template) {
         throw new Error("Template not found");
       }
-      strapi2.log.info(`[magic-mail] [DELETE]  Template: documentId=${template.documentId}, name="${template.name}"`);
+      const actualDocumentId = template.documentId;
+      strapi2.log.info(`[magic-mail] [DELETE] Template: documentId=${actualDocumentId}, name="${template.name}"`);
       const allVersions = await strapi2.documents(EMAIL_TEMPLATE_VERSION_UID).findMany({
         filters: {
           template: {
-            documentId: template.documentId
+            documentId: actualDocumentId
           }
         }
       });
-      strapi2.log.info(`[magic-mail] [DELETE]  Found ${allVersions.length} versions to delete`);
+      strapi2.log.info(`[magic-mail] [DELETE] Found ${allVersions.length} versions to delete`);
       for (const version2 of allVersions) {
         try {
           await strapi2.documents(EMAIL_TEMPLATE_VERSION_UID).delete({
             documentId: version2.documentId
           });
-          strapi2.log.info(`[magic-mail] [DELETE]  Deleted version #${version2.versionNumber}`);
+          strapi2.log.info(`[magic-mail] [DELETE] Deleted version #${version2.versionNumber}`);
         } catch (versionError) {
-          strapi2.log.warn(`[magic-mail] [WARNING]  Failed to delete version: ${versionError.message}`);
+          strapi2.log.warn(`[magic-mail] [WARNING] Failed to delete version: ${versionError.message}`);
         }
       }
-      const result = await strapi2.documents(EMAIL_TEMPLATE_UID).delete({ documentId });
+      const result = await strapi2.documents(EMAIL_TEMPLATE_UID).delete({
+        documentId: actualDocumentId
+      });
       strapi2.log.info(`[magic-mail] [SUCCESS] Template "${template.name}" and ${allVersions.length} versions deleted`);
       return result;
     },
     /**
      * Duplicate template
+     * @param {string|number} idOrDocumentId - Either numeric id or documentId
      */
-    async duplicate(documentId) {
-      strapi2.log.info(`[magic-mail] [INFO] Duplicating template documentId: ${documentId}`);
-      const original = await this.findOne(documentId);
+    async duplicate(idOrDocumentId) {
+      strapi2.log.info(`[magic-mail] [INFO] Duplicating template: ${idOrDocumentId}`);
+      const original = await this.findOne(idOrDocumentId);
       if (!original) {
         throw new Error("Template not found");
       }
@@ -6157,16 +6171,15 @@ function requireEmailDesigner() {
     },
     /**
      * Get all versions for a template
+     * @param {string|number} idOrDocumentId - Either numeric id or documentId
      */
-    async getVersions(templateDocumentId) {
-      strapi2.log.info(`[magic-mail] [VERSION] Fetching versions for template documentId: ${templateDocumentId}`);
-      const template = await strapi2.documents(EMAIL_TEMPLATE_UID).findOne({
-        documentId: templateDocumentId,
-        populate: ["versions"]
-      });
+    async getVersions(idOrDocumentId) {
+      strapi2.log.info(`[magic-mail] [VERSION] Fetching versions for template: ${idOrDocumentId}`);
+      const template = await this.findOne(idOrDocumentId);
       if (!template) {
         throw new Error("Template not found");
       }
+      const actualDocumentId = template.documentId;
       strapi2.log.info(`[magic-mail] [PACKAGE] Template has ${template.versions?.length || 0} versions`);
       if (template.versions && template.versions.length > 0) {
         const sortedVersions = [...template.versions].sort((a, b) => b.versionNumber - a.versionNumber);
@@ -6175,7 +6188,7 @@ function requireEmailDesigner() {
       const versions = await strapi2.documents(EMAIL_TEMPLATE_VERSION_UID).findMany({
         filters: {
           template: {
-            documentId: templateDocumentId
+            documentId: actualDocumentId
           }
         },
         sort: [{ versionNumber: "desc" }]
@@ -6185,9 +6198,16 @@ function requireEmailDesigner() {
     },
     /**
      * Restore template from a specific version
+     * @param {string|number} idOrDocumentId - Either numeric id or documentId of template
+     * @param {string} versionDocumentId - documentId of version to restore
      */
-    async restoreVersion(templateDocumentId, versionDocumentId) {
-      strapi2.log.info(`[magic-mail] [RESTORE] Restoring template ${templateDocumentId} from version ${versionDocumentId}`);
+    async restoreVersion(idOrDocumentId, versionDocumentId) {
+      strapi2.log.info(`[magic-mail] [RESTORE] Restoring template ${idOrDocumentId} from version ${versionDocumentId}`);
+      const template = await this.findOne(idOrDocumentId);
+      if (!template) {
+        throw new Error("Template not found");
+      }
+      const actualDocumentId = template.documentId;
       const version2 = await strapi2.documents(EMAIL_TEMPLATE_VERSION_UID).findOne({
         documentId: versionDocumentId,
         populate: ["template"]
@@ -6195,10 +6215,10 @@ function requireEmailDesigner() {
       if (!version2) {
         throw new Error("Version not found");
       }
-      if (version2.template?.documentId !== templateDocumentId) {
+      if (version2.template?.documentId !== actualDocumentId) {
         throw new Error("Version does not belong to this template");
       }
-      const restored = await this.update(templateDocumentId, {
+      const restored = await this.update(actualDocumentId, {
         name: version2.name,
         subject: version2.subject,
         design: version2.design,
@@ -6211,9 +6231,16 @@ function requireEmailDesigner() {
     },
     /**
      * Delete a single version
+     * @param {string|number} idOrDocumentId - Either numeric id or documentId of template
+     * @param {string} versionDocumentId - documentId of version to delete
      */
-    async deleteVersion(templateDocumentId, versionDocumentId) {
-      strapi2.log.info(`[magic-mail] [DELETE]  Deleting version ${versionDocumentId}`);
+    async deleteVersion(idOrDocumentId, versionDocumentId) {
+      strapi2.log.info(`[magic-mail] [DELETE] Deleting version ${versionDocumentId}`);
+      const template = await this.findOne(idOrDocumentId);
+      if (!template) {
+        throw new Error("Template not found");
+      }
+      const actualDocumentId = template.documentId;
       const version2 = await strapi2.documents(EMAIL_TEMPLATE_VERSION_UID).findOne({
         documentId: versionDocumentId,
         populate: ["template"]
@@ -6221,7 +6248,7 @@ function requireEmailDesigner() {
       if (!version2) {
         throw new Error("Version not found");
       }
-      if (version2.template?.documentId !== templateDocumentId) {
+      if (version2.template?.documentId !== actualDocumentId) {
         throw new Error("Version does not belong to this template");
       }
       await strapi2.documents(EMAIL_TEMPLATE_VERSION_UID).delete({
@@ -6232,13 +6259,11 @@ function requireEmailDesigner() {
     },
     /**
      * Delete all versions for a template
+     * @param {string|number} idOrDocumentId - Either numeric id or documentId
      */
-    async deleteAllVersions(templateDocumentId) {
-      strapi2.log.info(`[magic-mail] [DELETE]  Deleting all versions for template ${templateDocumentId}`);
-      const template = await strapi2.documents(EMAIL_TEMPLATE_UID).findOne({
-        documentId: templateDocumentId,
-        populate: ["versions"]
-      });
+    async deleteAllVersions(idOrDocumentId) {
+      strapi2.log.info(`[magic-mail] [DELETE] Deleting all versions for template ${idOrDocumentId}`);
+      const template = await this.findOne(idOrDocumentId);
       if (!template) {
         throw new Error("Template not found");
       }

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.3.3",
+  "version": "2.3.5",
   "keywords": [
     "strapi",
     "strapi-plugin",