@b2y/email-service 1.0.9 → 1.2.0

package/providers/PostmarkProvider.js

@@ -1,62 +1,62 @@
-// providers/PostmarkProvider.js
-const postmark = require('postmark');
-const BaseProvider = require('./BaseProvider');
-const Config = require('../Config');
-const logger = require('../Logger');
-const StatusMessage = require('../constants/StatusMessageConstants');
-const { EmailProvider } = require('../enum/EmailProvider');
-
-class PostmarkProvider extends BaseProvider {
-  constructor() {
-    super();
-    this.client = new postmark.Client(Config.postmarkApiKey);
-  }
-
-  async sendEmail(options) {
-    try {
-      this.validateEmailOptions(options);
-      const mailOptions = {
-        From: options.from || Config.postmarkFromEmail,
-        To: this.formatRecipients(options.to).join(','),
-        Subject: options.subject,
-        HtmlBody: options.html,
-      };
-      
-      if (options.cc && options.cc.length > 0) {
-        mailOptions.Cc = this.formatRecipients(options.cc).join(',');
-      }
-      
-      if (options.bcc && options.bcc.length > 0) {
-        mailOptions.Bcc = this.formatRecipients(options.bcc).join(',');
-      }
-      
-      if (options.attachments && options.attachments.length > 0) {
-        mailOptions.Attachments = options.attachments.map(att => ({
-          Name: att.filename,
-          Content: att.content,
-          ContentType: att.contentType
-        }));
-      }
-      
-      const result = await this.client.sendEmail(mailOptions);
-      
-      logger.info('Email sent successfully via Postmark', {
-        messageId: result.MessageID,
-        recipients: { to: options.to, cc: options.cc, bcc: options.bcc },
-        tenantId: options.tenantId
-      });
-      
-      return {
-        success: true,
-        messageId: result.MessageID,
-        provider: EmailProvider.POSTMARK,
-        tenantId: options.tenantId
-      };
-    } catch (error) {
-      logger.error(`Postmark failed to send email: ${error.message}`);
-      throw new Error(`${StatusMessage.POSTMARK_SEND_ERROR}: ${error.message}`);
-    }
-  }
-}
-
+// providers/PostmarkProvider.js
+const postmark = require('postmark');
+const BaseProvider = require('./BaseProvider');
+const Config = require('../Config');
+const logger = require('../Logger');
+const StatusMessage = require('../constants/StatusMessageConstants');
+const { EmailProvider } = require('../enum/EmailProvider');
+
+class PostmarkProvider extends BaseProvider {
+  constructor() {
+    super();
+    this.client = new postmark.Client(Config.postmarkApiKey);
+  }
+
+  async sendEmail(options) {
+    try {
+      this.validateEmailOptions(options);
+      const mailOptions = {
+        From: options.from || Config.postmarkFromEmail,
+        To: this.formatRecipients(options.to).join(','),
+        Subject: options.subject,
+        HtmlBody: options.html,
+      };
+      
+      if (options.cc && options.cc.length > 0) {
+        mailOptions.Cc = this.formatRecipients(options.cc).join(',');
+      }
+      
+      if (options.bcc && options.bcc.length > 0) {
+        mailOptions.Bcc = this.formatRecipients(options.bcc).join(',');
+      }
+      
+      if (options.attachments && options.attachments.length > 0) {
+        mailOptions.Attachments = options.attachments.map(att => ({
+          Name: att.filename,
+          Content: att.content,
+          ContentType: att.contentType
+        }));
+      }
+      
+      const result = await this.client.sendEmail(mailOptions);
+      
+      logger.info('Email sent successfully via Postmark', {
+        messageId: result.MessageID,
+        recipients: { to: options.to, cc: options.cc, bcc: options.bcc },
+        tenantId: options.tenantId
+      });
+      
+      return {
+        success: true,
+        messageId: result.MessageID,
+        provider: EmailProvider.POSTMARK,
+        tenantId: options.tenantId
+      };
+    } catch (error) {
+      logger.error(`Postmark failed to send email: ${error.message}`);
+      throw new Error(`${StatusMessage.POSTMARK_SEND_ERROR}: ${error.message}`);
+    }
+  }
+}
+
 module.exports = PostmarkProvider;

