Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion src/main/java/org/tdl/vireo/controller/SubmissionController.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading