Merge pull request #2129 from jameswsullivan/excel-packager-committee-contact-email

Issue 2128: Fix Committee Contact Email in Excel Export

Author: cstarcher

src/main/java/org/tdl/vireo/model/Submission.java

@@ -253,6 +253,9 @@ public class Submission extends ValidatingBaseEntity {
     @JsonView(Views.SubmissionList.class)
     private Map<Long, String> columnValues;
 
+    @Transient
+    private String committeeContactEmail;
+
     public Submission() {
         setModelValidator(new SubmissionValidator());
         setFieldValues(new HashSet<FieldValue>());
@@ -603,17 +606,16 @@ public String getCommitteeContactEmail() {
         Optional<FieldValue> optFv = this.getFieldValuesByPredicateValue("dc.contributor.advisor")
             .stream()
             .findFirst();
-        String email = null;
         if (optFv.isPresent()) {
             Optional<String> optEmail = optFv.get()
                 .getContacts()
                 .stream()
                 .findFirst();
             if (optEmail.isPresent()) {
-                email = optEmail.get();
+                committeeContactEmail = optEmail.get();
             }
         }
-        return email;
+        return committeeContactEmail;
     }
 
     /**

src/main/java/org/tdl/vireo/model/packager/ExcelPackager.java

@@ -83,6 +83,7 @@ public ExcelExportPackage packageExport(Submission submission, List<SubmissionLi
                         if(column.getValuePath().size() > 1){
                              valuePath = new String[] {valuePath[0]};
                         }
+                        submission.getCommitteeContactEmail();
                         Object valueAsObject = EntityUtility.getValueFromPath(submission, valuePath);
 
                         String value = "";