optional for user

Author: smutniak

src/main/java/org/tdl/vireo/controller/SubmissionController.java

@@ -691,6 +691,7 @@ private void processBatchExport(HttpServletResponse response, User user, String
                 ZipOutputStream zos = new ZipOutputStream(sos_mets);
                 for (Submission submission : submissionRepo.batchDynamicSubmissionQuery(filter, columns)) {
                     ExportPackage exportPackage = packagerUtility.packageExport(packager, submission);
+/**
                     if(exportPackage.isMap()){
                         for (Map.Entry<String, File> fileEntry : ((Map<String, File>) exportPackage.getPayload()).entrySet()) {
                             File exportFile = (File) fileEntry.getValue();
@@ -699,11 +700,14 @@ private void processBatchExport(HttpServletResponse response, User user, String
                             zos.write(fileBytes);
                         }
                     }else{
+**/
                         File exportFile = (File) exportPackage.getPayload();
                         byte[] fileBytes =  FileUtils.readFileToByteArray(exportFile);
                         zos.putNextEntry(new ZipEntry(exportFile.getName()));
                         zos.write(fileBytes);
+/**
                     }
+**/
                     zos.closeEntry();
                 }
                 zos.close();

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

@@ -12,6 +12,7 @@
 import java.util.ArrayList;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
+import java.util.Optional;
 import java.text.SimpleDateFormat;
 
 import javax.persistence.Entity;
@@ -20,6 +21,7 @@
 import org.tdl.vireo.model.FieldValue;
 import org.tdl.vireo.model.ActionLog;
 import org.tdl.vireo.model.Submission;
+import org.tdl.vireo.model.User;
 import org.tdl.vireo.model.export.ZipExportPackage;
 import org.tdl.vireo.model.formatter.AbstractFormatter;
 
@@ -78,6 +80,12 @@ public ZipExportPackage packageExport(Submission submission, String manifest) {
             SimpleDateFormat sd_format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssz");
             for(ActionLog al : actionLogArray){
                 actionLogStr.append(sd_format.format(al.getActionDate().getTime())).append(",");
+                Optional<User> alUser = al.getUser();
+                if(alUser.isPresent()){
+                    actionLogStr.append('"'+alUser.getName()+'"').append(",");
+                }else{
+                    actionLogStr.append(",");
+                }
                 actionLogStr.append('"'+al.getUser().getName()+'"').append(",");
                 actionLogStr.append('"'+al.getEntry()+'"').append(",");
                 actionLogStr.append(al.getSubmissionStatus().getName()).append("\n");

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

@@ -7,12 +7,14 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.ArrayList;
+import java.util.Optional;
 import java.text.SimpleDateFormat;
 
 import javax.persistence.Entity;
 
 import org.apache.commons.io.FileUtils;
 import org.tdl.vireo.model.Submission;
+import org.tdl.vireo.model.User;
 import org.tdl.vireo.model.ActionLog;
 import org.tdl.vireo.model.export.DSpaceSimplePackage;
 import org.tdl.vireo.model.formatter.AbstractFormatter;
@@ -64,7 +66,12 @@ public DSpaceSimplePackage packageExport(Submission submission, Map<String, Stri
             SimpleDateFormat sd_format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssz");
             for(ActionLog al : actionLogArray){
                 actionLogStr.append(sd_format.format(al.getActionDate().getTime())).append(",");
-                actionLogStr.append('"'+al.getUser().getName()+'"').append(",");
+                Optional<User> alUser = al.getUser();
+                if(alUser.isPresent()){
+                    actionLogStr.append('"'+alUser.getName()+'"').append(",");
+                }else{
+                    actionLogStr.append(",");
+                }
                 actionLogStr.append('"'+al.getEntry()+'"').append(",");
                 actionLogStr.append(al.getSubmissionStatus().getName()).append("\n");
             }