Improve User Admin; (DOECODE-807)

Author: sowerstl

src/main/java/gov/osti/entity/User.java

@@ -6,9 +6,11 @@
 import java.util.Calendar;
 import java.util.Date;
 import java.util.Set;
+
+import org.apache.commons.lang3.StringUtils;
+
 import javax.persistence.Basic;
 import javax.persistence.Column;
-
 import javax.persistence.ElementCollection;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -26,7 +28,7 @@
 @Entity
 @Table(name="users", uniqueConstraints=@UniqueConstraint(columnNames={"email","apiKey"}))
 @NamedQueries ({
-    @NamedQuery (name = "User.findAllUsers", query = "SELECT u FROM User u ORDER BY u.lastName"),
+    @NamedQuery (name = "User.findAllUsers", query = "SELECT u FROM User u ORDER BY lower(u.lastName), lower(u.firstName)"),
     @NamedQuery (name = "User.findUser", query = "SELECT u FROM User u WHERE u.email=lower(:email)")
 })
 public class User implements Serializable {
@@ -95,6 +97,9 @@ public User(String email, String password, String apiKey, String confirmationCod
     @ElementCollection 
     private Set<String> pendingRoles = null;
 
+    private transient String displayName;
+    private transient String displayNameLastnameFirst;
+
     /**
      * Do NOT output this on JSON Object requests.
      * @return the Password
@@ -397,4 +402,63 @@ public boolean hasRole(String role) {
     public boolean hasRoles() {
         return (null!=roles);
     }
+
+    /**
+     * Get a User's full display name in "First Last" format.
+     */
+    public String getDisplayName() {
+        this.displayName = getFullName(false);
+        return this.displayName;
+    }
+
+    /**
+     * Get a User's full display name in "Last, First" format.
+     */
+    public String getDisplayNameLastnameFirst() {
+        this.displayNameLastnameFirst = getFullName(true);
+        return this.displayNameLastnameFirst;
+    }
+
+    /**
+     * Get a User's full display name from First/Last values.
+     * 
+     * @param lastnameFirst the boolean that controls if Last Name should be listed
+     *                      first
+     */
+    private String getFullName(boolean lastnameFirst) {
+        String fullName = "";
+
+        boolean hasFirstName = StringUtils.isNotBlank(getFirstName());
+        boolean hasLastName = StringUtils.isNotBlank(getLastName());
+
+        String part1 = "";
+        String part2 = "";
+
+        if (lastnameFirst) {
+            if (hasLastName)
+                part1 = getLastName().trim();
+            if (hasFirstName)
+                part2 = getFirstName().trim();
+        } else {
+            if (hasLastName)
+                part2 = getLastName().trim();
+            if (hasFirstName)
+                part1 = getFirstName().trim();
+        }
+
+        boolean hasPart1 = StringUtils.isNotBlank(part1);
+        boolean hasPart2 = StringUtils.isNotBlank(part2);
+
+        fullName += part1;
+
+        if (lastnameFirst && hasPart1 && hasPart2)
+            fullName += ",";
+
+        if (hasPart1 && hasPart2)
+            fullName += " ";
+
+        fullName += part2;
+
+        return fullName;
+    }
 }

src/main/java/gov/osti/services/UserServices.java

@@ -325,6 +325,8 @@ public Response login(String object) {
                         .put("email", user.getEmail())
                         .put("first_name", user.getFirstName())
                         .put("last_name", user.getLastName())
+                        .put("display_name", user.getDisplayName())
+                        .put("display_name_lastname_first", user.getDisplayNameLastnameFirst())
                         .set("roles", mapper.valueToTree(user.getRoles())))
                         .set("pending_roles", mapper.valueToTree(user.getPendingRoles()))
                         .toString())
@@ -934,7 +936,9 @@ public Response editUser(String object) {
                             .createObjectNode()
                             .put("email", user.getEmail())
                             .put("first_name", user.getFirstName())
-                            .put("last_name", user.getLastName()).toString())
+                            .put("last_name", user.getLastName())
+                            .put("display_name", user.getDisplayName())
+                            .put("display_name_lastname_first", user.getDisplayNameLastnameFirst()).toString())
                     .build();
         } catch ( Exception e ) {
             if ( em.getTransaction().isActive())