Fixing minor bugs in the Segment analytics flow

app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/ClientUserRepository.java

@@ -116,7 +116,7 @@ public class ClientUserRepository implements ServerOAuth2AuthorizedClientReposit
         newUser.setIsEnabled(true);
 
         return userService.findByEmail(user.getEmail())
-                .switchIfEmpty(userService.save(newUser)); //In case the user doesnt exist, save the user.
+                .switchIfEmpty(userService.create(newUser)); //In case the user doesnt exist, create and save the user.
     }
 
     @Override

app/server/appsmith-server/src/main/java/com/appsmith/server/services/BaseService.java

@@ -127,7 +127,7 @@ public abstract class BaseService<R extends BaseRepository, T extends BaseDomain
                     analyticsProperties.put("id", ((BaseDomain) savedObject).getId());
                     analyticsProperties.put("organizationId", user.getOrganizationId());
                     analytics.enqueue(
-                            TrackMessage.builder("MONGO_DB_CREATE_" + savedObject.getClass())
+                            TrackMessage.builder("MONGO_DB_CREATE_" + savedObject.getClass().getSimpleName().toUpperCase())
                                     .userId(user.getId())
                                     .properties(analyticsProperties)
                     );

app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserService.java

@@ -9,6 +9,4 @@ public interface UserService extends CrudService<User, String> {
 
     Mono<User> findByEmail(String email);
 
-    Mono<User> save(User newUser);
-
 }

app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserServiceImpl.java

@@ -56,7 +56,7 @@ public class UserServiceImpl extends BaseService<UserRepository, User, String> i
     }
 
     @Override
-    public Mono<User> save(User user) {
+    public Mono<User> create(User user) {
 
         Mono<User> savedUserMono = repository.save(user);
         return savedUserMono

app/server/appsmith-server/src/main/resources/application-local.properties

@@ -17,3 +17,8 @@ spring.security.oauth2.client.registration.google.client-id=869021686091-9b84bbf
 spring.security.oauth2.client.registration.google.client-secret=9dvITt4OayEY1HfeY8bHX74p
 # Accounts from specific domains are allowed to login
 oauth2.allowed-domains=appsmith.com
+# Segment & Rollbar Properties
+# These properties are intentionally set to random values so that events are not sent to either of them during local development
+segment.writeKey=random-value
+com.rollbar.access-token=random-value
+com.rollbar.environment=development

app/server/appsmith-server/src/main/resources/application-staging.properties

@@ -15,3 +15,7 @@ spring.security.oauth2.client.registration.google.client-id=869021686091-9b84bbf
 spring.security.oauth2.client.registration.google.client-secret=9dvITt4OayEY1HfeY8bHX74p
 # Accounts from specific domains are allowed to login
 oauth2.allowed-domains=appsmith.com
+# Segment & Rollbar Properties
+segment.writeKey=FIRLqUgMYuTlyS6yqOE2hBGZs5umkWhr
+com.rollbar.access-token=b91c4d5b9cac444088f4db9216ed6f42
+com.rollbar.environment=development

app/server/appsmith-server/src/main/resources/application.properties

@@ -11,7 +11,3 @@ spring.jpa.properties.hibernate.temp.use_jdbc_metadata_defaults=false
 spring.jpa.show-sql=true
 # Jackson Properties
 spring.jackson.default-property-inclusion=non_null
-# Segment Properties
-segment.writeKey=FIRLqUgMYuTlyS6yqOE2hBGZs5umkWhr
-com.rollbar.access-token=b91c4d5b9cac444088f4db9216ed6f42
-com.rollbar.environment=development