strapi-plugin-magic-mail 2.3.6 → 2.3.8

package/dist/server/index.js

@@ -5543,7 +5543,7 @@ function requireOauth() {
   });
   return oauth;
 }
-const version = "2.3.5";
+const version = "2.3.7";
 const require$$2 = {
   version
 };
@@ -5971,27 +5971,35 @@ function requireEmailDesigner() {
       }
       return strapi2.documents(EMAIL_TEMPLATE_UID).findOne({
         documentId: String(idOrDocumentId),
-        populate: ["versions"]
+        populate: { versions: true }
       });
     },
     /**
-     * Get template by numeric templateReferenceId
-     * The templateReferenceId is a unique integer field used to identify templates
+     * Get template by numeric ID (supports both templateReferenceId and internal db id)
+     * First tries templateReferenceId, then falls back to internal database id via entityService
      */
     async findById(id) {
-      strapi2.log.info(`[magic-mail] [LOOKUP] Finding template by templateReferenceId: ${id}`);
-      const results = await strapi2.documents(EMAIL_TEMPLATE_UID).findMany({
-        filters: { templateReferenceId: Number(id) },
+      const numericId = Number(id);
+      strapi2.log.info(`[magic-mail] [LOOKUP] Finding template by numeric ID: ${numericId}`);
+      const byRefId = await strapi2.documents(EMAIL_TEMPLATE_UID).findMany({
+        filters: { templateReferenceId: numericId },
         limit: 1,
-        populate: ["versions"]
+        populate: { versions: true }
       });
-      const result = results.length > 0 ? results[0] : null;
-      if (result) {
-        strapi2.log.info(`[magic-mail] [SUCCESS] Found template by templateReferenceId ${id}: documentId=${result.documentId}, name="${result.name}"`);
-      } else {
-        strapi2.log.warn(`[magic-mail] [WARNING] Template with templateReferenceId ${id} not found`);
+      if (byRefId.length > 0) {
+        strapi2.log.info(`[magic-mail] [SUCCESS] Found template by templateReferenceId ${numericId}: documentId=${byRefId[0].documentId}, name="${byRefId[0].name}"`);
+        return byRefId[0];
       }
-      return result;
+      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: true }
+      });
+      if (byInternalId) {
+        strapi2.log.info(`[magic-mail] [SUCCESS] Found template by internal id ${numericId}: documentId=${byInternalId.documentId}, name="${byInternalId.name}"`);
+        return byInternalId;
+      }
+      strapi2.log.warn(`[magic-mail] [WARNING] Template with ID ${numericId} not found (tried templateReferenceId and internal id)`);
+      return null;
     },
     /**
      * Get template by reference ID
@@ -6222,7 +6230,7 @@ function requireEmailDesigner() {
       const actualDocumentId = template.documentId;
       const version2 = await strapi2.documents(EMAIL_TEMPLATE_VERSION_UID).findOne({
         documentId: versionDocumentId,
-        populate: ["template"]
+        populate: { template: true }
       });
       if (!version2) {
         throw new Error("Version not found");
@@ -6255,7 +6263,7 @@ function requireEmailDesigner() {
       const actualDocumentId = template.documentId;
       const version2 = await strapi2.documents(EMAIL_TEMPLATE_VERSION_UID).findOne({
         documentId: versionDocumentId,
-        populate: ["template"]
+        populate: { template: true }
       });
       if (!version2) {
         throw new Error("Version not found");

package/dist/server/index.mjs

@@ -5533,7 +5533,7 @@ function requireOauth() {
   });
   return oauth;
 }
-const version = "2.3.5";
+const version = "2.3.7";
 const require$$2 = {
   version
 };
@@ -5961,27 +5961,35 @@ function requireEmailDesigner() {
       }
       return strapi2.documents(EMAIL_TEMPLATE_UID).findOne({
         documentId: String(idOrDocumentId),
-        populate: ["versions"]
+        populate: { versions: true }
       });
     },
     /**
-     * Get template by numeric templateReferenceId
-     * The templateReferenceId is a unique integer field used to identify templates
+     * Get template by numeric ID (supports both templateReferenceId and internal db id)
+     * First tries templateReferenceId, then falls back to internal database id via entityService
      */
     async findById(id) {
-      strapi2.log.info(`[magic-mail] [LOOKUP] Finding template by templateReferenceId: ${id}`);
-      const results = await strapi2.documents(EMAIL_TEMPLATE_UID).findMany({
-        filters: { templateReferenceId: Number(id) },
+      const numericId = Number(id);
+      strapi2.log.info(`[magic-mail] [LOOKUP] Finding template by numeric ID: ${numericId}`);
+      const byRefId = await strapi2.documents(EMAIL_TEMPLATE_UID).findMany({
+        filters: { templateReferenceId: numericId },
         limit: 1,
-        populate: ["versions"]
+        populate: { versions: true }
       });
-      const result = results.length > 0 ? results[0] : null;
-      if (result) {
-        strapi2.log.info(`[magic-mail] [SUCCESS] Found template by templateReferenceId ${id}: documentId=${result.documentId}, name="${result.name}"`);
-      } else {
-        strapi2.log.warn(`[magic-mail] [WARNING] Template with templateReferenceId ${id} not found`);
+      if (byRefId.length > 0) {
+        strapi2.log.info(`[magic-mail] [SUCCESS] Found template by templateReferenceId ${numericId}: documentId=${byRefId[0].documentId}, name="${byRefId[0].name}"`);
+        return byRefId[0];
       }
-      return result;
+      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: true }
+      });
+      if (byInternalId) {
+        strapi2.log.info(`[magic-mail] [SUCCESS] Found template by internal id ${numericId}: documentId=${byInternalId.documentId}, name="${byInternalId.name}"`);
+        return byInternalId;
+      }
+      strapi2.log.warn(`[magic-mail] [WARNING] Template with ID ${numericId} not found (tried templateReferenceId and internal id)`);
+      return null;
     },
     /**
      * Get template by reference ID
@@ -6212,7 +6220,7 @@ function requireEmailDesigner() {
       const actualDocumentId = template.documentId;
       const version2 = await strapi2.documents(EMAIL_TEMPLATE_VERSION_UID).findOne({
         documentId: versionDocumentId,
-        populate: ["template"]
+        populate: { template: true }
       });
       if (!version2) {
         throw new Error("Version not found");
@@ -6245,7 +6253,7 @@ function requireEmailDesigner() {
       const actualDocumentId = template.documentId;
       const version2 = await strapi2.documents(EMAIL_TEMPLATE_VERSION_UID).findOne({
         documentId: versionDocumentId,
-        populate: ["template"]
+        populate: { template: true }
       });
       if (!version2) {
         throw new Error("Version not found");

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.3.6",
+  "version": "2.3.8",
   "keywords": [
     "strapi",
     "strapi-plugin",