Added count in get all usergroups operation result.

src/core/services-api/src/main/java/it/geosolutions/geostore/services/PermissionService.java → src/core/services-api/src/main/java/it/geosolutions/geostore/services/ResourcePermissionService.java

@@ -3,7 +3,7 @@
 import it.geosolutions.geostore.core.model.Resource;
 import it.geosolutions.geostore.core.model.User;
 
-public interface PermissionService {
+public interface ResourcePermissionService {
     /**
      * This method allows us to know if we filter out "unadvertised" resources for
      * non-admin/non-owners, keeping only owned resources.

src/core/services-api/src/main/java/it/geosolutions/geostore/services/UserGroupService.java

@@ -140,15 +140,15 @@ List<ShortResource> updateSecurityRules(
     UserGroup get(String name);
 
     /**
-     * Returns the amount of groups that match searching criteria. The 'everyone' group is never
-     * included.
+     * Returns the amount of groups that match searching criteria.
      *
-     * @param authUser the user that performs the research
      * @param nameLike a sub-string to search in group name
+     * @param all if <code>true</code> adds to result the 'everyone' group if it matches the
+     *     searching criteria
      * @return the amount of groups that match searching criteria
      * @throws BadRequestServiceEx
      */
-    long getCount(User authUser, String nameLike) throws BadRequestServiceEx;
+    long getCount(String nameLike, boolean all) throws BadRequestServiceEx;
 
     /**
      * Returns the amount of groups that match searching criteria.

src/core/services-impl/src/main/java/it/geosolutions/geostore/services/PermissionServiceImpl.java → src/core/services-impl/src/main/java/it/geosolutions/geostore/services/ResourcePermissionServiceImpl.java

@@ -7,7 +7,7 @@
 import java.util.List;
 import java.util.function.BiFunction;
 
-public class PermissionServiceImpl implements PermissionService {
+public class ResourcePermissionServiceImpl implements ResourcePermissionService {
 
     private final BiFunction<SecurityRule, Resource, Boolean> resourceOwnership =
             (rule, resource) -> resource.getId().equals(rule.getResource().getId());

src/core/services-impl/src/main/java/it/geosolutions/geostore/services/ResourceServiceImpl.java

@@ -86,7 +86,8 @@ public class ResourceServiceImpl implements ResourceService {
     private SecurityDAO securityDAO;
 
     private UserService userService;
-    private PermissionService permissionService;
+
+    private ResourcePermissionService resourcePermissionService;
 
     /** @param securityDAO the securityDAO to set */
     public void setSecurityDAO(SecurityDAO securityDAO) {
@@ -122,8 +123,8 @@ public void setUserService(UserService userService) {
         this.userService = userService;
     }
 
-    public void setPermissionService(PermissionService permissionService) {
-        this.permissionService = permissionService;
+    public void setResourcePermissionService(ResourcePermissionService resourcePermissionService) {
+        this.resourcePermissionService = resourcePermissionService;
     }
 
     /*
@@ -702,15 +703,15 @@ private List<ShortResource> convertToShortResourceList(List<Resource> resources,
         userService.fetchSecurityRules(user);
 
         return resources.stream()
-                .filter(r -> permissionService.isResourceAvailableForUser(r, user))
+                .filter(r -> resourcePermissionService.isResourceAvailableForUser(r, user))
                 .map(r -> createShortResource(user, r))
                 .collect(Collectors.toList());
     }
 
     private ShortResource createShortResource(User user, Resource resource) {
         ShortResource shortResource = new ShortResource(resource);
 
-        if (user != null && permissionService.canUserWriteResource(user, resource)) {
+        if (user != null && resourcePermissionService.canUserWriteResource(user, resource)) {
             shortResource.setCanEdit(true);
             shortResource.setCanDelete(true);
         }

src/core/services-impl/src/main/java/it/geosolutions/geostore/services/UserGroupServiceImpl.java

@@ -238,7 +238,7 @@ public List<UserGroup> getAll(Integer page, Integer entries, String nameLike, bo
     }
 
     private Search createGetAllSearchCriteria(
-            Integer page, Integer entries, String nameLike, boolean all)
+            Integer page, Integer entries, String nameLike, boolean includeReserved)
             throws BadRequestServiceEx {
 
         if (((page != null) && (entries == null)) || ((page == null) && (entries != null))) {
@@ -258,7 +258,7 @@ private Search createGetAllSearchCriteria(
             searchCriteria.addFilterILike("groupName", nameLike);
         }
 
-        if (!all) {
+        if (!includeReserved) {
             searchCriteria.addFilterNotEqual("groupName", GroupReservedNames.EVERYONE.groupName());
         }
 
@@ -396,12 +396,17 @@ public UserGroup get(String name) {
     }
 
     @Override
-    public long getCount(User user, String nameLike, boolean all) throws BadRequestServiceEx {
-        if (user == null) throw new BadRequestServiceEx("User must be defined.");
+    public long getCount(String nameLike, boolean all) throws BadRequestServiceEx {
+        return userGroupDAO.count(createCountSearchCriteria(nameLike, all));
+    }
 
-        Search searchCriteria = new Search(UserGroup.class);
+    @Override
+    public long getCount(User user, String nameLike, boolean all) throws BadRequestServiceEx {
+        if (user == null) {
+            throw new BadRequestServiceEx("User must be defined.");
+        }
 
-        searchCriteria.addSortAsc("groupName");
+        Search searchCriteria = createCountSearchCriteria(nameLike, all);
 
         if (user.getRole() == Role.USER) {
             Set<UserGroup> userGrp = user.getGroups();
@@ -412,18 +417,22 @@ public long getCount(User user, String nameLike, boolean all) throws BadRequestS
             searchCriteria.addFilterIn("id", grpIds);
         }
 
+        return userGroupDAO.count(searchCriteria);
+    }
+
+    private Search createCountSearchCriteria(String nameLike, boolean includingReserved) {
+
+        Search searchCriteria = new Search(UserGroup.class);
+
         if (nameLike != null) {
             searchCriteria.addFilterILike("groupName", nameLike);
         }
 
-        if (!all)
+        if (!includingReserved) {
             searchCriteria.addFilterNotEqual("groupName", GroupReservedNames.EVERYONE.groupName());
+        }
 
-        return userGroupDAO.count(searchCriteria);
-    }
-
-    public long getCount(User user, String nameLike) throws BadRequestServiceEx {
-        return getCount(user, nameLike, false);
+        return searchCriteria;
     }
 
     @Override

src/core/services-impl/src/main/resources/applicationContext.xml

@@ -24,6 +24,6 @@
 
     <bean id="userSessionService" class="it.geosolutions.geostore.services.InMemoryUserSessionServiceImpl">    </bean>
 
-    <bean id="permissionService" class="it.geosolutions.geostore.services.PermissionServiceImpl">    </bean>
+    <bean id="resourcePermissionService" class="it.geosolutions.geostore.services.ResourcePermissionServiceImpl">    </bean>
 
 </beans>

src/modules/rest/api/src/main/java/it/geosolutions/geostore/services/rest/model/UserGroupList.java

@@ -23,6 +23,7 @@
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Objects;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
@@ -31,34 +32,34 @@
 public class UserGroupList implements Iterable<RESTUserGroup> {
 
     private List<RESTUserGroup> list;
+    private long count;
 
     public UserGroupList() {
-        this.list = new ArrayList<RESTUserGroup>();
+        this.list = new ArrayList<>();
     }
 
-    /** @param list */
-    public UserGroupList(List<RESTUserGroup> list) {
+    public UserGroupList(List<RESTUserGroup> list, long count) {
         super();
-        if (list != null) {
-            this.list = list;
-        } else {
-            this.list = new ArrayList<RESTUserGroup>();
-        }
+        this.count = count;
+        this.list = Objects.requireNonNullElseGet(list, ArrayList::new);
     }
 
-    /** @return the userGroup */
     @XmlElement(name = "UserGroup")
     public List<RESTUserGroup> getUserGroupList() {
         return list;
     }
 
-    /** @param userGroup the userGroup to set */
     public void setUserGroupList(List<RESTUserGroup> userGroup) {
         this.list = userGroup;
     }
 
+    @XmlElement(name = "Count")
+    public long getCount() {
+        return count;
+    }
+
     @Override
     public Iterator<RESTUserGroup> iterator() {
-        return list == null ? Collections.EMPTY_LIST.iterator() : list.iterator();
+        return list == null ? Collections.emptyIterator() : list.iterator();
     }
 }

src/modules/rest/extjs/src/main/java/it/geosolutions/geostore/services/rest/impl/RESTExtJsServiceImpl.java

@@ -31,7 +31,7 @@
 import it.geosolutions.geostore.core.model.Resource;
 import it.geosolutions.geostore.core.model.User;
 import it.geosolutions.geostore.core.model.UserGroup;
-import it.geosolutions.geostore.services.PermissionService;
+import it.geosolutions.geostore.services.ResourcePermissionService;
 import it.geosolutions.geostore.services.ResourceService;
 import it.geosolutions.geostore.services.SecurityService;
 import it.geosolutions.geostore.services.UserGroupService;
@@ -86,7 +86,7 @@ public class RESTExtJsServiceImpl extends RESTServiceImpl implements RESTExtJsSe
 
     private UserGroupService groupService;
 
-    private PermissionService permissionService;
+    private ResourcePermissionService resourcePermissionService;
 
     /** @param resourceService */
     public void setResourceService(ResourceService resourceService) {
@@ -97,8 +97,8 @@ public void setUserGroupService(UserGroupService userGroupService) {
         this.groupService = userGroupService;
     }
 
-    public void setPermissionService(PermissionService permissionService) {
-        this.permissionService = permissionService;
+    public void setResourcePermissionService(ResourcePermissionService resourcePermissionService) {
+        this.resourcePermissionService = resourcePermissionService;
     }
 
     /* (non-Javadoc)
@@ -395,7 +395,7 @@ private List<Resource> filterOutUnavailableResources(List<Resource> resources, U
         userService.fetchSecurityRules(user);
 
         return resources.stream()
-                .filter(r -> permissionService.isResourceAvailableForUser(r, user))
+                .filter(r -> resourcePermissionService.isResourceAvailableForUser(r, user))
                 .collect(Collectors.toList());
     }
 
@@ -422,7 +422,7 @@ private ExtResource convertToExtResource(Resource resource, User user) {
                         /* setting copy permission as in ResourceEnvelop.isCanCopy */
                         .withCanCopy(user != null);
 
-        if (permissionService.canUserWriteResource(user, resource)) {
+        if (resourcePermissionService.canUserWriteResource(user, resource)) {
             extResourceBuilder.withCanEdit(true).withCanDelete(true);
         }
 
@@ -535,7 +535,9 @@ public ExtGroupList getGroupsList(
         }
 
         try {
-            nameLike = nameLike.replaceAll("[*]", "%");
+            if (nameLike != null) {
+                nameLike = nameLike.replaceAll("[*]", "%");
+            }
             List<UserGroup> groups =
                     groupService.getAllAllowed(authUser, page, limit, nameLike, all);
 
@@ -684,12 +686,12 @@ public ExtShortResource getExtResource(
         User authUser = extractAuthUser(sc);
         userService.fetchSecurityRules(authUser);
 
-        if (!permissionService.canUserReadResource(authUser, id)) {
+        if (!resourcePermissionService.canUserReadResource(authUser, id)) {
             throw new ForbiddenErrorWebEx("Resource is protected");
         }
 
         ShortResource shortResource = new ShortResource(resource);
-        if (permissionService.canUserWriteResource(authUser, resource)) {
+        if (resourcePermissionService.canUserWriteResource(authUser, resource)) {
             shortResource.setCanEdit(true);
             shortResource.setCanDelete(true);
         }
@@ -755,7 +757,7 @@ private void readSecurity() {
                 canEdit = sr.isCanEdit();
                 return;
             }
-            if (authUser != null && permissionService.canUserWriteResource(authUser, r)) {
+            if (authUser != null && resourcePermissionService.canUserWriteResource(authUser, r)) {
                 canEdit = true;
                 canDelete = true;
             }

src/modules/rest/extjs/src/test/java/it/geosolutions/geostore/services/rest/impl/RESTExtJsServiceImplTest.java

@@ -39,6 +39,7 @@
 import it.geosolutions.geostore.services.dto.search.FieldFilter;
 import it.geosolutions.geostore.services.dto.search.GroupFilter;
 import it.geosolutions.geostore.services.dto.search.SearchOperator;
+import it.geosolutions.geostore.services.model.ExtGroupList;
 import it.geosolutions.geostore.services.model.ExtResource;
 import it.geosolutions.geostore.services.model.ExtResourceList;
 import it.geosolutions.geostore.services.model.ExtShortResource;
@@ -504,7 +505,7 @@ public void testExtResourcesList_sorted() throws Exception {
                             sc,
                             0,
                             1000,
-                            new Sort("unknown field", "desc"),
+                            new Sort("unknownfield", "desc"),
                             false,
                             false,
                             new AndFilter());
@@ -1521,6 +1522,38 @@ public void testGetExtResource_groupOwnedWithPermissionsInformation() throws Exc
         }
     }
 
+    @Test
+    public void testGetGroupsList() throws Exception {
+        final String groupAName = "groupA";
+
+        long groupAId = createGroup(groupAName);
+        UserGroup groupA = userGroupService.get(groupAId);
+
+        createGroup("groupB");
+
+        long adminId = restCreateUser("admin", Role.ADMIN, null, "admin");
+        SecurityContext adminSecurityContext = new SimpleSecurityContext(adminId);
+
+        long userId = restCreateUser("u0", Role.USER, Collections.singleton(groupA), "p0");
+        SecurityContext userSecurityContext = new SimpleSecurityContext(userId);
+
+        {
+            ExtGroupList response =
+                    restExtJsService.getGroupsList(adminSecurityContext, null, 0, 1000, true);
+            List<UserGroup> resources = response.getList();
+            assertEquals(2, resources.size());
+        }
+
+        {
+            ExtGroupList response =
+                    restExtJsService.getGroupsList(userSecurityContext, null, 0, 1000, true);
+            List<UserGroup> userGroups = response.getList();
+            assertEquals(1, userGroups.size());
+            UserGroup userGroup = userGroups.get(0);
+            assertEquals(groupAName, userGroup.getGroupName());
+        }
+    }
+
     private JSONResult parse(String jsonString) {
         JSONResult ret = new JSONResult();
 

src/modules/rest/extjs/src/test/java/it/geosolutions/geostore/services/rest/impl/ServiceTestBase.java

@@ -68,7 +68,7 @@ public class ServiceTestBase {
     protected static CategoryService categoryService;
     protected static UserService userService;
     protected static UserGroupService userGroupService;
-    protected static PermissionService permissionService;
+    protected static ResourcePermissionService resourcePermissionService;
 
     protected static ResourceDAO resourceDAO;
     protected static UserDAO userDAO;
@@ -95,7 +95,8 @@ public ServiceTestBase() {
                 categoryService = (CategoryService) ctx.getBean("categoryService");
                 userService = (UserService) ctx.getBean("userService");
                 userGroupService = (UserGroupService) ctx.getBean("userGroupService");
-                permissionService = (PermissionService) ctx.getBean("permissionService");
+                resourcePermissionService =
+                        (ResourcePermissionService) ctx.getBean("resourcePermissionService");
 
                 resourceDAO = (ResourceDAO) ctx.getBean("resourceDAO");
                 userDAO = (UserDAO) ctx.getBean("userDAO");
@@ -125,7 +126,7 @@ public void testCheckServices() {
         assertNotNull(categoryService);
         assertNotNull(userService);
         assertNotNull(userGroupService);
-        assertNotNull(permissionService);
+        assertNotNull(resourcePermissionService);
 
         assertNotNull(resourceDAO);
         assertNotNull(userDAO);

src/modules/rest/impl/src/main/java/it/geosolutions/geostore/services/rest/impl/RESTUserGroupServiceImpl.java

@@ -178,7 +178,13 @@ public UserGroupList getAll(
                     userGroupService.getAll(page, entries, nameLike, all).stream()
                             .map(ug -> createRestUserGroup(ug, includeUsers))
                             .collect(Collectors.toList());
-            return new UserGroupList(restUserGroups);
+
+            long count = 0;
+            if (!restUserGroups.isEmpty()) {
+                count = userGroupService.getCount(nameLike, all);
+            }
+
+            return new UserGroupList(restUserGroups, count);
         } catch (BadRequestServiceEx e) {
             LOGGER.error(e.getMessage(), e);
             throw new BadRequestWebEx(e.getMessage());
@@ -333,7 +339,7 @@ private UserGroupList getGroups(String name, List<String> values, boolean ignore
                     groupStream
                             .map(g -> new RESTUserGroup(g, Collections.emptySet()))
                             .collect(Collectors.toList());
-            groupList = new UserGroupList(restGroups);
+            groupList = new UserGroupList(restGroups, restGroups.size());
         } else {
             groupList = new UserGroupList();
         }