chore: Email + mailer refactor (#3342)

* Huge email refactor

* fix: One rename too many

* comments

server/commands/accountProvisioner.test.ts

@@ -1,6 +1,6 @@
+import WelcomeEmail from "@server/emails/templates/WelcomeEmail";
 import Collection from "@server/models/Collection";
 import UserAuthentication from "@server/models/UserAuthentication";
-import EmailTask from "@server/queues/tasks/EmailTask";
 import { buildUser, buildTeam } from "@server/test/factories";
 import { flushdb } from "@server/test/support";
 import accountProvisioner from "./accountProvisioner";
@@ -13,7 +13,7 @@ describe("accountProvisioner", () => {
   const ip = "127.0.0.1";
 
   it("should create a new user and team", async () => {
-    const spy = jest.spyOn(EmailTask, "schedule");
+    const spy = jest.spyOn(WelcomeEmail, "schedule");
     const { user, team, isNewTeam, isNewUser } = await accountProvisioner({
       ip,
       user: {
@@ -55,7 +55,7 @@ describe("accountProvisioner", () => {
   });
 
   it("should update exising user and authentication", async () => {
-    const spy = jest.spyOn(EmailTask, "schedule");
+    const spy = jest.spyOn(WelcomeEmail, "schedule");
     const existingTeam = await buildTeam();
     const providers = await existingTeam.$get("authenticationProviders");
     const authenticationProvider = providers[0];
@@ -149,7 +149,7 @@ describe("accountProvisioner", () => {
   });
 
   it("should create a new user in an existing team", async () => {
-    const spy = jest.spyOn(EmailTask, "schedule");
+    const spy = jest.spyOn(WelcomeEmail, "schedule");
     const team = await buildTeam();
     const authenticationProviders = await team.$get("authenticationProviders");
     const authenticationProvider = authenticationProviders[0];

server/commands/accountProvisioner.ts

@@ -1,5 +1,6 @@
 import invariant from "invariant";
 import { UniqueConstraintError } from "sequelize";
+import WelcomeEmail from "@server/emails/templates/WelcomeEmail";
 import {
   AuthenticationError,
   EmailAuthenticationRequiredError,
@@ -7,7 +8,6 @@ import {
 } from "@server/errors";
 import { APM } from "@server/logging/tracing";
 import { Collection, Team, User } from "@server/models";
-import EmailTask from "@server/queues/tasks/EmailTask";
 import teamCreator from "./teamCreator";
 import userCreator from "./userCreator";
 
@@ -89,12 +89,9 @@ async function accountProvisioner({
     const { isNewUser, user } = result;
 
     if (isNewUser) {
-      await EmailTask.schedule({
-        type: "welcome",
-        options: {
-          to: user.email,
-          teamUrl: team.url,
-        },
+      await WelcomeEmail.schedule({
+        to: user.email,
+        teamUrl: team.url,
       });
     }
 

server/commands/userInviter.ts

@@ -1,9 +1,9 @@
 import invariant from "invariant";
 import { uniqBy } from "lodash";
 import { Role } from "@shared/types";
+import InviteEmail from "@server/emails/templates/InviteEmail";
 import Logger from "@server/logging/logger";
 import { User, Event, Team } from "@server/models";
-import EmailTask from "@server/queues/tasks/EmailTask";
 
 type Invite = {
   name: string;
@@ -75,16 +75,13 @@ export default async function userInviter({
       ip,
     });
 
-    await EmailTask.schedule({
-      type: "invite",
-      options: {
-        to: invite.email,
-        name: invite.name,
-        actorName: user.name,
-        actorEmail: user.email,
-        teamName: team.name,
-        teamUrl: team.url,
-      },
+    await InviteEmail.schedule({
+      to: invite.email,
+      name: invite.name,
+      actorName: user.name,
+      actorEmail: user.email,
+      teamName: team.name,
+      teamUrl: team.url,
     });
 
     if (process.env.NODE_ENV === "development") {