Fix/deactivation email sending to past isomer members (#1755)

* fix(inactiveUsers.service): update email filtering to exclude past and former Isomer members

* fix(inactiveUsers.service): enhance email filtering to exclude past Isomer members

* fix(inactiveUsers.service): update email notification logic to include past Isomer members

Author: adriangohjw

apps/studio/src/server/modules/user/__tests__/inactiveUsers.service.test.ts

@@ -1,4 +1,8 @@
-import { ISOMER_ADMINS_AND_MIGRATORS_EMAILS } from "~prisma/constants"
+import {
+  ISOMER_ADMINS_AND_MIGRATORS_EMAILS,
+  PAST_AND_FORMER_ISOMER_MEMBERS_EMAILS,
+  PAST_ISOMER_MEMBERS,
+} from "~prisma/constants"
 import { resetTables } from "tests/integration/helpers/db"
 import {
   setupAdminPermissions,
@@ -374,15 +378,15 @@ describe("inactiveUsers.service", () => {
       expect(sendAccountDeactivationEmail).toHaveBeenCalledTimes(1)
     })
 
-    it("should not include isomer admins and migrators in the email", async () => {
+    it("should not include isomer admins and migrators (including former members) in the email", async () => {
       // Arrange
       const userToDeactivate = await setupUserWrapper({
         siteId: site.id,
         createdDaysAgo: 91,
         lastLoginDaysAgo: null,
       })
       await Promise.all(
-        ISOMER_ADMINS_AND_MIGRATORS_EMAILS.map((email) =>
+        PAST_AND_FORMER_ISOMER_MEMBERS_EMAILS.map((email) =>
           setupUserWrapper({
             siteId: site.id,
             email,
@@ -396,7 +400,11 @@ describe("inactiveUsers.service", () => {
       await bulkDeactivateInactiveUsers()
 
       // Assert
-      expect(sendAccountDeactivationEmail).toHaveBeenCalledTimes(1) // send to deactivated user
+      expect(sendAccountDeactivationEmail).toHaveBeenCalledTimes(
+        1 +
+          // we actually want to send the email to ex-isomer members as well
+          PAST_ISOMER_MEMBERS.length,
+      ) // send to deactivated user and all past isomer members
       expect(sendAccountDeactivationEmail).toHaveBeenCalledWith({
         recipientEmail: userToDeactivate.email,
         sitesAndAdmins: expect.any(Array),

apps/studio/src/server/modules/user/inactiveUsers.service.ts

@@ -1,4 +1,7 @@
-import { ISOMER_ADMINS_AND_MIGRATORS_EMAILS } from "~prisma/constants"
+import {
+  ISOMER_ADMINS_AND_MIGRATORS_EMAILS,
+  PAST_AND_FORMER_ISOMER_MEMBERS_EMAILS,
+} from "~prisma/constants"
 import { startOfDay, subDays } from "date-fns"
 import { toZonedTime } from "date-fns-tz"
 
@@ -188,7 +191,7 @@ const getSiteAndAdmins = async ({ userId, siteIds }: GetSiteAndAdminsProps) => {
           .where("ResourcePermission.userId", "!=", userId) // don't want to ask users to ask themselves for permissions
           .where("ResourcePermission.deletedAt", "is", null)
           .where("ResourcePermission.role", "=", RoleType.Admin) // should only give the admin emails to request reactivation permissions from
-          .where("User.email", "not in", ISOMER_ADMINS_AND_MIGRATORS_EMAILS) // we don't want to send emails to admins and migrators
+          .where("User.email", "not in", PAST_AND_FORMER_ISOMER_MEMBERS_EMAILS) // we don't want to send emails to admins and migrators
           .select([
             "Site.id as siteId",
             db.fn.agg<string[]>("array_agg", ["User.email"]).as("adminEmails"),