When configured to rename PRIMARY file upon upload. Adjusted behavior will give things like LASTNAME-DISSERTATION-YEAR etc.

Author: jrmartino

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

@@ -1063,8 +1063,17 @@ public ApiResponse uploadFile(@WeaverUser User user, @PathVariable Long submissi
 
         if (documentTypesToRename.contains(documentType)) {
             String lastName = submission.getSubmitter().getLastName().toUpperCase();
+            String newType = "";
+            if (documentType.equals("PRIMARY")) {
+                List<FieldValue> submissionTypes = submission.getFieldValuesByPredicateValue("submission_type");
+                if (submissionTypes.size() == 1) {
+                    newType = submissionTypes.get(0).getValue().toUpperCase()
+                                             .replaceAll("\\s", "");
+                }
+            }
+            String fileType = newType.length( )> 0 ? newType : documentType;
             int year = Calendar.getInstance().get(Calendar.YEAR);
-            fileName = lastName + "-" + documentType + "-" + String.valueOf(year) + "." + fileExtension;
+            fileName = lastName + "-" + fileType + "-" + String.valueOf(year) + "." + fileExtension;
         }
 
         String uri = documentFolder + File.separator + hash + File.separator + System.currentTimeMillis() + "-" + fileName;