Merge branch 'ui-265-admin-users-by-createddate' into 'master'

Added filtering users by lastLogin

See merge request genesys-pgr/genesys-server!380

src/main/java/org/genesys2/server/service/filter/UserFilter.java

@@ -20,6 +20,7 @@ import java.util.Date;
 import java.util.Set;
 
 import org.genesys.blocks.model.filters.AuditedVersionedModelFilter;
+import org.genesys.blocks.model.filters.DateFilter;
 import org.genesys.blocks.model.filters.StringFilter;
 import org.genesys2.server.model.UserRole;
 import org.genesys2.server.model.impl.QUser;
@@ -44,6 +45,8 @@ public class UserFilter extends AuditedVersionedModelFilter<UserFilter, User> {
 	
 	/** The role. */
 	public Set<UserRole> role;
+
+	public DateFilter lastLogin;
 	
 	/** The locked. */
 	public Boolean locked;
@@ -99,6 +102,10 @@ public class UserFilter extends AuditedVersionedModelFilter<UserFilter, User> {
 			}
 		}
 
+		if (lastLogin != null) {
+			and.and(lastLogin.buildQuery(user.lastLogin));
+		}
+
 		return and;
 	}
 }