Site Admin update; (DOECODE-1078)

Author: Tim Sowers

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

@@ -13,6 +13,9 @@
 import javax.persistence.NamedQuery;
 import javax.persistence.Table;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import org.apache.commons.lang3.StringUtils;
+
 @Entity
 @Table(name = "sites")
 @NamedQueries({
@@ -28,14 +31,15 @@
     ,
     @NamedQuery(name = "Site.findHQ", query = "SELECT s FROM Site s WHERE s.hqUsage = true ORDER BY s")
 })
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class Site implements Serializable {
 
     private String siteCode;
     private List<String> emailDomains;
     private List<String> pocEmails;
-    private String lab;
-    private boolean standardUsage = false;
-    private boolean hqUsage = false;
+    private String labName;
+    private Boolean standardUsage;
+    private Boolean hqUsage;
     private String softwareGroupEmail;
 
     public Site() {
@@ -62,6 +66,14 @@ public List<String> getEmailDomains() {
     }
 
     public void setEmailDomains(List<String> emailDomains) {
+        for (int i = emailDomains.size() - 1; i >= 0; i--) {
+            // do not allow empty strings
+            if (StringUtils.isBlank(emailDomains.get(i)))
+                emailDomains.remove(i);
+            else
+                emailDomains.set(i, emailDomains.get(i).toLowerCase());
+        }
+
         this.emailDomains = emailDomains;
     }
 
@@ -79,38 +91,52 @@ public void setPocEmails(List<String> pocEmails) {
         if (pocEmails == null)
             pocEmails = new ArrayList<>();
 
-        for (int i = 0; i < pocEmails.size(); i++)
-            pocEmails.set(i, pocEmails.get(i).toLowerCase());
+        for (int i = pocEmails.size() - 1; i >= 0; i--) {
+            // do not allow empty strings
+            if (StringUtils.isBlank(pocEmails.get(i)))
+                pocEmails.remove(i);
+            else
+                pocEmails.set(i, pocEmails.get(i).toLowerCase());
+        }
 
         this.pocEmails = pocEmails;
     }
 
-    public String getLab() {
-        return lab;
+    @Column(name = "LAB_NAME")
+    public String getLabName() {
+        return labName;
     }
 
-    public void setLab(String lab) {
-        this.lab = lab;
+    public void setLabName(String lab) {
+        this.labName = lab;
     }
 
     @Column(name = "standard_usage", nullable = false)
-    public boolean isStandardUsage() {
+    public Boolean getStandardUsage() {
         return standardUsage;
     }
 
-    public void setStandardUsage(boolean usage) {
+    public void setStandardUsage(Boolean usage) {
         this.standardUsage = usage;
     }
 
+    public Boolean isStandardUsage() {
+        return standardUsage;
+    }
+
     @Column(name = "hq_usage", nullable = false)
-    public boolean isHqUsage() {
+    public Boolean getHqUsage() {
         return hqUsage;
     }
 
-    public void setHqUsage(boolean usage) {
+    public void setHqUsage(Boolean usage) {
         this.hqUsage = usage;
     }
 
+    public Boolean isHqUsage() {
+        return hqUsage;
+    }
+
     @Column(name = "SOFTWARE_GROUP_EMAIL")
     public String getSoftwareGroupEmail() {
         return softwareGroupEmail;

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

@@ -102,7 +102,7 @@ else if (RoleType.STANDARD.equals(roleType) || RoleType.HQ.equals(roleType)) {
 
                 for (Site site:siteList) {
                     String code = site.getSiteCode();
-                    String lab = site.getLab();
+                    String lab = site.getLabName();
                     roles.add(new UserRole(code, code, lab));
                 }
             } finally {

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

@@ -399,7 +399,7 @@ public Response listApprovedSnapshots()
                     if (siteResults.size() > 0) {
                         Site s = siteResults.get(0);
 
-                        String labDisplayName = s.getLab() + " (" + s.getSiteCode() + ")";
+                        String labDisplayName = s.getLabName() + " (" + s.getSiteCode() + ")";
 
                         // add "lab_display_name" info to response record
                         ((ObjectNode) objNode).put("lab_display_name", labDisplayName);

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

@@ -3952,7 +3952,7 @@ private static void sendStatusNotification(DOECodeMetadata md) {
             log.warn("Unable to locate SITE information for SITE CODE: " + siteCode);
             return;
         }
-        String lab = site.getLab();
+        String lab = site.getLabName();
         lab = lab.isEmpty() ? siteCode : lab;
 
         try {
@@ -4010,7 +4010,7 @@ private static void sendStateNotification(DOECodeMetadata md, String state, Stri
             log.warn("Unable to locate SITE information for SITE CODE: " + siteCode);
             return;
         }
-        String lab = site.getLab();
+        String lab = site.getLabName();
         lab = lab.isEmpty() ? siteCode : lab;
 
         String fileInfo;
@@ -4298,7 +4298,7 @@ private static void sendPOCNotification(DOECodeMetadata md) {
                 email.setCharset(org.apache.commons.mail.EmailConstants.UTF_8);
                 email.setHostName(EMAIL_HOST);
 
-                String lab = site.getLab();
+                String lab = site.getLabName();
                 lab = lab.isEmpty() ? siteCode : lab;
 
                 String softwareTitle = md.getSoftwareTitle().replaceAll("^\\h+|\\h+$","");