Fix performance when checking dataset version file count

Author: stevenwinship

src/main/java/edu/harvard/iq/dataverse/DatasetVersionServiceBean.java

@@ -1340,6 +1340,15 @@ public Long getDatasetVersionCount(Long datasetId, boolean canViewUnpublishedVer
         return em.createQuery(cq).getSingleResult();
     }
 
+    public boolean hasFiles(Long datasetVersionId) {
+        Query query = em.createNativeQuery("SELECT id FROM fileMetadata WHERE datasetversion_id="+datasetVersionId+" LIMIT 1");
+        try {
+            query.getSingleResult();
+            return true;
+        } catch (NoResultException e) {
+            return false;
+        }
+    }
 
     /**
      * Update the archival copy location for a specific version of a dataset.

src/main/java/edu/harvard/iq/dataverse/PermissionsWrapper.java

@@ -33,6 +33,9 @@ public class PermissionsWrapper implements java.io.Serializable {
     @EJB
     PermissionServiceBean permissionService;
 
+    @EJB
+    DatasetVersionServiceBean  datasetVersionService;
+
     @Inject
     DataverseSession session;
 
@@ -257,15 +260,17 @@ public boolean canIssueDeleteDatasetCommand(DvObject dvo){
     // PUBLISH DATASET
     public boolean canIssuePublishDatasetCommand(DvObject dvo){
         User u = session.getUser();
-        if (u != null && u.isSuperuser()) {
+        if (u == null) {
+            return false; // guests can not publish
+        }
+        if (u.isSuperuser()) {
             return true;
         }
         // Return false if dataset has 0 files and user want to 'publish' or 'submit for review' and 'publish dataset requires files' flag is set
         if (dvo.isInstanceofDataset()) {
             Dataverse dv =((Dataset)dvo).getOwner();
             if (dv != null) {
-                List<FileMetadata> metadataList = ((Dataset) dvo).getLatestVersion().getFileMetadatas();
-                if (metadataList.size() == 0 && dv.getEffectiveRequiresFilesToPublishDataset()) {
+                if (!datasetVersionService.hasFiles(((Dataset) dvo).getLatestVersion().getId()) && dv.getEffectiveRequiresFilesToPublishDataset()) {
                     return false;
                 }
             }
@@ -275,12 +280,15 @@ public boolean canIssuePublishDatasetCommand(DvObject dvo){
 
     // SUBMIT DATASET FOR REVIEW
     public boolean canIssueSubmitDatasetForReviewCommand(DvObject dvo){
+        User u = session.getUser();
+        if (u == null) {
+            return false; // guests can not submit for review
+        }
         // Return false if dataset has 0 files and user want to 'publish' or 'submit for review' and 'publish dataset requires files' flag is set
         if (dvo.isInstanceofDataset()) {
             Dataverse dv =((Dataset)dvo).getOwner();
             if (dv != null) {
-                List<FileMetadata> metadataList = ((Dataset) dvo).getLatestVersion().getFileMetadatas();
-                if (metadataList.size() == 0 && dv.getEffectiveRequiresFilesToPublishDataset()) {
+                if (!datasetVersionService.hasFiles(((Dataset) dvo).getLatestVersion().getId()) && dv.getEffectiveRequiresFilesToPublishDataset()) {
                     return false;
                 }
             }