package/providers/SendgridProvider.js

@@ -1,60 +1,60 @@
-// providers/SendgridProvider.js
-const sgMail = require('@sendgrid/mail');
-const BaseProvider = require('./BaseProvider');
-const Config = require('../Config');
-const logger = require('../Logger');
-const { EmailProvider } = require('../enum/EmailProvider');
-
-class SendgridProvider extends BaseProvider {
-  constructor() {
-    super();
-    sgMail.setApiKey(Config.sendGridApiKey);
-  }
-
-  async sendEmail({ tenantId, to, cc, bcc, subject, html, from, attachments }) {
-    try {
-      this.validateEmailOptions({ to, subject, html, from });
-      
-      const mailOptions = {
-        to: this.formatRecipients(to),
-        from: Config.emailUser,
-        subject,
-        html,
-      };
-      
-      if (cc && cc.length > 0) {
-        mailOptions.cc = this.formatRecipients(cc);
-      }
-      
-      if (bcc && bcc.length > 0) {
-        mailOptions.bcc = this.formatRecipients(bcc);
-      }
-      
-      if (attachments && attachments.length > 0) {
-        mailOptions.attachments = attachments;
-      }
-      
-      const result = await sgMail.send(mailOptions);
-      
-      logger.info('Email sent successfully via SendGrid', {
-        messageId: result[0].headers['x-message-id'],
-        recipients: { to, cc, bcc },
-        tenantId
-      });
-      
-      return {
-        success: true,
-        messageId: result[0].headers['x-message-id'],
-        provider: EmailProvider.SENDGRID,
-        tenantId
-      };
-      
-    } catch (error) {
-      logger.error(`SendGrid failed to send email : ${error.message}`);
-      throw new Error(`${StatusMessage.SENDGRID_SEND_ERROR}: ${error.message}`);
-    }
-  }
-}
-
-module.exports = SendgridProvider;
-
+// providers/SendgridProvider.js
+const sgMail = require('@sendgrid/mail');
+const BaseProvider = require('./BaseProvider');
+const Config = require('../Config');
+const logger = require('../Logger');
+const { EmailProvider } = require('../enum/EmailProvider');
+
+class SendgridProvider extends BaseProvider {
+  constructor() {
+    super();
+    sgMail.setApiKey(Config.sendGridApiKey);
+  }
+
+  async sendEmail({ tenantId, to, cc, bcc, subject, html, from, attachments }) {
+    try {
+      this.validateEmailOptions({ to, subject, html, from });
+      
+      const mailOptions = {
+        to: this.formatRecipients(to),
+        from: Config.emailUser,
+        subject,
+        html,
+      };
+      
+      if (cc && cc.length > 0) {
+        mailOptions.cc = this.formatRecipients(cc);
+      }
+      
+      if (bcc && bcc.length > 0) {
+        mailOptions.bcc = this.formatRecipients(bcc);
+      }
+      
+      if (attachments && attachments.length > 0) {
+        mailOptions.attachments = attachments;
+      }
+      
+      const result = await sgMail.send(mailOptions);
+      
+      logger.info('Email sent successfully via SendGrid', {
+        messageId: result[0].headers['x-message-id'],
+        recipients: { to, cc, bcc },
+        tenantId
+      });
+      
+      return {
+        success: true,
+        messageId: result[0].headers['x-message-id'],
+        provider: EmailProvider.SENDGRID,
+        tenantId
+      };
+      
+    } catch (error) {
+      logger.error(`SendGrid failed to send email : ${error.message}`);
+      throw new Error(`${StatusMessage.SENDGRID_SEND_ERROR}: ${error.message}`);
+    }
+  }
+}
+
+module.exports = SendgridProvider;
+

package/service/EmailService.js

