dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 17822
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2014-12-29 12:46:59 +0100
message:
  UserService, removed obsolete methods
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserService.java
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultUserService.java


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserService.java	2014-12-28 15:09:23 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserService.java	2014-12-29 11:46:59 +0000
@@ -86,12 +86,17 @@
      */
     Collection<User> getAllUsers();
 
-    List<User> getAllUsersBetween( int first, int max );
-
+    /**
+     * Retrieves all Users with first name, surname or user name like the given
+     * name.
+     * 
+     * @param name the name.
+     * @param first the first item to return.
+     * @param max the max number of item to return.
+     * @return a list of Users.
+     */
     List<User> getAllUsersBetweenByName( String name, int first, int max );
 
-    Collection<User> getUsersByLastUpdated( Date lastUpdated );
-
     /**
      * Deletes a User.
      *
@@ -119,12 +124,8 @@
      */
     public Set<DataElementCategoryOption> getCoDimensionConstraints( UserCredentials userCredentials );
 
-    boolean isSuperUser( UserCredentials userCredentials );
-
     boolean isLastSuperUser( UserCredentials userCredentials );
 
-    boolean isSuperRole( UserAuthorityGroup userAuthorityGroup );
-
     boolean isLastSuperRole( UserAuthorityGroup userAuthorityGroup );
 
     /**
@@ -357,8 +358,18 @@
 
     void assignDataSetToUserRole( DataSet dataSet );
 
+    /**
+     * Returns the number of UserAuthorityGroups.
+     * 
+     * @return the number of UserAuthorityGroups.
+     */
     int getUserRoleCount();
 
+    /**
+     * Returns the number of UserAuthorityGroups with the given name.
+     * 
+     * @return the number of UserAuthorityGroups with the given name.
+     */
     int getUserRoleCountByName( String name );
 
     /**

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultUserService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultUserService.java	2014-12-28 15:09:23 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultUserService.java	2014-12-29 11:46:59 +0000
@@ -165,24 +165,6 @@
     }
 
     @Override
-    public List<User> getAllUsersBetween( int first, int max )
-    {
-        return userStore.getAllOrderedName( first, max );
-    }
-
-    @Override
-    public List<User> getAllUsersBetweenByName( String name, int first, int max )
-    {
-        return userStore.getAllLikeName( name, first, max );
-    }
-
-    @Override
-    public Collection<User> getUsersByLastUpdated( Date lastUpdated )
-    {
-        return userStore.getAllGeLastUpdated( lastUpdated );
-    }
-
-    @Override
     public User getUser( int userId )
     {
         return userStore.get( userId );
@@ -201,6 +183,17 @@
     }
 
     @Override
+    public List<User> getAllUsersBetweenByName( String name, int first, int max )
+    {
+        UserQueryParams params = new UserQueryParams();
+        params.setQuery( name );
+        params.setFirst( first );
+        params.setMax( max );
+        
+        return userStore.getUsers( params );
+    }
+
+    @Override
     public List<User> getManagedUsers( User user )
     {
         UserQueryParams params = new UserQueryParams( user );
@@ -307,28 +300,9 @@
     }
 
     @Override
-    public boolean isSuperUser( UserCredentials userCredentials )
-    {
-        if ( userCredentials == null )
-        {
-            return false;
-        }
-
-        for ( UserAuthorityGroup group : userCredentials.getUserAuthorityGroups() )
-        {
-            if ( group.getAuthorities().contains( "ALL" ) )
-            {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    @Override
     public boolean isLastSuperUser( UserCredentials userCredentials )
     {
-        if ( !isSuperUser( userCredentials ) )
+        if ( !userCredentials.isSuper() )
         {
             return false; // Cannot be last if not super user
         }
@@ -337,7 +311,7 @@
 
         for ( UserCredentials user : users )
         {
-            if ( isSuperUser( user ) && !user.equals( userCredentials ) )
+            if ( user.isSuper() && !user.equals( userCredentials ) )
             {
                 return false;
             }
@@ -347,24 +321,13 @@
     }
 
     @Override
-    public boolean isSuperRole( UserAuthorityGroup userAuthorityGroup )
-    {
-        if ( userAuthorityGroup == null )
-        {
-            return false;
-        }
-
-        return ( userAuthorityGroup.getAuthorities().contains( "ALL" ) );
-    }
-
-    @Override
     public boolean isLastSuperRole( UserAuthorityGroup userAuthorityGroup )
     {
         Collection<UserAuthorityGroup> groups = userAuthorityGroupStore.getAll();
 
         for ( UserAuthorityGroup group : groups )
         {
-            if ( isSuperRole( group ) && group.getId() != userAuthorityGroup.getId() )
+            if ( group.isSuper() && group.getId() != userAuthorityGroup.getId() )
             {
                 return false;
             }