fix: email is set as expired when email is not a beta.gouv.fr address (…

…#654) * fix: eamil is set as expired when email is not a beta.gouv.fr address * test: fix setEmailExpired relative test
betagouv · Nov 21, 2024 · 820a29d · 820a29d
1 parent 192ed03
commit 820a29d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/__tests__/test-user-contract-ending.ts b/__tests__/test-user-contract-ending.ts
@@ -409,9 +409,7 @@ describe("After quitting", () => {
         should.equal(test.length, 2);
     });
 
-    it("should set email as expired", async () => {
-        const today = new Date(fakeTodayDate);
-
+    it("should set email as expired if email is not from main domain", async () => {
         const updatedUser = await db
             .updateTable("users")
             .where("username", "=", "julien.dauphant")
@@ -436,7 +434,23 @@ describe("After quitting", () => {
             .selectAll()
             .where("username", "=", "julien.dauphant")
             .execute();
-        user.primary_email_status.should.equal(EmailStatusCode.EMAIL_EXPIRED);
+        user.primary_email_status.should.equal(EmailStatusCode.EMAIL_SUSPENDED);
+
+        const updatedUser2 = await db
+            .updateTable("users")
+            .where("username", "=", "julien.dauphant")
+            .set({
+                primary_email: `[email protected]`,
+            })
+            .returningAll()
+            .executeTakeFirstOrThrow();
+        await setEmailExpired();
+        const [user2] = await db
+            .selectFrom("users")
+            .selectAll()
+            .where("username", "=", "julien.dauphant")
+            .execute();
+        user2.primary_email_status.should.equal(EmailStatusCode.EMAIL_EXPIRED);
         // userinfos.restore();
     });
 

diff --git a/src/server/schedulers/setEmailExpired.ts b/src/server/schedulers/setEmailExpired.ts
@@ -11,6 +11,7 @@ import * as utils from "@controllers/utils";
 export async function setEmailExpired(
     optionalExpiredUsers?: memberBaseInfoSchemaType[]
 ) {
+    // set email that are not beta.gouv.fr as expired
     let expiredUsers = optionalExpiredUsers;
     let dbUsers: memberBaseInfoSchemaType[] = [];
     if (!expiredUsers) {
@@ -28,7 +29,7 @@ export async function setEmailExpired(
                 user.primary_email_status === EmailStatusCode.EMAIL_SUSPENDED &&
                 user.primary_email_status_updated_at < todayLess30days &&
                 user.primary_email &&
-                user.primary_email.includes(`@${config.domain}`)
+                !user.primary_email.includes(`@${config.domain}`)
         );
     }
     for (const user of dbUsers) {