Fix merge conflict error

[ajhollid]

This PR fixes an incorrectly resovled merge conflict

[coderabbitai]

Caution

Review failed

The pull request is closed.

Walkthrough

The EmailService class in Server/service/emailService.js has been significantly modified to enhance its dependency management. The constructor now accepts additional parameters, allowing for direct injection of essential dependencies. The loadTemplate method has been updated to utilize these parameters, while the initialization of the templateLookup object has been adjusted accordingly. The email sending process has been refined, with improved error handling through the use of a logger. Overall, these changes aim to improve modularity and testing capabilities without altering the core functionalities.

Changes

File

Change Summary

Server/service/emailService.js

- Updated constructor to include additional parameters: fs, path, compile, mjml2html, nodemailer, logger. - Modified loadTemplate to use injected parameters. - Adjusted initialization of templateLookup object. - Streamlined email transporter configuration using injected nodemailer. - Enhanced buildAndSendEmail with an inner buildHtml function and improved error handling via logger. - Updated sendEmail to utilize logger for error reporting.

Sequence Diagram(s)

sequenceDiagram
    participant Client
    participant EmailService
    participant TemplateLoader
    participant EmailTransporter
    participant Logger

    Client->>EmailService: Request to send email
    EmailService->>TemplateLoader: Load email template
    TemplateLoader-->>EmailService: Return template
    EmailService->>EmailService: Build HTML content
    EmailService->>Logger: Log any errors
    EmailService->>EmailTransporter: Send email
    EmailTransporter-->>EmailService: Confirmation of email sent
    EmailService-->>Client: Email sent successfully

Loading

---

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

‼️ IMPORTANT
Auto-reply has been disabled for this repository in the CodeRabbit settings. The CodeRabbit bot will not respond to your replies unless it is explicitly tagged.

• Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
  • @coderabbitai generate unit testing code for this file.
  • @coderabbitai modularize this function.
• PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
  • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
  • @coderabbitai read src/utils.ts and generate unit testing code.
  • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
  • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

• @coderabbitai pause to pause the reviews on a PR.
• @coderabbitai resume to resume the paused reviews.
• @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
• @coderabbitai full review to do a full review from scratch and review all the files again.
• @coderabbitai summary to regenerate the summary of the PR.
• @coderabbitai resolve resolve all the CodeRabbit review comments.
• @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
• @coderabbitai help to get help.

Other keywords and placeholders

• Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
• Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
• Add @coderabbitai anywhere in the PR title to generate the title automatically.

Documentation and Community

• Visit our Documentation for detailed information on how to use CodeRabbit.
• Join our Discord Community to get help, request features, and share feedback.
• Follow us on X/Twitter for updates and announcements.