Refactor: new dataFile.getDraftFileMetadata() method to avoid extra c…

…ommand call in GetLatestAccessibleFileMetadataCommand
IQSS · Feb 23, 2024 · 4703189 · 4703189
1 parent 7a430bf
commit 4703189
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataFile.java b/src/main/java/edu/harvard/iq/dataverse/DataFile.java
@@ -545,6 +545,14 @@ public void setDescription(String description) {
             fmd.setDescription(description);
         }
     }
+
+    public FileMetadata getDraftFileMetadata() {
+        FileMetadata latestFileMetadata = getLatestFileMetadata();
+        if (latestFileMetadata.getDatasetVersion().isDraft()) {
+            return latestFileMetadata;
+        }
+        return null;
+    }
 
     public FileMetadata getFileMetadata() {
         return getLatestFileMetadata();

diff --git a/.../edu/harvard/iq/dataverse/engine/command/impl/GetDraftFileMetadataIfAvailableCommand.java b/.../edu/harvard/iq/dataverse/engine/command/impl/GetDraftFileMetadataIfAvailableCommand.java
@@ -23,10 +23,6 @@ public GetDraftFileMetadataIfAvailableCommand(DataverseRequest request, DataFile
 
     @Override
     public FileMetadata execute(CommandContext ctxt) throws CommandException {
-        FileMetadata latestFileMetadata = dataFile.getLatestFileMetadata();
-        if (latestFileMetadata.getDatasetVersion().isDraft()) {
-            return latestFileMetadata;
-        }
-        return null;
+        return dataFile.getDraftFileMetadata();
     }
 }
diff --git a/.../edu/harvard/iq/dataverse/engine/command/impl/GetLatestAccessibleFileMetadataCommand.java b/.../edu/harvard/iq/dataverse/engine/command/impl/GetLatestAccessibleFileMetadataCommand.java
@@ -25,9 +25,7 @@ public FileMetadata execute(CommandContext ctxt) throws CommandException {
         FileMetadata fileMetadata = null;
 
         if (ctxt.permissions().requestOn(getRequest(), dataFile.getOwner()).has(Permission.ViewUnpublishedDataset)) {
-            fileMetadata = ctxt.engine().submit(
-                    new GetDraftFileMetadataIfAvailableCommand(getRequest(), dataFile)
-            );
+            fileMetadata = dataFile.getDraftFileMetadata();
         }
 
         if (fileMetadata == null) {