strapi-plugin-magic-mail 2.3.7 → 2.3.9

package/dist/server/index.js

@@ -5543,7 +5543,7 @@ function requireOauth() {
   });
   return oauth;
 }
-const version = "2.3.6";
+const version = "2.3.8";
 const require$$2 = {
   version
 };
@@ -5971,7 +5971,7 @@ function requireEmailDesigner() {
       }
       return strapi2.documents(EMAIL_TEMPLATE_UID).findOne({
         documentId: String(idOrDocumentId),
-        populate: ["versions"]
+        populate: { versions: true }
       });
     },
     /**
@@ -5984,7 +5984,7 @@ function requireEmailDesigner() {
       const byRefId = await strapi2.documents(EMAIL_TEMPLATE_UID).findMany({
         filters: { templateReferenceId: numericId },
         limit: 1,
-        populate: ["versions"]
+        populate: { versions: true }
       });
       if (byRefId.length > 0) {
         strapi2.log.info(`[magic-mail] [SUCCESS] Found template by templateReferenceId ${numericId}: documentId=${byRefId[0].documentId}, name="${byRefId[0].name}"`);
@@ -5992,7 +5992,7 @@ function requireEmailDesigner() {
       }
       strapi2.log.info(`[magic-mail] [FALLBACK] templateReferenceId not found, trying internal db id: ${numericId}`);
       const byInternalId = await strapi2.entityService.findOne(EMAIL_TEMPLATE_UID, numericId, {
-        populate: ["versions"]
+        populate: { versions: true }
       });
       if (byInternalId) {
         strapi2.log.info(`[magic-mail] [SUCCESS] Found template by internal id ${numericId}: documentId=${byInternalId.documentId}, name="${byInternalId.name}"`);
@@ -6011,6 +6011,37 @@ function requireEmailDesigner() {
       });
       return results.length > 0 ? results[0] : null;
     },
+    /**
+     * Get version by numeric ID or documentId
+     * First tries documentId, then falls back to internal database id via entityService
+     */
+    async findVersionById(idOrDocumentId) {
+      strapi2.log.info(`[magic-mail] [LOOKUP] Finding version by ID: ${idOrDocumentId}`);
+      const isNumericId = /^\d+$/.test(String(idOrDocumentId));
+      if (!isNumericId) {
+        const version2 = await strapi2.documents(EMAIL_TEMPLATE_VERSION_UID).findOne({
+          documentId: String(idOrDocumentId),
+          populate: { template: true }
+        });
+        if (version2) {
+          strapi2.log.info(`[magic-mail] [SUCCESS] Found version by documentId: ${version2.documentId}`);
+          return version2;
+        }
+      }
+      const numericId = Number(idOrDocumentId);
+      if (!isNaN(numericId)) {
+        strapi2.log.info(`[magic-mail] [FALLBACK] Trying internal db id for version: ${numericId}`);
+        const version2 = await strapi2.entityService.findOne(EMAIL_TEMPLATE_VERSION_UID, numericId, {
+          populate: { template: true }
+        });
+        if (version2) {
+          strapi2.log.info(`[magic-mail] [SUCCESS] Found version by internal id ${numericId}: documentId=${version2.documentId}`);
+          return version2;
+        }
+      }
+      strapi2.log.warn(`[magic-mail] [WARNING] Version with ID ${idOrDocumentId} not found`);
+      return null;
+    },
     /**
      * Create new template with automatic initial version
      */
@@ -6218,27 +6249,24 @@ 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
+     * @param {string|number} templateIdOrDocumentId - Either numeric id or documentId of template
+     * @param {string|number} versionIdOrDocumentId - Either numeric id or documentId of version
      */
-    async restoreVersion(idOrDocumentId, versionDocumentId) {
-      strapi2.log.info(`[magic-mail] [RESTORE] Restoring template ${idOrDocumentId} from version ${versionDocumentId}`);
-      const template = await this.findOne(idOrDocumentId);
+    async restoreVersion(templateIdOrDocumentId, versionIdOrDocumentId) {
+      strapi2.log.info(`[magic-mail] [RESTORE] Restoring template ${templateIdOrDocumentId} from version ${versionIdOrDocumentId}`);
+      const template = await this.findOne(templateIdOrDocumentId);
       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"]
-      });
+      const actualTemplateDocumentId = template.documentId;
+      const version2 = await this.findVersionById(versionIdOrDocumentId);
       if (!version2) {
         throw new Error("Version not found");
       }
