From e0a03c74e5c2d5dfbd68683e599d4f2037426eec Mon Sep 17 00:00:00 2001
From: Arpit Mohan <arpit@appsmith.com>
Date: Fri, 3 Jan 2020 15:57:31 +0530
Subject: [PATCH] Filtering out the groups to only query those that belong to
 the user's current organization

---
 .../appsmith/server/services/GroupServiceImpl.java    | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/GroupServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/GroupServiceImpl.java
index f133972027..b6fde85795 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/GroupServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/GroupServiceImpl.java
@@ -19,6 +19,7 @@ import java.util.Set;
 public class GroupServiceImpl extends BaseService<GroupRepository, Group, String> implements GroupService {
 
     private final GroupRepository repository;
+    private final SessionUserService sessionUserService;
 
     @Autowired
     public GroupServiceImpl(Scheduler scheduler,
@@ -26,14 +27,20 @@ public class GroupServiceImpl extends BaseService<GroupRepository, Group, String
                             MongoConverter mongoConverter,
                             ReactiveMongoTemplate reactiveMongoTemplate,
                             GroupRepository repository,
-                            AnalyticsService analyticsService) {
+                            AnalyticsService analyticsService,
+                            SessionUserService sessionUserService) {
         super(scheduler, validator, mongoConverter, reactiveMongoTemplate, repository, analyticsService);
         this.repository = repository;
+        this.sessionUserService = sessionUserService;
     }
 
     @Override
     public Flux<Group> getAllById(Set<String> ids) {
-        return this.repository.findAllById(ids);
+        return sessionUserService.getCurrentUser()
+                .flatMapMany(user -> {
+                    String organizationId = user.getCurrentOrganizationId();
+                    return repository.getAllByOrganizationId(organizationId);
+                });
     }
 
     /**