Merge pull request #125 from diging/develop

[GECO-148] Giles uses progress id for checking on uploaded files

Author: jdamerow

giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/api/v2/V2FilesController.java

@@ -208,8 +208,13 @@ public ResponseEntity<String> getFile(@PathVariable String fileId,
             return new ResponseEntity<String>(HttpStatus.NOT_FOUND);
         }
 
-        
-        if (!citesphereConnector.hasAccess(file.getDocumentId(), ((CitesphereUser)citesphereToken.getPrincipal()).getUsername())) {
+        /* 
+         * Citesphere does not have the document id until Giles is done processing. Also, if there
+         * is an issue and Citesphere never updates the status of the uploaded file, it doesn't have
+         * the document id either. So we send the progress id here.
+         */
+        IUpload upload = uploadService.getUpload(file.getUploadId());
+        if (!citesphereConnector.hasAccessViaProgressId(upload.getUploadProgressId(), ((CitesphereUser)citesphereToken.getPrincipal()).getUsername())) {
             return new ResponseEntity<String>(HttpStatus.FORBIDDEN);
         }
 

giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/core/service/upload/impl/UploadService.java

@@ -61,6 +61,12 @@ public UploadIds startUpload(DocumentAccess access, DocumentType type,
         return ids;
     }
 
+    /**
+     * Get a list of statuses for each file uploaded in an upload identified by its
+     * progress id.
+     * 
+     * @param id Progress id of upload to check.
+     */
     @Override
     public List<StorageStatus> getUploadStatus(String id) {
         List<StorageStatus> statuses = new ArrayList<>();