From 89cc2555ab693623659198e9792c5a1f07de4d49 Mon Sep 17 00:00:00 2001
From: Shrikant Sharat Kandula <shrikant@appsmith.com>
Date: Mon, 4 Oct 2021 23:09:56 +0530
Subject: [PATCH] Fix role and goal saving before using (#8177)

---
 .../main/java/com/appsmith/server/solutions/UserSignup.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/UserSignup.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/UserSignup.java
index 7f0e855f3e..319cd8daec 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/UserSignup.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/UserSignup.java
@@ -199,7 +199,8 @@ public class UserSignup {
                     userData.setUseCase(userFromRequest.getUseCase());
 
                     return Mono.when(
-                            configService.getInstanceId()
+                            userDataService.updateForUser(user, userData)
+                                    .then(configService.getInstanceId())
                                     .doOnSuccess(instanceId -> analyticsService.sendEvent(
                                             AnalyticsEvents.INSTALLATION_SETUP_COMPLETE.getEventName(),
                                             instanceId,
@@ -214,7 +215,6 @@ public class UserSignup {
                                     "APPSMITH_DISABLE_TELEMETRY",
                                     String.valueOf(!userFromRequest.isAllowCollectingAnonymousData())
                             )),
-                            userDataService.updateForUser(user, userData),
                             analyticsService.sendObjectEvent(AnalyticsEvents.CREATE_SUPERUSER, user, null)
                     ).thenReturn(user);
                 });