fix[Challenge Details]: fix download issue

Author: phead198708

src/main/java/com/cronos/onlinereview/actions/projectdetails/BaseProjectDetailsAction.java

@@ -125,31 +125,38 @@ protected CorrectnessCheckResult checkForCorrectUploadId(HttpServletRequest requ
         // Prepare bean that will be returned as the result
         CorrectnessCheckResult result = new CorrectnessCheckResult();
 
+        UploadManager upMgr = ActionsHelper.createUploadManager();
+        Upload upload = null;
         // Verify that Upload ID was specified and denotes correct upload
         String uidParam = request.getParameter("uid");
         if (uidParam == null || uidParam.trim().length() == 0) {
-            result.setResult(ActionsHelper.produceErrorReport(this, request, errorMessageKey,
-                    "Error.UploadIdNotSpecified", null));
-            // Return the result of the check
-            return result;
-        }
-
-        long uid;
-
-        try {
-            // Try to convert specified uid parameter to its integer representation
-            uid = Long.parseLong(uidParam, 10);
-        } catch (NumberFormatException nfe) {
-            result.setResult(
-                    ActionsHelper.produceErrorReport(this, request, errorMessageKey, "Error.UploadNotFound", null));
-            // Return the result of the check
-            return result;
+            String sidParam = request.getParameter("sid");
+            if (sidParam == null || sidParam.trim().length() == 0) {
+                result.setResult(ActionsHelper.produceErrorReport(this, request, errorMessageKey,
+                        "Error.UploadIdNotSpecified", null));
+                // Return the result of the check
+                return result;
+            } else {
+                try{
+                    Submission submission = upMgr.getSubmission(Long.parseLong(sidParam));
+                    upload = submission.getUpload();
+                } catch (NumberFormatException nfe) {
+                    result.setResult(
+                            ActionsHelper.produceErrorReport(this, request, errorMessageKey, "Error.UploadNotFound", null));
+                    // Return the result of the check
+                    return result;
+                }
+            }
+        } else {
+            try{
+                upload = upMgr.getUpload(Long.parseLong(uidParam, 10));
+            } catch (NumberFormatException nfe) {
+                result.setResult(
+                        ActionsHelper.produceErrorReport(this, request, errorMessageKey, "Error.UploadNotFound", null));
+                // Return the result of the check
+                return result;
+            }
         }
-
-        // Obtain an instance of Upload Manager
-        UploadManager upMgr = ActionsHelper.createUploadManager();
-        // Get Upload by its ID
-        Upload upload = upMgr.getUpload(uid);
         // Verify that upload with given ID exists
         if (upload == null) {
             result.setResult(

src/main/java/com/cronos/onlinereview/model/PhaseGroup.java

@@ -118,6 +118,8 @@ public class PhaseGroup {
      */
     private Submission[] submissions = null;
 
+    private boolean[] readyToDownload = null;
+
     /**
      * This member variable holds an array of uploads of Submission type which were deleted due to a
      * newer version has been uploaded by Submitter, or <code>null</code> value if no such array
@@ -335,6 +337,8 @@ public class PhaseGroup {
      */
     private Submission specificationSubmission;
 
+    private boolean specificationReadyToDownload;
+
     /**
      * <p>A <code>Resource</code> providing the details for specification submitter.</p>
      */
@@ -345,6 +349,8 @@ public class PhaseGroup {
      */
     private Submission[] checkpointSubmissions;
 
+    private boolean[] checkpointReadyToDownload;
+
     /**
      * <p>A <code>Resource</code> providing the details on checkpoint screener.</p>
      */
@@ -396,6 +402,8 @@ public class PhaseGroup {
      */
     private Submission iterativeReviewSubmission;
 
+    private boolean iterativeReadyToDownload;
+
     /**
      * <p>A <code>Resource</code> providing the details for iterative review submitter.</p>
      */
@@ -575,6 +583,11 @@ public Submission[] getSubmissions() {
      */
     public void setSubmissions(Submission[] submissions) {
         this.submissions = submissions;
+        this.readyToDownload = new boolean[submissions.length];
+        for (int i = 0; i < submissions.length; i++) {
+            Upload upload = submissions[i].getUpload();
+            this.readyToDownload[i] = upload == null || upload.getUrl() == null || !ActionsHelper.isDmzBucket(upload.getUrl());
+        }
     }
 
     /**
@@ -1139,6 +1152,8 @@ public Submission getSpecificationSubmission() {
      */
     public void setSpecificationSubmission(Submission specificationSubmission) {
         this.specificationSubmission = specificationSubmission;
+        Upload upload = specificationSubmission.getUpload();
+        this.specificationReadyToDownload = upload == null || upload.getUrl() == null || !ActionsHelper.isDmzBucket(upload.getUrl());
     }
 
     /**
@@ -1194,7 +1209,7 @@ public Resource getSpecificationSubmitter() {
     public void setSpecificationSubmitter(Resource specificationSubmitter) {
         this.specificationSubmitter = specificationSubmitter;
     }
-    
+
     /**
      * <p>Gets the list of checkpoint reviews..</p>
      *
@@ -1283,6 +1298,11 @@ public Submission[] getCheckpointSubmissions() {
      */
     public void setCheckpointSubmissions(Submission[] checkpointSubmissions) {
         this.checkpointSubmissions = checkpointSubmissions;
+        this.checkpointReadyToDownload = new boolean[checkpointSubmissions.length];
+        for (int i = 0; i < checkpointSubmissions.length; i++) {
+            Upload upload = checkpointSubmissions[i].getUpload();
+            this.checkpointReadyToDownload[i] = upload == null || upload.getUrl() == null || !ActionsHelper.isDmzBucket(upload.getUrl());
+        }
     }
 
     /**
@@ -1357,6 +1377,8 @@ public Submission getIterativeReviewSubmission() {
      */
     public void setIterativeReviewSubmission(Submission iterativeReviewSubmission) {
         this.iterativeReviewSubmission = iterativeReviewSubmission;
+        Upload upload = iterativeReviewSubmission.getUpload();
+        this.iterativeReadyToDownload = upload == null || upload.getUrl() == null || !ActionsHelper.isDmzBucket(upload.getUrl());
     }
 
     /**
@@ -1412,4 +1434,20 @@ public Resource getIterativeReviewSubmitter() {
     public void setIterativeReviewSubmitter(Resource iterativeReviewSubmitter) {
         this.iterativeReviewSubmitter = iterativeReviewSubmitter;
     }
-}
+
+    public boolean[] getReadyToDownload() {
+        return readyToDownload;
+    }
+
+    public boolean isSpecificationReadyToDownload() {
+        return specificationReadyToDownload;
+    }
+
+    public boolean[] getCheckpointReadyToDownload() {
+        return checkpointReadyToDownload;
+    }
+
+    public boolean isIterativeReadyToDownload() {
+        return iterativeReadyToDownload;
+    }
+}