=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentialsStore.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentialsStore.java 2014-12-28 14:47:38 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentialsStore.java 2014-12-29 12:52:56 +0000 @@ -28,50 +28,16 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import java.util.Collection; +import org.hisp.dhis.common.GenericStore; /** * @author Lars Helge Overland */ public interface UserCredentialsStore + extends GenericStore { String ID = UserCredentialsStore.class.getName(); - // ------------------------------------------------------------------------- - // UserCredentials - // ------------------------------------------------------------------------- - - /** - * Adds a UserCredentials. - * - * @param userCredentials the UserCredentials to add. - * @return the User which the UserCredentials is associated with. - */ - int addUserCredentials( UserCredentials userCredentials ); - - /** - * Updates a UserCredentials. - * - * @param userCredentials the UserCredentials to update. - */ - void updateUserCredentials( UserCredentials userCredentials ); - - /** - * Retrieves the UserCredentials of the given User. - * - * @param user the User. - * @return the UserCredentials. - */ - UserCredentials getUserCredentials( User user ); - - /** - * Retrieves the UserCredentials with given identifier. - * - * @param id the identifier. - * @return the UserCredentials. - */ - UserCredentials getUserCredentials( int id ); - /** * Retrieves the UserCredentials associated with the User with the given * name. @@ -82,18 +48,11 @@ UserCredentials getUserCredentialsByUsername( String username ); /** - * Retrieves all UserCredentials. - * - * @return a Collection of UserCredentials. - */ - Collection getAllUserCredentials(); - - /** - * Deletes a UserCredentials. - * - * @param userCredentials the UserCredentials. - */ - void deleteUserCredentials( UserCredentials userCredentials ); - + * Retrieves the UserCredentials associated with the User with the given + * open ID. + * + * @param openId open ID. + * @return the UserCredentials. + */ UserCredentials getUserCredentialsByOpenID( String openId ); } === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserQueryParams.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserQueryParams.java 2014-12-28 14:54:14 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserQueryParams.java 2014-12-29 12:52:56 +0000 @@ -38,7 +38,7 @@ public class UserQueryParams { private String query; - + private String phoneNumber; private User user; === 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-29 11:46:59 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultUserService.java 2014-12-29 12:52:56 +0000 @@ -153,7 +153,7 @@ { AuditLogUtil.infoWrapper( log, currentUserService.getCurrentUsername(), user, AuditLogUtil.ACTION_DELETE ); - userCredentialsStore.deleteUserCredentials( user.getUserCredentials() ); + userCredentialsStore.delete( user.getUserCredentials() ); userStore.delete( user ); } @@ -307,7 +307,7 @@ return false; // Cannot be last if not super user } - Collection users = userCredentialsStore.getAllUserCredentials(); + Collection users = userCredentialsStore.getAll(); for ( UserCredentials user : users ) { @@ -489,19 +489,19 @@ @Override public int addUserCredentials( UserCredentials userCredentials ) { - return userCredentialsStore.addUserCredentials( userCredentials ); + return userCredentialsStore.save( userCredentials ); } @Override public void updateUserCredentials( UserCredentials userCredentials ) { - userCredentialsStore.updateUserCredentials( userCredentials ); + userCredentialsStore.update( userCredentials ); } @Override public Collection getAllUserCredentials() { - return userCredentialsStore.getAllUserCredentials(); + return userCredentialsStore.getAll(); } @Override @@ -527,7 +527,12 @@ @Override public UserCredentials getUserCredentials( User user ) { - return userCredentialsStore.getUserCredentials( user ); + if ( user == null ) + { + return null; + } + + return userCredentialsStore.get( user.getId() ); } @Override === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/hibernate/HibernateUserCredentialsStore.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/hibernate/HibernateUserCredentialsStore.java 2014-12-28 14:47:38 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/hibernate/HibernateUserCredentialsStore.java 2014-12-29 12:52:56 +0000 @@ -28,109 +28,31 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import java.util.Collection; - import org.hibernate.Query; -import org.hibernate.Session; -import org.hibernate.SessionFactory; -import org.hisp.dhis.user.User; +import org.hisp.dhis.hibernate.HibernateGenericStore; import org.hisp.dhis.user.UserCredentials; import org.hisp.dhis.user.UserCredentialsStore; /** - * TODO extend BaseIdentifiableObjectStore - * * @author Lars Helge Overland */ public class HibernateUserCredentialsStore + extends HibernateGenericStore implements UserCredentialsStore { - // ------------------------------------------------------------------------- - // Dependencies - // ------------------------------------------------------------------------- - - private SessionFactory sessionFactory; - - public void setSessionFactory( SessionFactory sessionFactory ) - { - this.sessionFactory = sessionFactory; - } - - // ------------------------------------------------------------------------- - // UserCredentials - // ------------------------------------------------------------------------- - - @Override - public int addUserCredentials( UserCredentials userCredentials ) - { - return (Integer) sessionFactory.getCurrentSession().save( userCredentials ); - } - - @Override - public void updateUserCredentials( UserCredentials userCredentials ) - { - sessionFactory.getCurrentSession().update( userCredentials ); - } - - @Override - public UserCredentials getUserCredentials( User user ) - { - if ( user == null ) - { - return null; - } - - Session session = sessionFactory.getCurrentSession(); - - return (UserCredentials) session.get( UserCredentials.class, user.getId() ); - } - - @Override - public UserCredentials getUserCredentials( int id ) - { - return (UserCredentials) sessionFactory.getCurrentSession().get( UserCredentials.class, id ); - } - @Override public UserCredentials getUserCredentialsByUsername( String username ) { - Session session = sessionFactory.getCurrentSession(); - - Query query = session.createQuery( "from UserCredentials uc where uc.username = :username" ); - + Query query = getQuery( "from UserCredentials uc where uc.username = :username" ); query.setString( "username", username ); - query.setCacheable( true ); - return (UserCredentials) query.uniqueResult(); } @Override public UserCredentials getUserCredentialsByOpenID( String openId ) { - Session session = sessionFactory.getCurrentSession(); - - Query query = session.createQuery( "from UserCredentials uc where uc.openId = :openId" ); - + Query query = getQuery( "from UserCredentials uc where uc.openId = :openId" ); query.setString( "openId", openId ); - query.setCacheable( true ); - return (UserCredentials) query.uniqueResult(); } - - @Override - @SuppressWarnings("unchecked") - public Collection getAllUserCredentials() - { - Session session = sessionFactory.getCurrentSession(); - - return session.createCriteria( UserCredentials.class ).list(); - } - - @Override - public void deleteUserCredentials( UserCredentials userCredentials ) - { - Session session = sessionFactory.getCurrentSession(); - - session.delete( userCredentials ); - } } === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml' --- dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml 2014-12-27 11:19:18 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml 2014-12-29 12:52:56 +0000 @@ -270,7 +270,9 @@ + + === modified file 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/user/UserCredentialsStoreTest.java' --- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/user/UserCredentialsStoreTest.java 2014-12-28 14:15:49 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/user/UserCredentialsStoreTest.java 2014-12-29 12:52:56 +0000 @@ -82,10 +82,10 @@ UserCredentials credentialsA = createUserCredentials( 'A', userA ); UserCredentials credentialsB = createUserCredentials( 'B', userB ); - int idA = userCredentialsStore.addUserCredentials( credentialsA ); - int idB = userCredentialsStore.addUserCredentials( credentialsB ); + int idA = userCredentialsStore.save( credentialsA ); + int idB = userCredentialsStore.save( credentialsB ); - assertEquals( credentialsA, userCredentialsStore.getUserCredentials( idA ) ); - assertEquals( credentialsB, userCredentialsStore.getUserCredentials( idB ) ); + assertEquals( credentialsA, userCredentialsStore.get( idA ) ); + assertEquals( credentialsB, userCredentialsStore.get( idB ) ); } } === modified file 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/user/UserSettingServiceTest.java' --- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/user/UserSettingServiceTest.java 2014-10-01 10:19:12 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/user/UserSettingServiceTest.java 2014-12-29 12:52:56 +0000 @@ -50,9 +50,6 @@ @Autowired private UserService userService; - @Autowired - private UserCredentialsStore userCredentialStore; - private User testUser; @Override @@ -63,7 +60,7 @@ userService.addUser( testUser ); UserCredentials userCredentials = testUser.getUserCredentials(); userCredentials.setUser( testUser ); - userCredentialStore.addUserCredentials( userCredentials ); + userService.addUserCredentials( userCredentials ); } @Test @@ -71,7 +68,7 @@ { UserCredentials userCredentials = testUser.getUserCredentials(); userCredentials.setUser( testUser ); - userCredentialStore.addUserCredentials( userCredentials ); + userService.addUserCredentials( userCredentials ); userSettingService.saveUserSetting( "mykey", "value", "username" ); Serializable preference = userSettingService.getUserSetting( "mykey", "username" ); assertEquals( preference, "value" ); === modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/impl/DefaultDashboardService.java' --- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/impl/DefaultDashboardService.java 2014-10-16 06:17:19 +0000 +++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/impl/DefaultDashboardService.java 2014-12-29 12:52:56 +0000 @@ -42,6 +42,7 @@ import org.hisp.dhis.report.Report; import org.hisp.dhis.reporttable.ReportTable; import org.hisp.dhis.user.User; +import org.hisp.dhis.user.UserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; @@ -76,6 +77,9 @@ @Autowired private IdentifiableObjectManager objectManager; + + @Autowired + private UserService userService; @Autowired private DashboardItemStore dashboardItemStore; @@ -95,7 +99,7 @@ { DashboardSearchResult result = new DashboardSearchResult(); - result.setUsers( objectManager.getBetweenLikeName( User.class, query, 0, getMax( TYPE_USERS, maxTypes ) ) ); + result.setUsers( userService.getAllUsersBetweenByName( query, 0, getMax( TYPE_USERS, maxTypes ) ) ); result.setCharts( objectManager.getBetweenLikeName( Chart.class, query, 0, getMax( TYPE_CHART, maxTypes ) ) ); result.setEventCharts( objectManager.getBetweenLikeName( EventChart.class, query, 0, getMax( TYPE_EVENT_CHART, maxTypes ) ) ); result.setMaps( objectManager.getBetweenLikeName( Map.class, query, 0, getMax( TYPE_MAP, maxTypes ) ) );