From 58a0416ab4700cbb5eea0c324f38f54064919ddd Mon Sep 17 00:00:00 2001 From: jrmartino Date: Wed, 27 Aug 2025 16:24:50 -0400 Subject: [PATCH] When configured to rename PRIMARY file upon upload. Adjusted behavior will give things like LASTNAME-DISSERTATION-YEAR etc. --- .../tdl/vireo/controller/SubmissionController.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/tdl/vireo/controller/SubmissionController.java b/src/main/java/org/tdl/vireo/controller/SubmissionController.java index 103759de1d..ae9b3e4727 100644 --- a/src/main/java/org/tdl/vireo/controller/SubmissionController.java +++ b/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 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;