Moved Business logic related to feature flag check to service layer from controllers for Workspace and Applications.

Author: tomjose92

app/server/appsmith-server/src/main/java/com/appsmith/server/applications/base/ApplicationServiceCE.java

@@ -31,6 +31,8 @@ public interface ApplicationServiceCE extends CrudService<Application, String> {
 
     Flux<Application> findByWorkspaceIdAndBaseApplicationsInAlphabeticalOrder(String workspaceId);
 
+    Flux<Application> findByWorkspaceIdAndBaseApplicationsForHome(String workspaceId);
+
     Mono<Application> save(Artifact application);
 
     Mono<Application> updateApplicationWithPresets(String branchedApplicationId, Application application);

app/server/appsmith-server/src/main/java/com/appsmith/server/applications/base/ApplicationServiceCEImpl.java

@@ -36,10 +36,12 @@
 import com.appsmith.server.services.AnalyticsService;
 import com.appsmith.server.services.AssetService;
 import com.appsmith.server.services.BaseService;
+import com.appsmith.server.services.FeatureFlagService;
 import com.appsmith.server.services.PermissionGroupService;
 import com.appsmith.server.services.SessionUserService;
 import com.appsmith.server.services.UserDataService;
 import com.appsmith.server.services.WorkspaceService;
+import com.appsmith.external.enums.FeatureFlagEnum;
 import com.appsmith.server.solutions.ApplicationPermission;
 import com.appsmith.server.solutions.DatasourcePermission;
 import com.appsmith.server.solutions.PolicySolution;
@@ -91,6 +93,7 @@ public class ApplicationServiceCEImpl extends BaseService<ApplicationRepository,
     private final WorkspaceService workspaceService;
     private final WorkspacePermission workspacePermission;
     private final ObservationRegistry observationRegistry;
+    private final FeatureFlagService featureFlagService;
 
     private static final Integer MAX_RETRIES = 5;
 
@@ -109,7 +112,8 @@ public ApplicationServiceCEImpl(
             UserDataService userDataService,
             WorkspaceService workspaceService,
             WorkspacePermission workspacePermission,
-            ObservationRegistry observationRegistry) {
+            ObservationRegistry observationRegistry,
+            FeatureFlagService featureFlagService) {
 
         super(validator, repository, analyticsService);
         this.policySolution = policySolution;
@@ -123,6 +127,7 @@ public ApplicationServiceCEImpl(
         this.workspaceService = workspaceService;
         this.workspacePermission = workspacePermission;
         this.observationRegistry = observationRegistry;
+        this.featureFlagService = featureFlagService;
     }
 
     @Override
@@ -250,6 +255,28 @@ public Flux<Application> findByWorkspaceIdAndBaseApplicationsInAlphabeticalOrder
                         }));
     }
 
+    /**
+     * This method is used to fetch all the applications for a given workspaceId. It sorts the applications based
+     * on feature flag - either alphabetically or by recently used order.
+     * For git connected applications only default branched application is returned.
+     *
+     * @param workspaceId workspaceId for which applications are to be fetched
+     * @return Flux of applications sorted based on feature flag
+     */
+    @Override
+    public Flux<Application> findByWorkspaceIdAndBaseApplicationsForHome(String workspaceId) {
+        Mono<Boolean> isAlphabeticalOrderingEnabled = featureFlagService.check(FeatureFlagEnum.release_alphabetical_ordering_enabled);
+        return isAlphabeticalOrderingEnabled.flatMapMany(isEnabled -> {
+            if (isEnabled) {
+                // If alphabetical ordering is enabled, then we need to sort the applications in alphabetical order
+                return findByWorkspaceIdAndBaseApplicationsInAlphabeticalOrder(workspaceId);
+            } else {
+                // If alphabetical ordering is disabled, then we need to sort the applications in recently used order
+                return findByWorkspaceIdAndBaseApplicationsInRecentlyUsedOrder(workspaceId);
+            }
+        });
+    }
+
     @Override
     public Mono<Application> save(Artifact artifact) {
         Application application = (Application) artifact;

app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ApplicationController.java

@@ -11,7 +11,6 @@
 import com.appsmith.server.imports.internal.partial.PartialImportService;
 import com.appsmith.server.services.ApplicationPageService;
 import com.appsmith.server.services.ApplicationSnapshotService;
-import com.appsmith.server.services.FeatureFlagService;
 import com.appsmith.server.solutions.UserReleaseNotes;
 import com.appsmith.server.themes.base.ThemeService;
 import lombok.extern.slf4j.Slf4j;
@@ -34,8 +33,7 @@ public ApplicationController(
             PartialExportService partialExportService,
             PartialImportService partialImportService,
             ImportService importService,
-            ExportService exportService,
-            FeatureFlagService featureFlagService) {
+            ExportService exportService) {
         super(
                 artifactService,
                 service,
@@ -47,7 +45,6 @@ public ApplicationController(
                 partialExportService,
                 partialImportService,
                 importService,
-                exportService,
-                featureFlagService);
+                exportService);
     }
 }

