Keep file & filename synced; (DOECODE-1204)

Author: Tim Sowers

src/main/java/gov/osti/services/Metadata.java

@@ -800,7 +800,7 @@ public Response autopopulate(@QueryParam("repo") String url,
      * owned by User
      * @throws InvocationTargetException on reflection errors
      */
-    private void store(EntityManager em, DOECodeMetadata md, User user) throws NotFoundException,
+    private void store(EntityManager em, DOECodeMetadata md, User user, boolean hasFile) throws NotFoundException,
             IllegalAccessException, InvocationTargetException {
         // fix the open source value before storing
         md.setOpenSource(
@@ -815,6 +815,9 @@ private void store(EntityManager em, DOECodeMetadata md, User user) throws NotFo
         if (projectKeywords != null && !projectKeywords.isEmpty() && !user.hasRole("RecordAdmin") && !user.hasRole("ApprovalAdmin"))
             throw new ValidationException("Project Keywords can only be set by authorized users.");
 
+        // has FileName?
+        boolean hasFilename = !StringUtils.isBlank(md.getFileName());
+
         // if there's a CODE ID, attempt to look up the record first and
         // copy attributes into it
         if ( null==md.getCodeId() || 0==md.getCodeId()) {
@@ -829,6 +832,11 @@ private void store(EntityManager em, DOECodeMetadata md, User user) throws NotFo
                 throw new BadRequestException (ErrorResponse.badRequest(reasons).build());
             }
 
+            if (hasFilename && !hasFile) {
+                // trying to set a filename without a file, ignore the filename
+                md.setFileName(null);
+            }
+
             // log changes
             ChangeLog cl = new ChangeLog();
             cl.setChangedBy(user.getEmail());
@@ -839,6 +847,11 @@ private void store(EntityManager em, DOECodeMetadata md, User user) throws NotFo
         } else {
             DOECodeMetadata emd = em.find(DOECodeMetadata.class, md.getCodeId());
 
+            if (hasFilename && !hasFile) {
+                // trying to set a filename without a file, keep whatever is in database already
+                md.setFileName(emd.getFileName());
+            }
+
             if ( null!=emd ) {
                 // to Approve, user must be an ApprovalAdmin and record must be previously Submitted/Announced
                 if (DOECodeMetadata.Status.Approved.equals(md.getWorkflowStatus())) {
@@ -1682,13 +1695,16 @@ private Response doSave(String json, InputStream file, FormDataContentDispositio
 
             md.setLastEditor(md.getOwner());
 
-            store(em, md, user);
+            // was file uploaded?
+            boolean hasFile = null!=file && null!=fileInfo;
+
+            store(em, md, user, hasFile);
 
             // re-attach metadata to transaction in order to store any changes beyond this point
             md = em.find(DOECodeMetadata.class, md.getCodeId());
 
             // if there's a FILE associated here, store it
-            if ( null!=file && null!=fileInfo ) {
+            if ( hasFile ) {
                 try {
                     String fileName = writeFile(file, md.getCodeId(), fileInfo.getFileName(), FILE_UPLOADS);
                     md.setFileName(fileName);
@@ -1821,15 +1837,18 @@ private Response doSubmit(String json, InputStream file, FormDataContentDisposit
 
             md.setLastEditor(md.getOwner());
 
+            // was file uploaded?
+            boolean hasFile = null!=file && null!=fileInfo;
+
             // store it
-            store(em, md, user);
+            store(em, md, user, hasFile);
 
             // re-attach metadata to transaction in order to store any changes beyond this point
             md = em.find(DOECodeMetadata.class, md.getCodeId());
 
             // if there's a FILE associated here, store it
             String fullFileName = "";
-            if ( null!=file && null!=fileInfo ) {
+            if ( hasFile ) {
                 try {
                     fullFileName = writeFile(file, md.getCodeId(), fileInfo.getFileName(), FILE_UPLOADS);
                     md.setFileName(fullFileName);
@@ -2015,15 +2034,18 @@ private Response doAnnounce(String json, InputStream file, FormDataContentDispos
                 md.setDoi(reservation.getReservedDoi());
             }
 
+            // was file uploaded?
+            boolean hasFile = null!=file && null!=fileInfo;
+
             // persist this to the database
-            store(em, md, user);
+            store(em, md, user, hasFile);
 
             // re-attach metadata to transaction in order to store any changes beyond this point
             md = em.find(DOECodeMetadata.class, md.getCodeId());
 
             // if there's a FILE associated here, store it
             String fullFileName = "";
-            if ( null!=file && null!=fileInfo ) {
+            if ( hasFile ) {
                 try {
                     fullFileName = writeFile(file, md.getCodeId(), fileInfo.getFileName(), FILE_UPLOADS);
                     md.setFileName(fullFileName);
@@ -2392,7 +2414,7 @@ public Response approve(@PathParam("codeId") Long codeId) {
             md.setWorkflowStatus(Status.Approved);
 
             // persist this to the database, as validations should already be complete at this stage.
-            store(em, md, user);
+            store(em, md, user, false);
 
             // send any updates to DataCite as well (if RELEASE DATE is set)
             if (StringUtils.isNotEmpty(md.getDoi()) && null!=md.getReleaseDate()) {