Merge branch 'main' into 1973-proquest-export-diss_note

Author: cstarcher

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

@@ -41,6 +41,7 @@
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.data.web.PageableDefault;
+import org.springframework.http.HttpStatus;
 import org.springframework.messaging.simp.SimpMessagingTemplate;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.transaction.annotation.Transactional;
@@ -531,6 +532,16 @@ public void batchExport(HttpServletResponse response, @WeaverUser User user, @Pa
         processBatchExport(response, user, packagerName, activeFilter);
     }
 
+    private void handleBatchExportError(Exception e, HttpServletResponse response) throws IOException {
+        LOG.info("Error With Export", e);
+        String responseMessage = "Something went wrong with the export!";
+        ApiResponse apiResponse = new ApiResponse(ERROR, responseMessage);
+        response.reset();
+        response.setContentType("application/json");
+        response.getOutputStream().print(objectMapper.writeValueAsString(apiResponse));
+        response.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value());
+    }
+
     @SuppressWarnings("unchecked")
     private void processBatchExport(HttpServletResponse response, User user, String packagerName, NamedSearchFilterGroup filter) throws IOException {
         AbstractPackager<?> packager = packagerUtility.getPackager(packagerName);
@@ -576,7 +587,7 @@ private void processBatchExport(HttpServletResponse response, User user, String
             break;
         case "MarcXML21":
         case "Marc21":
-            ServletOutputStream sos = response.getOutputStream();
+            ByteArrayOutputStream sos = new ByteArrayOutputStream();
 
             try {
                 ZipOutputStream zos = new ZipOutputStream(sos, StandardCharsets.UTF_8);
@@ -599,24 +610,19 @@ private void processBatchExport(HttpServletResponse response, User user, String
                     }
                 }
                 zos.close();
-
+                response.getOutputStream().write(sos.toByteArray());
                 response.setContentType(packager.getMimeType());
                 response.setHeader("Content-Disposition", "inline; filename=" + packagerName + "." + packager.getFileExtension());
             } catch (Exception e) {
-                LOG.info("Error With Export",e);
-                response.setContentType("application/json");
-                ApiResponse apiResponse = new ApiResponse(ERROR, "Something went wrong with the export!");
-                sos.print(objectMapper.writeValueAsString(apiResponse));
-                sos.close();
+                handleBatchExportError(e, response);
             }
             break;
 
         case "ProQuest":
-            ServletOutputStream sos_pq = response.getOutputStream();
+            ByteArrayOutputStream sos_pq = new ByteArrayOutputStream();
 
             try {
                 ZipOutputStream zos = new ZipOutputStream(sos_pq, StandardCharsets.UTF_8);
-
                 for (Submission submission : submissionRepo.batchDynamicSubmissionQuery(filter, columns)) {
                     List<FieldValue> fieldValues = submission.getFieldValuesByPredicateValue("first_name");
                     Optional<String> firstNameOpt = fieldValues.size() > 0 ? Optional.of(fieldValues.get(0).getValue()) : Optional.empty();
@@ -664,29 +670,22 @@ private void processBatchExport(HttpServletResponse response, User user, String
                         b.putNextEntry(new ZipEntry(personName+fType));
                         b.write(fileBytes);
                         b.closeEntry();
-
-                    }catch(IOException ioe){
-                        ioe.printStackTrace();
                     }
                     zos.putNextEntry(new ZipEntry("upload_"+personName+".zip"));
                     baos.close();
                     zos.write(baos.toByteArray());
                     zos.closeEntry();
                 }
                 zos.close();
-
                 response.setContentType(packager.getMimeType());
+                response.getOutputStream().write(sos_pq.toByteArray());
                 response.setHeader("Content-Disposition", "inline; filename=" + packagerName + "." + packager.getFileExtension());
             } catch (Exception e) {
-                LOG.info("Error With Export",e);
-                response.setContentType("application/json");
-                ApiResponse apiResponse = new ApiResponse(ERROR, "Something went wrong with the export!");
-                sos_pq.print(objectMapper.writeValueAsString(apiResponse));
-                sos_pq.close();
+                handleBatchExportError(e, response);
             }
             break;
         case "DSpaceMETS":
-            ServletOutputStream sos_mets = response.getOutputStream();
+            ByteArrayOutputStream sos_mets = new ByteArrayOutputStream();
 
             try {
                 ZipOutputStream zos = new ZipOutputStream(sos_mets);
@@ -700,19 +699,15 @@ private void processBatchExport(HttpServletResponse response, User user, String
                     zos.closeEntry();
                 }
                 zos.close();
-
+                response.getOutputStream().write(sos_mets.toByteArray());
                 response.setContentType(packager.getMimeType());
                 response.setHeader("Content-Disposition", "inline; filename=" + packagerName + "." + packager.getFileExtension());
             } catch (Exception e) {
-                LOG.info("Error With Export",e);
-                response.setContentType("application/json");
-                ApiResponse apiResponse = new ApiResponse(ERROR, "Something went wrong with the export!");
-                sos_mets.print(objectMapper.writeValueAsString(apiResponse));
-                sos_mets.close();
+                handleBatchExportError(e, response);
             }
             break;
         case "DSpaceSimple":
-            ServletOutputStream sosDss = response.getOutputStream();
+            ByteArrayOutputStream sosDss = new ByteArrayOutputStream();
             try {
                 ZipOutputStream zos = new ZipOutputStream(sosDss);
                 for (Submission submission : submissionRepo.batchDynamicSubmissionQuery(filter, columns)) {
@@ -772,25 +767,16 @@ private void processBatchExport(HttpServletResponse response, User user, String
 
                 }
                 zos.close();
-
+                response.getOutputStream().write(sosDss.toByteArray());
                 response.setContentType(packager.getMimeType());
                 response.setHeader("Content-Disposition", "inline; filename=" + packagerName + "." + packager.getFileExtension());
             } catch (Exception e) {
-                LOG.info("Error With Export",e);
-                response.setContentType("application/json");
-                ApiResponse apiResponse = new ApiResponse(ERROR, "Something went wrong with the export!");
-                sosDss.print(objectMapper.writeValueAsString(apiResponse));
-                sosDss.close();
+                handleBatchExportError(e, response);
             }
             break;
 
         default:
-            response.setContentType("application/json");
-
-            ApiResponse apiResponse = new ApiResponse(ERROR, "No packager " + packagerName + " found!");
-            PrintWriter out = response.getWriter();
-            out.print(objectMapper.writeValueAsString(apiResponse));
-            out.close();
+            handleBatchExportError(new Exception("No packager " + packagerName + " found!"), response);
         }
 
         response.getOutputStream().close();

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

@@ -234,6 +234,7 @@ public ApiResponse addFilterCriterion(@WeaverUser User user, @RequestBody Map<St
             SubmissionListColumn column = submissionListColumnRepo.findByTitle(criterionName);
             for (NamedSearchFilter existingFilter : activeFilter.getNamedSearchFilters()) {
                 if (existingFilter.getSubmissionListColumn() != null &&
+                    existingFilter.getSubmissionListColumn().getPredicate() != null &&
                     existingFilter.getSubmissionListColumn().getPredicate().equals(column.getPredicate()) &&
                     existingFilter.getSubmissionListColumn().getValuePath().equals(column.getValuePath())) {
                     namedSearchFilter = existingFilter;

src/main/java/org/tdl/vireo/utility/SubmissionHelperUtility.java

@@ -661,15 +661,17 @@ public String getEmbargoLiftDate() {
             Optional<FieldValue> defaultEmbargo = getFirstFieldValueByPredicateValue("default_embargos");
 
             Optional<FieldValue> embargo = Optional.empty();
+
+            Boolean proquestEmbargoCheck = proquestEmbargo.isPresent() && proquestEmbargo.get().getIdentifier() != null && Integer.valueOf(proquestEmbargo.get().getIdentifier()) > 0;
+            Boolean defaultEmbargoCheck = defaultEmbargo.isPresent() && defaultEmbargo.get().getIdentifier() != null && Integer.valueOf(defaultEmbargo.get().getIdentifier()) > 0;
 
-            if (proquestEmbargo.isPresent() && Integer.valueOf(proquestEmbargo.get().getIdentifier()) > 0 &&
-                defaultEmbargo.isPresent() && Integer.valueOf(defaultEmbargo.get().getIdentifier()) > 0) {
+            if (proquestEmbargoCheck && defaultEmbargoCheck) {
                 embargo = Integer.valueOf(proquestEmbargo.get().getIdentifier()) >= Integer.valueOf(defaultEmbargo.get().getIdentifier())
                     ? proquestEmbargo
                     : defaultEmbargo;
-            } else if (proquestEmbargo.isPresent() && Integer.valueOf(proquestEmbargo.get().getIdentifier()) > 0) {
+            } else if (proquestEmbargoCheck) {
                 embargo = proquestEmbargo;
-            } else if (defaultEmbargo.isPresent() && Integer.valueOf(defaultEmbargo.get().getIdentifier()) > 0) {
+            } else if (defaultEmbargoCheck) {
                 embargo = defaultEmbargo;
             }
 

src/main/resources/settings/SYSTEM_Defaults.json

@@ -140,10 +140,7 @@
       "custom_css": "/* Insert Custom CSS here! */"
     },
     {
-      "front_page_instructions_before": "<h1>Welcome to the Thesis<br/>&amp; Dissertation Submission System</h1>&#10;<p>Once you have passed the final defense and satisfied the requirements of the committee, you are ready to submit your manuscript to the Thesis Office for review. This submission process is fully electronic, and is made through an online application developed and maintained by the Texas Digital Library, in conjunction with Texas A&amp;M, Texas Tech, and Baylor Universities.</p>&#10;<p>To get started with your submission, click the link below. You will be asked to authenticate using your NetID:</p>"
-    },
-    {
-      "front_page_instructions_after": "<h2>Your help can make things better</h2>&#10;<p>You feedback is very important to us; it allows us to continue to improve the system. Please feel free to notify us directly at dev@tdl.org if you have any suggestions to increase the usability or effectiveness of this application. You can talk to the your Thesis Office regarding any issues that may arise during the submission process.</p>"
+      "front_page_instructions_before": "<h1>Welcome to the Thesis<br/>&amp; Dissertation Submission System</h1>&#10;<p>Once you have passed the final defense and satisfied the requirements of the committee, you are ready to submit your manuscript to the Thesis Office for review. This submission process is fully electronic, and is made through an online application developed and maintained by the Texas Digital Library along with open source community partners.</p>&#10;<p>To get started with your submission, click the link below. You will be asked to authenticate using your NetID:</p>"
     },
     {
       "post_submission_instructions": "<p>The Thesis Office has received your electronic submittal. You will also receive an email confirmation. We will check your records as soon as possible to determine whether or not we have the signed Approval Form on file. Please be aware that your file is not complete and cannot be reviewed until we have both the electronic manuscript and the signed Approval Form.</p>&#10;<p>As soon as both items have been received, your manuscript will be placed in the queue and will be processed along with all other submissions for the semester in the order in which your completed file (manuscript and Approval Form) was received.</p>&#10;<p>The following are approximate turn-around times after the manuscript and the signed approval form have been submitted to the Thesis Office.&#160;Manuscripts are reviewed in the order received.</p>&#10;<p>&#160;</p>&#10;<p>Early in semester &#8211; 5 working days</p>&#10;<p>Week before Deadline Day &#8211; 10 working days</p>&#10;<p>Deadline Day &#8211; 15 working days</p>&#10;<p>&#160;</p>&#10;<p>If you have any questions about your submittal, feel free to contact our office.</p>&#10;<p>&#160;</p>&#10;<p>Thank you, Thesis Office</p>"

src/main/webapp/app/controllers/submission/submissionListController.js

@@ -440,9 +440,11 @@ vireo.controller("SubmissionListController", function (NgTableParams, $controlle
         var batchDownloadExport = function (packager, filterId) {
             $scope.advancedfeaturesBox.exporting = true;
             SubmissionRepo.batchExport(packager, filterId).then(function (data) {
-                saveAs(new Blob([data], {
-                    type: packager.mimeType
-                }), packager.name + '.' + packager.fileExtension);
+                if (!data.meta || !data.meta.status || data.meta.status !== "ERROR") {
+                    saveAs(new Blob([data], {
+                        type: packager.mimeType
+                    }), packager.name + '.' + packager.fileExtension);
+                }
                 resetBatchProcess();
             });
         };

src/main/webapp/app/views/sideboxes/submissionStatus.html

@@ -20,7 +20,7 @@
 			is-open="date"
 			close-text="Close"
 			stringtodate>
-			<span ng-if="!box.savingDate" class="glyphicon glyphicon-pencil"></span> <span ng-if="box.savingDate" class="glyphicon glyphicon-refresh spinning"></span> {{box.submission.submissionDate || "not submitted" | date: 'M/d/yyyy'}}
+			<span ng-if="!box.savingDate" class="glyphicon glyphicon-pencil"></span> <span ng-if="box.savingDate" class="glyphicon glyphicon-refresh spinning"></span> {{box.submission.submissionDate || "not submitted" | date: 'M/d/yyyy' : 'UTC'}}
 		</li>
 
 		<li><button ng-click="openModal('#advisorEmail')" class="btn btn-default">Generate Advisor Email</button></li>

src/test/java/org/tdl/vireo/ApplicationInitializationTest.java

@@ -80,7 +80,7 @@ private void assertInMemorySystemData(boolean isReload) throws ClassNotFoundExce
         assertSettingsType(2, "orcid", isReload);
         assertSettingsType(9, "proquest_umi_degree_code", isReload);
         assertSettingsType(1, "export", isReload);
-        assertSettingsType(23, "lookAndFeel", isReload);
+        assertSettingsType(22, "lookAndFeel", isReload);
         assertSettingsType(1, "submission", isReload);
         assertSettingsType(22, "shibboleth", isReload);