-      if (version2.template?.documentId !== actualDocumentId) {
+      if (version2.template?.documentId !== actualTemplateDocumentId) {
         throw new Error("Version does not belong to this template");
       }
-      const restored = await this.update(actualDocumentId, {
+      const restored = await this.update(actualTemplateDocumentId, {
         name: version2.name,
         subject: version2.subject,
         design: version2.design,
@@ -6251,28 +6279,25 @@ 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
+     * @param {string|number} templateIdOrDocumentId - Either numeric id or documentId of template
+     * @param {string|number} versionIdOrDocumentId - Either numeric id or documentId of version
      */
-    async deleteVersion(idOrDocumentId, versionDocumentId) {
-      strapi2.log.info(`[magic-mail] [DELETE] Deleting version ${versionDocumentId}`);
-      const template = await this.findOne(idOrDocumentId);
+    async deleteVersion(templateIdOrDocumentId, versionIdOrDocumentId) {
+      strapi2.log.info(`[magic-mail] [DELETE] Deleting version ${versionIdOrDocumentId}`);
+      const template = await this.findOne(templateIdOrDocumentId);
       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"]
-      });
+      const actualTemplateDocumentId = template.documentId;
+      const version2 = await this.findVersionById(versionIdOrDocumentId);
       if (!version2) {
         throw new Error("Version not found");
       }
-      if (version2.template?.documentId !== actualDocumentId) {
+      if (version2.template?.documentId !== actualTemplateDocumentId) {
         throw new Error("Version does not belong to this template");
       }
       await strapi2.documents(EMAIL_TEMPLATE_VERSION_UID).delete({
-        documentId: versionDocumentId
+        documentId: version2.documentId
       });
       strapi2.log.info(`[magic-mail] [SUCCESS] Version v${version2.versionNumber} deleted`);
       return { success: true, message: "Version deleted" };

package/dist/server/index.mjs

@@ -5533,7 +5533,7 @@ function requireOauth() {
   });
   return oauth;
 }
-const version = "2.3.6";
+const version = "2.3.8";
 const require$$2 = {
   version
 };
@@ -5961,7 +5961,7 @@ function requireEmailDesigner() {
       }
       return strapi2.documents(EMAIL_TEMPLATE_UID).findOne({
         documentId: String(idOrDocumentId),
-        populate: ["versions"]
+        populate: { versions: true }
       });
     },
     /**
@@ -5974,7 +5974,7 @@ function requireEmailDesigner() {
       const byRefId = await strapi2.documents(EMAIL_TEMPLATE_UID).findMany({
         filters: { templateReferenceId: numericId },
         limit: 1,
-        populate: ["versions"]
+        populate: { versions: true }
       });
       if (byRefId.length > 0) {
         strapi2.log.info(`[magic-mail] [SUCCESS] Found template by templateReferenceId ${numericId}: documentId=${byRefId[0].documentId}, name="${byRefId[0].name}"`);
@@ -5982,7 +5982,7 @@ function requireEmailDesigner() {
       }
       strapi2.log.info(`[magic-mail] [FALLBACK] templateReferenceId not found, trying internal db id: ${numericId}`);
       const byInternalId = await strapi2.entityService.findOne(EMAIL_TEMPLATE_UID, numericId, {
-        populate: ["versions"]
+        populate: { versions: true }
       });
       if (byInternalId) {
         strapi2.log.info(`[magic-mail] [SUCCESS] Found template by internal id ${numericId}: documentId=${byInternalId.documentId}, name="${byInternalId.name}"`);
@@ -6001,6 +6001,37 @@ function requireEmailDesigner() {
       });
       return results.length > 0 ? results[0] : null;
     },
+    /**
+     * Get version by numeric ID or documentId
+     * First tries documentId, then falls back to internal database id via entityService
+     */
+    async findVersionById(idOrDocumentId) {
+      strapi2.log.info(`[magic-mail] [LOOKUP] Finding version by ID: ${idOrDocumentId}`);
+      const isNumericId = /^\d+$/.test(String(idOrDocumentId));
+      if (!isNumericId) {
+        const version2 = await strapi2.documents(EMAIL_TEMPLATE_VERSION_UID).findOne({
+          documentId: String(idOrDocumentId),
+          populate: { template: true }
+        });
+        if (version2) {
+          strapi2.log.info(`[magic-mail] [SUCCESS] Found version by documentId: ${version2.documentId}`);
+          return version2;
+        }
+      }
+      const numericId = Number(idOrDocumentId);
+      if (!isNaN(numericId)) {
+        strapi2.log.info(`[magic-mail] [FALLBACK] Trying internal db id for version: ${numericId}`);
+        const version2 = await strapi2.entityService.findOne(EMAIL_TEMPLATE_VERSION_UID, numericId, {
+          populate: { template: true }
+        });
+        if (version2) {
+          strapi2.log.info(`[magic-mail] [SUCCESS] Found version by internal id ${numericId}: documentId=${version2.documentId}`);
+          return version2;
+        }
+      }
+      strapi2.log.warn(`[magic-mail] [WARNING] Version with ID ${idOrDocumentId} not found`);
+      return null;
+    },
     /**
      * Create new template with automatic initial version
      */
@@ -6208,27 +6239,24 @@ 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
+     * @param {string|number} templateIdOrDocumentId - Either numeric id or documentId of template
+     * @param {string|number} versionIdOrDocumentId - Either numeric id or documentId of version
      */
-    async restoreVersion(idOrDocumentId, versionDocumentId) {
-      strapi2.log.info(`[magic-mail] [RESTORE] Restoring template ${idOrDocumentId} from version ${versionDocumentId}`);
-      const template = await this.findOne(idOrDocumentId);
+    async restoreVersion(templateIdOrDocumentId, versionIdOrDocumentId) {
+      strapi2.log.info(`[magic-mail] [RESTORE] Restoring template ${templateIdOrDocumentId} from version ${versionIdOrDocumentId}`);
+      const template = await this.findOne(templateIdOrDocumentId);
       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"]
-      });
+      const actualTemplateDocumentId = template.documentId;
+      const version2 = await this.findVersionById(versionIdOrDocumentId);
       if (!version2) {
         throw new Error("Version not found");
       }
-      if (version2.template?.documentId !== actualDocumentId) {
+      if (version2.template?.documentId !== actualTemplateDocumentId) {
         throw new Error("Version does not belong to this template");
       }
-      const restored = await this.update(actualDocumentId, {
+      const restored = await this.update(actualTemplateDocumentId, {
         name: version2.name,
         subject: version2.subject,
         design: version2.design,
@@ -6241,28 +6269,25 @@ 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
+     * @param {string|number} templateIdOrDocumentId - Either numeric id or documentId of template
+     * @param {string|number} versionIdOrDocumentId - Either numeric id or documentId of version
      */
-    async deleteVersion(idOrDocumentId, versionDocumentId) {
-      strapi2.log.info(`[magic-mail] [DELETE] Deleting version ${versionDocumentId}`);
-      const template = await this.findOne(idOrDocumentId);
+    async deleteVersion(templateIdOrDocumentId, versionIdOrDocumentId) {
+      strapi2.log.info(`[magic-mail] [DELETE] Deleting version ${versionIdOrDocumentId}`);
+      const template = await this.findOne(templateIdOrDocumentId);
       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"]
-      });
+      const actualTemplateDocumentId = template.documentId;
+      const version2 = await this.findVersionById(versionIdOrDocumentId);
       if (!version2) {
         throw new Error("Version not found");
       }
-      if (version2.template?.documentId !== actualDocumentId) {
+      if (version2.template?.documentId !== actualTemplateDocumentId) {
         throw new Error("Version does not belong to this template");
       }
       await strapi2.documents(EMAIL_TEMPLATE_VERSION_UID).delete({
-        documentId: versionDocumentId
+        documentId: version2.documentId
       });
       strapi2.log.info(`[magic-mail] [SUCCESS] Version v${version2.versionNumber} deleted`);
       return { success: true, message: "Version deleted" };

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.3.7",
+  "version": "2.3.9",
   "keywords": [
     "strapi",
     "strapi-plugin",