app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/WorkspaceController.java

@@ -2,7 +2,6 @@
 
 import com.appsmith.server.constants.Url;
 import com.appsmith.server.controllers.ce.WorkspaceControllerCE;
-import com.appsmith.server.services.FeatureFlagService;
 import com.appsmith.server.services.UserWorkspaceService;
 import com.appsmith.server.services.WorkspaceService;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -12,8 +11,8 @@
 @RequestMapping(Url.WORKSPACE_URL)
 public class WorkspaceController extends WorkspaceControllerCE {
 
-    public WorkspaceController(WorkspaceService workspaceService, UserWorkspaceService userWorkspaceService, FeatureFlagService featureFlagService) {
+    public WorkspaceController(WorkspaceService workspaceService, UserWorkspaceService userWorkspaceService) {
 
-        super(workspaceService, userWorkspaceService, featureFlagService);
+        super(workspaceService, userWorkspaceService);
     }
 }

app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/ApplicationControllerCE.java

@@ -30,10 +30,8 @@
 import com.appsmith.server.projections.ApplicationSnapshotResponseDTO;
 import com.appsmith.server.services.ApplicationPageService;
 import com.appsmith.server.services.ApplicationSnapshotService;
-import com.appsmith.server.services.FeatureFlagService;
 import com.appsmith.server.solutions.UserReleaseNotes;
 import com.appsmith.server.themes.base.ThemeService;
-import com.appsmith.external.enums.FeatureFlagEnum;
 import com.fasterxml.jackson.annotation.JsonView;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
@@ -77,7 +75,6 @@ public class ApplicationControllerCE {
     private final PartialImportService partialImportService;
     private final ImportService importService;
     private final ExportService exportService;
-    private final FeatureFlagService featureFlagService;
 
     @JsonView(Views.Public.class)
     @PostMapping
@@ -133,21 +130,9 @@ public Mono<ResponseDTO<Application>> delete(@PathVariable String branchedApplic
     public Mono<ResponseDTO<List<Application>>> findByWorkspaceIdAndRecentlyUsedOrder(
             @RequestParam(required = false) String workspaceId) {
         log.debug("Going to get all applications by workspace id {}", workspaceId);
-        
-        Mono<Boolean> isAlphabeticalOrderingEnabled = featureFlagService.check(FeatureFlagEnum.release_alphabetical_ordering_enabled);
-        return isAlphabeticalOrderingEnabled.flatMap(isEnabled -> {
-            if (isEnabled) {
-                // If alphabetical ordering is enabled, then we need to sort the applications in alphabetical order
-                return service.findByWorkspaceIdAndBaseApplicationsInAlphabeticalOrder(workspaceId)
-                        .collectList()
-                        .map(applications -> new ResponseDTO<>(HttpStatus.OK, applications));
-            } else {
-                // If alphabetical ordering is disabled, then we need to sort the applications in recently used order
-                return service.findByWorkspaceIdAndBaseApplicationsInRecentlyUsedOrder(workspaceId)
-                        .collectList()
-                        .map(applications -> new ResponseDTO<>(HttpStatus.OK, applications));
-            }
-        });
+        return service.findByWorkspaceIdAndBaseApplicationsForHome(workspaceId)
+                .collectList()
+                .map(applications -> new ResponseDTO<>(HttpStatus.OK, applications));
     }
 
     @JsonView(Views.Public.class)

app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/WorkspaceControllerCE.java

@@ -7,10 +7,8 @@
 import com.appsmith.server.dtos.PermissionGroupInfoDTO;
 import com.appsmith.server.dtos.ResponseDTO;
 import com.appsmith.server.dtos.UpdatePermissionGroupDTO;
-import com.appsmith.server.services.FeatureFlagService;
 import com.appsmith.server.services.UserWorkspaceService;
 import com.appsmith.server.services.WorkspaceService;
-import com.appsmith.external.enums.FeatureFlagEnum;
 import com.fasterxml.jackson.annotation.JsonView;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
@@ -35,7 +33,6 @@
 public class WorkspaceControllerCE {
     private final WorkspaceService service;
     private final UserWorkspaceService userWorkspaceService;
-    private final FeatureFlagService featureFlagService;
 
     @JsonView(Views.Public.class)
     @GetMapping("/{id}")
@@ -109,19 +106,8 @@ public Mono<ResponseDTO<Workspace>> deleteLogo(@PathVariable String workspaceId)
     @JsonView(Views.Public.class)
     @GetMapping("/home")
     public Mono<ResponseDTO<List<Workspace>>> workspacesForHome() {
-        Mono<Boolean> isAlphabeticalOrderingEnabled = featureFlagService.check(FeatureFlagEnum.release_alphabetical_ordering_enabled);
-        return isAlphabeticalOrderingEnabled.flatMap(isEnabled -> {
-            if (isEnabled) {
-                // If alphabetical ordering is enabled, then we need to sort the workspaces in alphabetical order
-                return userWorkspaceService
-                        .getUserWorkspacesInAlphabeticalOrder()
-                        .map(workspaces -> new ResponseDTO<>(HttpStatus.OK, workspaces));
-            } else {
-                // If alphabetical ordering is disabled, then we need to sort the workspaces in recently used order
-                return userWorkspaceService
-                        .getUserWorkspacesByRecentlyUsedOrder()
-                        .map(workspaces -> new ResponseDTO<>(HttpStatus.OK, workspaces));
-            }
-        });
+        return userWorkspaceService
+                .getUserWorkspacesForHome()
+                .map(workspaces -> new ResponseDTO<>(HttpStatus.OK, workspaces));
     }
 }

app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserWorkspaceServiceCE.java

@@ -27,4 +27,6 @@ Mono<MemberInfoDTO> updatePermissionGroupForMember(
     Mono<List<Workspace>> getUserWorkspacesByRecentlyUsedOrder();
 
     Mono<List<Workspace>> getUserWorkspacesInAlphabeticalOrder();
+    
+    Mono<List<Workspace>> getUserWorkspacesForHome();
 }

app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserWorkspaceServiceCEImpl.java

@@ -13,11 +13,13 @@
 import com.appsmith.server.exceptions.AppsmithException;
 import com.appsmith.server.helpers.AppsmithComparators;
 import com.appsmith.server.repositories.UserRepository;
+import com.appsmith.server.services.FeatureFlagService;
 import com.appsmith.server.services.OrganizationService;
 import com.appsmith.server.services.PermissionGroupService;
 import com.appsmith.server.services.SessionUserService;
 import com.appsmith.server.services.UserDataService;
 import com.appsmith.server.services.WorkspaceService;
+import com.appsmith.external.enums.FeatureFlagEnum;
 import com.appsmith.server.solutions.PermissionGroupPermission;
 import com.appsmith.server.solutions.WorkspacePermission;
 import lombok.extern.slf4j.Slf4j;
@@ -55,6 +57,7 @@ public class UserWorkspaceServiceCEImpl implements UserWorkspaceServiceCE {
     private final OrganizationService organizationService;
     private final WorkspacePermission workspacePermission;
     private final PermissionGroupPermission permissionGroupPermission;
+    private final FeatureFlagService featureFlagService;
 
     @Autowired
     public UserWorkspaceServiceCEImpl(
@@ -65,7 +68,8 @@ public UserWorkspaceServiceCEImpl(
             PermissionGroupService permissionGroupService,
             OrganizationService organizationService,
             WorkspacePermission workspacePermission,
-            PermissionGroupPermission permissionGroupPermission) {
+            PermissionGroupPermission permissionGroupPermission,
+            FeatureFlagService featureFlagService) {
         this.sessionUserService = sessionUserService;
         this.workspaceService = workspaceService;
         this.userRepository = userRepository;
@@ -74,6 +78,7 @@ public UserWorkspaceServiceCEImpl(
         this.organizationService = organizationService;
         this.workspacePermission = workspacePermission;
         this.permissionGroupPermission = permissionGroupPermission;
+        this.featureFlagService = featureFlagService;
     }
 
     @Override
@@ -433,4 +438,25 @@ public Mono<List<Workspace>> getUserWorkspacesInAlphabeticalOrder() {
             .sort(Comparator.comparing(workspace -> workspace.getName().toLowerCase()))
             .collectList();
     }
+
+    /**
+     * Returns a list of workspaces for the current user, sorted based on feature flag.
+     * If alphabetical ordering is enabled, returns workspaces in alphabetical order.
+     * Otherwise, returns workspaces in recently used order.
+     *
+     * @return Mono containing the list of workspaces
+     */
+    @Override
+    public Mono<List<Workspace>> getUserWorkspacesForHome() {
+        Mono<Boolean> isAlphabeticalOrderingEnabled = featureFlagService.check(FeatureFlagEnum.release_alphabetical_ordering_enabled);
+        return isAlphabeticalOrderingEnabled.flatMap(isEnabled -> {
+            if (isEnabled) {
+                // If alphabetical ordering is enabled, then we need to sort the workspaces in alphabetical order
+                return getUserWorkspacesInAlphabeticalOrder();
+            } else {
+                // If alphabetical ordering is disabled, then we need to sort the workspaces in recently used order
+                return getUserWorkspacesByRecentlyUsedOrder();
+            }
+        });
+    }
 }