Merge pull request #5344 from Sage-Bionetworks/release-495

Sage-Bionetworks · Apr 2, 2024 · b39ccd9 · b39ccd9
2 parents c9f5fc6 + 96d5d4f
commit b39ccd9
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 3 deletions.
diff --git a/src/main/java/org/sagebionetworks/web/client/widget/upload/MultipartUploaderImplV2.java b/src/main/java/org/sagebionetworks/web/client/widget/upload/MultipartUploaderImplV2.java
@@ -7,9 +7,11 @@
 import org.sagebionetworks.web.client.DateTimeUtils;
 import org.sagebionetworks.web.client.GWTWrapper;
 import org.sagebionetworks.web.client.SynapseJSNIUtils;
+import org.sagebionetworks.web.client.SynapseProperties;
 import org.sagebionetworks.web.client.jsinterop.Promise;
 import org.sagebionetworks.web.client.jsinterop.SRC.SynapseClient.FileUploadComplete;
 import org.sagebionetworks.web.client.security.AuthenticationController;
+import org.sagebionetworks.web.shared.WebConstants;
 
 /**
  * Perform a multi-part parallel upload utilizing code from the Synapse React Client
@@ -36,21 +38,24 @@ public class MultipartUploaderImplV2 implements MultipartUploader {
   DateTimeUtils dateTimeUtils;
   AuthenticationController auth;
   SRCUploadFileWrapper srcUploadFileWrapper;
+  private SynapseProperties synapseProperties;
 
   @Inject
   public MultipartUploaderImplV2(
     AuthenticationController auth,
     GWTWrapper gwt,
     SynapseJSNIUtils synapseJsniUtils,
     DateTimeUtils dateTimeUtils,
-    SRCUploadFileWrapper srcUploadFileWrapper
+    SRCUploadFileWrapper srcUploadFileWrapper,
+    SynapseProperties synapseProperties
   ) {
     super();
     this.auth = auth;
     this.synapseJsniUtils = synapseJsniUtils;
     this.percentFormat = gwt.getNumberFormat("##");
     this.dateTimeUtils = dateTimeUtils;
     this.srcUploadFileWrapper = srcUploadFileWrapper;
+    this.synapseProperties = synapseProperties;
   }
 
   @Override
@@ -62,6 +67,15 @@ public void uploadFile(
     final Long storageLocationId,
     HasAttachHandlers view
   ) {
+    Long defaultStorageId = Long.parseLong(
+      synapseProperties.getSynapseProperty(
+        WebConstants.DEFAULT_STORAGE_ID_PROPERTY_KEY
+      )
+    );
+
+    int storageLocationIntValue = storageLocationId == null
+      ? defaultStorageId.intValue()
+      : storageLocationId.intValue();
     this.blob = blob;
     this.view = view;
     isCanceled = false;
@@ -76,7 +90,7 @@ public void uploadFile(
       auth.getCurrentUserAccessToken(),
       fileName,
       blob,
-      storageLocationId.intValue(),
+      storageLocationIntValue,
       contentType,
       progress -> {
         double currentProgress = progress.value / progress.total;

diff --git a/...st/java/org/sagebionetworks/web/unitclient/widget/upload/MultipartUploaderImplV2Test.java b/...st/java/org/sagebionetworks/web/unitclient/widget/upload/MultipartUploaderImplV2Test.java
@@ -4,6 +4,7 @@
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyInt;
 import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
@@ -22,6 +23,7 @@
 import org.sagebionetworks.web.client.GWTWrapper;
 import org.sagebionetworks.web.client.ProgressCallback;
 import org.sagebionetworks.web.client.SynapseJSNIUtils;
+import org.sagebionetworks.web.client.SynapseProperties;
 import org.sagebionetworks.web.client.jsinterop.Promise;
 import org.sagebionetworks.web.client.jsinterop.Promise.FunctionParam;
 import org.sagebionetworks.web.client.jsinterop.SRC.SynapseClient.FileUploadComplete;
@@ -66,6 +68,9 @@ public class MultipartUploaderImplV2Test {
   @Mock
   SRCUploadFileWrapper mockSRCUploadFileWrapper;
 
+  @Mock
+  SynapseProperties mockSynapseProperties;
+
   @Mock
   Promise<FileUploadComplete> mockPromise;
 
@@ -83,6 +88,7 @@ public class MultipartUploaderImplV2Test {
   public static final double FILE_SIZE = 9281;
   public static final String FILE_NAME = "file.txt";
   public static final String CONTENT_TYPE = "text/plain";
+  public static final long defaultStorageLocationId = 1L;
 
   @Before
   public void before() throws Exception {
@@ -104,12 +110,19 @@ public void before() throws Exception {
       FILE_SIZE
     );
 
+    when(
+      mockSynapseProperties.getSynapseProperty(
+        WebConstants.DEFAULT_STORAGE_ID_PROPERTY_KEY
+      )
+    ).thenReturn(String.valueOf(defaultStorageLocationId));
+
     uploader = new MultipartUploaderImplV2(
       mockAuth,
       gwt,
       synapseJsniUtils,
       mockDateTimeUtils,
-      mockSRCUploadFileWrapper
+      mockSRCUploadFileWrapper,
+      mockSynapseProperties
     );
 
     when(mockView.isAttached()).thenReturn(true);
@@ -152,6 +165,35 @@ public void testDirectUploadSinglePart() throws Exception {
     verify(mockHandler).uploadSuccess(RESULT_FILE_HANDLE_ID);
   }
 
+  @Test
+  public void testDirectUploadEmptyStorageLocationId() throws Exception {
+    uploader.uploadFile(
+      FILE_NAME,
+      CONTENT_TYPE,
+      mockFileBlob,
+      mockHandler,
+      null,
+      mockView
+    );
+
+    verify(mockPromise).then(promiseHandlerCaptor.capture());
+    FunctionParam thenHandler = promiseHandlerCaptor.getValue();
+
+    thenHandler.exec(mockFileUploadComplete);
+
+    verify(mockSRCUploadFileWrapper).uploadFile(
+      anyString(),
+      anyString(),
+      any(),
+      eq((int) defaultStorageLocationId),
+      anyString(),
+      any(),
+      any()
+    );
+    // the handler should get the id.
+    verify(mockHandler).uploadSuccess(RESULT_FILE_HANDLE_ID);
+  }
+
   @Test
   public void testUploadCanceled() throws Exception {
     uploader.uploadFile(