@@ -1,99 +1,102 @@
-const logger = require('../Logger');
-const TemplateEngine = require('../utils/TemplateEngine');
-const Config = require('../Config');
-const StatusMessage = require('../constants/StatusMessageConstants');
-class EmailService {
-  constructor(provider, dbClient) {
-    if (!provider) throw new Error(StatusMessage.PROVIDER_REQUIRED);
-    if (!dbClient) throw new Error(StatusMessage.DB_CLIENT_REQUIRED);
-
-    this.provider = provider;
-    this.EmailTemplate = dbClient.EmailTemplate;
-    this.templateEngine = new TemplateEngine(dbClient);
-  }
-
-  async prepareEmailContent(templateName, placeholders = {}, tenantId, langCode) {
-    try {
-      return await this.templateEngine.compileTemplate(
-        templateName, 
-        placeholders, 
-        tenantId, 
-        langCode
-      );
-    } catch (error) {
-      logger.error(`Error preparing email content: ${error.message}`);
-      throw error;
-    }
-  }
-
-  replacePlaceholders(content, placeholders = {}) {
-    return this.templateEngine.replacePlaceholders(content, placeholders);
-  }
-
-  async sendEmail(options) {
-    const {
-      tenantId,
-      langCode,
-      templateName,
-      placeholders = {},
-      recipients,
-      subject,
-      attachments = [],
-      from = Config.emailUser
-    } = options;
-
-    try {
-      // Validate required parameters
-      if (!tenantId) throw new Error(StatusMessage.TENANT_ID_REQUIRED);
-      if (!templateName && !options.html) throw new Error(StatusMessage.TEMPLATE_OR_HTML_REQUIRED);
-      if (!langCode) throw new Error(StatusMessage.LANGCODE_IS_REQUIRED);
-      if (!recipients || (!recipients.to && !recipients.TO)) throw new Error(StatusMessage.RECIPIENTS_REQUIRED);
-
-      let emailSubject = subject;
-      let html;
-
-      if (templateName) {
-        const templateContent = await this.prepareEmailContent(templateName, placeholders, tenantId, langCode);
-        html = templateContent.body;
-        if (!emailSubject) {
-          emailSubject = templateContent.subject;
-        }
-      } else {
-        html = this.replacePlaceholders(options.html, placeholders);
-        if (!emailSubject) throw new Error(StatusMessage.SUBJECT_REQUIRED);
-      }
-
-      // Format recipients
-      const to = recipients.to || recipients.TO;
-      const cc = recipients.cc || recipients.CC;
-      const bcc = recipients.bcc || recipients.BCC;
-
-      // Send email
-      return await this.provider.sendEmail({
-        tenantId,
-        to,
-        cc,
-        bcc,
-        subject: emailSubject,
-        html,
-        from,
-        attachments
-      });
-    } catch (error) {
-      logger.error(`EmailService failed to send email ${tenantId}: ${error.message}`);
-      throw error;
-    }
-  }
-
-  async sendTemplateEmail(templateName, to, variables = {}, tenantId, langCode) {
-    return this.sendEmail({
-      templateName,
-      recipients: { to },
-      placeholders: variables,
-      tenantId,
-      langCode
-    });
-  }
-}
-
+const logger = require('../Logger');
+const TemplateEngine = require('../utils/TemplateEngine');
+const Config = require('../Config');
+const StatusMessage = require('../constants/StatusMessageConstants');
+class EmailService {
+  constructor(provider, dbClient) {
+    if (!provider) throw new Error(StatusMessage.PROVIDER_REQUIRED);
+    if (!dbClient) throw new Error(StatusMessage.DB_CLIENT_REQUIRED);
+
+    this.provider = provider;
+    this.EmailTemplate = dbClient.EmailTemplate;
+    this.templateEngine = new TemplateEngine(dbClient);
+  }
+
+  async prepareEmailContent(templateName, placeholders = {}, tenantId, langCode) {
+    try {
+      return await this.templateEngine.compileTemplate(
+        templateName, 
+        placeholders, 
+        tenantId, 
+        langCode
+      );
+    } catch (error) {
+      logger.error(`Error preparing email content: ${error.message}`);
+      throw error;
+    }
+  }
+
+  replacePlaceholders(content, placeholders = {}) {
+    return this.templateEngine.replacePlaceholders(content, placeholders);
+  }
+
+  async sendEmail(options) {
+    const {
+      tenantId,
+      langCode,
+      templateName,
+      placeholders = {},
+      recipients,
+      subject,
+      attachments = [],
+      from = Config.fromEmail,
+      fromName = Config.fromName
+    } = options;
+
+    try {
+      // Validate required parameters
+      if (!tenantId) throw new Error(StatusMessage.TENANT_ID_REQUIRED);
+      if (!templateName && !options.html) throw new Error(StatusMessage.TEMPLATE_OR_HTML_REQUIRED);
+      if (!langCode) throw new Error(StatusMessage.LANGCODE_IS_REQUIRED);
+      if (!recipients || (!recipients.to && !recipients.TO)) throw new Error(StatusMessage.RECIPIENTS_REQUIRED);
+
+      let emailSubject = subject;
+      let html;
+
+      if (templateName) {
+        const templateContent = await this.prepareEmailContent(templateName, placeholders, tenantId, langCode);
+        html = templateContent.body;
+        if (!emailSubject) {
+          emailSubject = templateContent.subject;
+        }
+      } else {
+        html = this.replacePlaceholders(options.html, placeholders);
+        if (!emailSubject) throw new Error(StatusMessage.SUBJECT_REQUIRED);
+      }
+
+      // Format recipients
+      const to = recipients.to || recipients.TO;
+      const cc = recipients.cc || recipients.CC;
+      const bcc = recipients.bcc || recipients.BCC;
+
+      // Send email
+      return await this.provider.sendEmail({
+        tenantId,
+        to,
+        cc,
+        bcc,
+        subject: emailSubject,
+        html,
+        from,
+        fromName,
+        attachments
+      });
+    } catch (error) {
+      logger.error(`EmailService failed to send email ${tenantId}: ${error.message}`);
+      throw error;
+    }
+  }
+
+  async sendTemplateEmail(templateName, to, variables = {}, tenantId, langCode, fromName = null) {
+    return this.sendEmail({
+      templateName,
+      recipients: { to },
+      placeholders: variables,
+      tenantId,
+      langCode,
+      fromName
+    });
+  }
+}
+
 module.exports = EmailService;

