From addbe74d8562d7c261880ecad3ee6e694941ec3c Mon Sep 17 00:00:00 2001
From: Timothee Groleau <timothee.groleau@gmail.com>
Date: Tue, 9 Apr 2024 12:26:30 +0800
Subject: [PATCH] feat: dont run the date update in the transaction

---
 src/services/identity/UsersService.ts         | 36 ++++++++++---------
 .../identity/__tests__/UsersService.spec.ts   | 10 +++---
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/src/services/identity/UsersService.ts b/src/services/identity/UsersService.ts
index e15e43655..edd9b68c2 100644
--- a/src/services/identity/UsersService.ts
+++ b/src/services/identity/UsersService.ts
@@ -136,28 +136,32 @@ class UsersService {
   }
 
   async login(githubId: string): Promise<User> {
-    return this.sequelize.transaction<User>(async (transaction) => {
-      const [user] = await this.repository.findOrCreate({
-        where: { githubId },
-        transaction,
-      })
-      user.lastLoggedIn = new Date()
-
-      return user.save({ transaction })
+    const loginUpdate = { lastLoggedIn: new Date() }
+    const [user, created] = await this.repository.findOrCreate({
+      where: { githubId },
+      defaults: loginUpdate,
     })
+
+    if (!created) {
+      await user.update(loginUpdate)
+    }
+
+    return user
   }
 
   async loginWithEmail(email: string): Promise<User> {
     const parsedEmail = email.toLowerCase()
-    return this.sequelize.transaction<User>(async (transaction) => {
-      const [user] = await this.repository.findOrCreate({
-        where: { email: parsedEmail },
-        transaction,
-      })
-      user.lastLoggedIn = new Date()
-
-      return user.save({ transaction })
+    const loginUpdate = { lastLoggedIn: new Date() }
+    const [user, created] = await this.repository.findOrCreate({
+      where: { email: parsedEmail },
+      defaults: loginUpdate,
     })
+
+    if (!created) {
+      await user.update(loginUpdate)
+    }
+
+    return user
   }
 
   async canSendEmailOtp(email: string) {
diff --git a/src/services/identity/__tests__/UsersService.spec.ts b/src/services/identity/__tests__/UsersService.spec.ts
index 59ef0becd..0193d5d8e 100644
--- a/src/services/identity/__tests__/UsersService.spec.ts
+++ b/src/services/identity/__tests__/UsersService.spec.ts
@@ -102,8 +102,9 @@ describe("User Service", () => {
 
   it("should call `findOrCreate` on the db model and set the lastLoggedIn", async () => {
     // Arrange
+    const testTime = Date.now()
     const mockDbUser = {
-      save: jest.fn().mockReturnThis(),
+      update: jest.fn().mockReturnThis(),
       githubId: mockGithubId,
     }
     MockRepository.findOrCreate.mockResolvedValue([mockDbUser])
@@ -112,16 +113,13 @@ describe("User Service", () => {
     const actual = await UsersService.login(mockGithubId)
 
     // Assert
-    expect(MockSequelize.transaction).toBeCalled()
     expect(MockRepository.findOrCreate).toBeCalledWith({
       where: { githubId: mockGithubId },
-      transaction: "transaction",
+      defaults: { lastLoggedIn: expect.any(Date) },
     })
     expect(actual.lastLoggedIn).toBeDefined()
+    expect(actual.lastLoggedIn.getTime()).toBeGreaterThanOrEqual(testTime)
     expect(actual.githubId).toBe(mockGithubId)
-    expect(actual.save).toBeCalledWith({
-      transaction: "transaction",
-    })
   })
 
   it("should allow whitelisted emails", async () => {