From 10817c53886998d8f5963ea66412b579e08695f5 Mon Sep 17 00:00:00 2001
From: martmull <martmull@hotmail.fr>
Date: Wed, 7 Aug 2024 17:09:11 +0200
Subject: [PATCH] Fix onboarding status refacto (#6533)

see comments in
https://github.com/twentyhq/twenty/pull/6531#pullrequestreview-2217807413
- rename method
- add check before setting create profile pending user var
---
 .../0-23-backfill-new-onboarding-user-vars.ts |  2 +-
 .../auth/services/sign-in-up.service.ts       | 24 +++++++++++--------
 .../onboarding/onboarding.service.ts          |  2 +-
 .../workspace-workspace-member.listener.ts    |  2 +-
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/packages/twenty-server/src/database/commands/upgrade-version/0-23/0-23-backfill-new-onboarding-user-vars.ts b/packages/twenty-server/src/database/commands/upgrade-version/0-23/0-23-backfill-new-onboarding-user-vars.ts
index 7b44ddf54..ab1eafd4e 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version/0-23/0-23-backfill-new-onboarding-user-vars.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version/0-23/0-23-backfill-new-onboarding-user-vars.ts
@@ -73,7 +73,7 @@ export class BackfillNewOnboardingUserVarsCommand extends CommandRunner {
       });
 
       for (const user of workspace.users) {
-        await this.onboardingService.setOnboardingCreateProfileCompletion({
+        await this.onboardingService.setOnboardingCreateProfilePending({
           userId: user.id,
           workspaceId: workspace.id,
           value: true,
diff --git a/packages/twenty-server/src/engine/core-modules/auth/services/sign-in-up.service.ts b/packages/twenty-server/src/engine/core-modules/auth/services/sign-in-up.service.ts
index a0dfe4324..450b6e1a0 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/services/sign-in-up.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/services/sign-in-up.service.ts
@@ -197,11 +197,13 @@ export class SignInUpService {
       value: true,
     });
 
-    await this.onboardingService.setOnboardingCreateProfileCompletion({
-      userId: user.id,
-      workspaceId: workspace.id,
-      value: true,
-    });
+    if (firstName === '' && lastName === '') {
+      await this.onboardingService.setOnboardingCreateProfilePending({
+        userId: user.id,
+        workspaceId: workspace.id,
+        value: true,
+      });
+    }
 
     return user;
   }
@@ -257,11 +259,13 @@ export class SignInUpService {
       value: true,
     });
 
-    await this.onboardingService.setOnboardingCreateProfileCompletion({
-      userId: user.id,
-      workspaceId: workspace.id,
-      value: true,
-    });
+    if (firstName === '' && lastName === '') {
+      await this.onboardingService.setOnboardingCreateProfilePending({
+        userId: user.id,
+        workspaceId: workspace.id,
+        value: true,
+      });
+    }
 
     await this.onboardingService.setOnboardingInviteTeamPending({
       workspaceId: workspace.id,
diff --git a/packages/twenty-server/src/engine/core-modules/onboarding/onboarding.service.ts b/packages/twenty-server/src/engine/core-modules/onboarding/onboarding.service.ts
index cd4adb8e0..8b1753231 100644
--- a/packages/twenty-server/src/engine/core-modules/onboarding/onboarding.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/onboarding/onboarding.service.ts
@@ -131,7 +131,7 @@ export class OnboardingService {
     });
   }
 
-  async setOnboardingCreateProfileCompletion({
+  async setOnboardingCreateProfilePending({
     userId,
     workspaceId,
     value,
diff --git a/packages/twenty-server/src/engine/core-modules/workspace/workspace-workspace-member.listener.ts b/packages/twenty-server/src/engine/core-modules/workspace/workspace-workspace-member.listener.ts
index fb8412d32..4236e3a3f 100644
--- a/packages/twenty-server/src/engine/core-modules/workspace/workspace-workspace-member.listener.ts
+++ b/packages/twenty-server/src/engine/core-modules/workspace/workspace-workspace-member.listener.ts
@@ -36,7 +36,7 @@ export class WorkspaceWorkspaceMemberListener {
       return;
     }
 
-    await this.onboardingService.setOnboardingCreateProfileCompletion({
+    await this.onboardingService.setOnboardingCreateProfilePending({
       userId: payload.userId,
       workspaceId: payload.workspaceId,
       value: false,