package/utils/TemplateEngine.js

@@ -1,99 +1,99 @@
-const handlebars = require('handlebars');
-const logger = require('../Logger');
-
-class TemplateEngine {
-  constructor(dbClient) {
-    if (!dbClient) throw new Error(StatusMessage.DB_CLIENT_REQUIRED);
-    this.EmailTemplate = dbClient.EmailTemplate;
-    this.registerHelpers();
-  }
-
-  registerHelpers() {
-    handlebars.registerHelper('eq', (a, b) => a === b);
-    handlebars.registerHelper('ne', (a, b) => a !== b);
-    handlebars.registerHelper('gt', (a, b) => a > b);
-    handlebars.registerHelper('lt', (a, b) => a < b);
-    handlebars.registerHelper('uppercase', (str) => str ? str.toUpperCase() : '');
-    handlebars.registerHelper('lowercase', (str) => str ? str.toLowerCase() : '');
-    handlebars.registerHelper('formatDate', (date) => {
-      if (!date) return '';
-      return new Date(date).toLocaleDateString();
-    });
-  }
-
-  async getTemplateFromDB(templateName, tenantId, langCode) {
-    try {
-      logger.info(`Fetching template: ${templateName} in language: ${langCode}`);
-      const template = await this.EmailTemplate.findOne({
-        where: {
-          TemplateName: templateName,
-          TenantID: tenantId,
-          LangCode: langCode
-        }
-      });
-
-      if (!template) {
-        logger.warn(`Template "${templateName}" not found in language ${langCode}`);    
-        const defaultTemplate = await this.EmailTemplate.findOne({
-          where: {
-            TemplateName: templateName,
-            TenantID: tenantId,
-            LangCode: langCode
-          }
-        });
-
-        if (!defaultTemplate) {
-          throw new Error(`Template "${templateName}" not found in any language`);
-        }
-        
-        return {
-          subject: defaultTemplate.Subject,
-          body: defaultTemplate.Body
-        };
-      }
-
-      return {
-        subject: template.Subject,
-        body: template.Body
-      };
-    } catch (error) {
-      logger.error(`Error fetching template from DB: ${error.message}`);
-      throw error;
-    }
-  }
-
-  async compileTemplate(templateName, variables = {}, tenantId, langCode) {
-    try {
-      logger.info(`Compiling template: ${templateName} in language: ${langCode}`);
-      
-      const templateData = await this.getTemplateFromDB(templateName, tenantId, langCode);
-      
-      const subjectTemplate = handlebars.compile(templateData.subject);
-      const bodyTemplate = handlebars.compile(templateData.body);
-      
-      return {
-        subject: subjectTemplate(variables),
-        body: bodyTemplate(variables)
-      };
-    } catch (error) {
-      logger.error(`Error compiling template "${templateName}": ${error.message}`);
-      throw error;
-    }
-  }
-
-  replacePlaceholders(content, placeholders = {}) {
-    if (!content || typeof content !== 'string') {
-      return content;
-    }
-
-    try {
-      const template = handlebars.compile(content);
-      return template(placeholders);
-    } catch (err) {
-      logger.error(`Error replacing placeholders: ${err.message}`);
-      return content;
-    }
-  }
-}
-
+const handlebars = require('handlebars');
+const logger = require('../Logger');
+
+class TemplateEngine {
+  constructor(dbClient) {
+    if (!dbClient) throw new Error(StatusMessage.DB_CLIENT_REQUIRED);
+    this.EmailTemplate = dbClient.EmailTemplate;
+    this.registerHelpers();
+  }
+
+  registerHelpers() {
+    handlebars.registerHelper('eq', (a, b) => a === b);
+    handlebars.registerHelper('ne', (a, b) => a !== b);
+    handlebars.registerHelper('gt', (a, b) => a > b);
+    handlebars.registerHelper('lt', (a, b) => a < b);
+    handlebars.registerHelper('uppercase', (str) => str ? str.toUpperCase() : '');
+    handlebars.registerHelper('lowercase', (str) => str ? str.toLowerCase() : '');
+    handlebars.registerHelper('formatDate', (date) => {
+      if (!date) return '';
+      return new Date(date).toLocaleDateString();
+    });
+  }
+
+  async getTemplateFromDB(templateName, tenantId, langCode) {
+    try {
+      logger.info(`Fetching template: ${templateName} in language: ${langCode}`);
+      const template = await this.EmailTemplate.findOne({
+        where: {
+          TemplateName: templateName,
+          TenantID: tenantId,
+          LangCode: langCode
+        }
+      });
+
+      if (!template) {
+        logger.warn(`Template "${templateName}" not found in language ${langCode}`);    
+        const defaultTemplate = await this.EmailTemplate.findOne({
+          where: {
+            TemplateName: templateName,
+            TenantID: tenantId,
+            LangCode: langCode
+          }
+        });
+
+        if (!defaultTemplate) {
+          throw new Error(`Template "${templateName}" not found in any language`);
+        }
+        
+        return {
+          subject: defaultTemplate.Subject,
+          body: defaultTemplate.Body
+        };
+      }
+
+      return {
+        subject: template.Subject,
+        body: template.Body
+      };
+    } catch (error) {
+      logger.error(`Error fetching template from DB: ${error.message}`);
+      throw error;
+    }
+  }
+
+  async compileTemplate(templateName, variables = {}, tenantId, langCode) {
+    try {
+      logger.info(`Compiling template: ${templateName} in language: ${langCode}`);
+      
+      const templateData = await this.getTemplateFromDB(templateName, tenantId, langCode);
+      
+      const subjectTemplate = handlebars.compile(templateData.subject);
+      const bodyTemplate = handlebars.compile(templateData.body);
+      
+      return {
+        subject: subjectTemplate(variables),
+        body: bodyTemplate(variables)
+      };
+    } catch (error) {
+      logger.error(`Error compiling template "${templateName}": ${error.message}`);
+      throw error;
+    }
+  }
+
+  replacePlaceholders(content, placeholders = {}) {
+    if (!content || typeof content !== 'string') {
+      return content;
+    }
+
+    try {
+      const template = handlebars.compile(content);
+      return template(placeholders);
+    } catch (err) {
+      logger.error(`Error replacing placeholders: ${err.message}`);
+      return content;
+    }
+  }
+}
+
 module.exports = TemplateEngine;