remove EntityService's custom getWorkspaceId implementation

broadinstitute · Nov 26, 2024 · a565861 · a565861
1 parent d41c5c8
commit a565861
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 14 deletions.
diff --git a/src/main/scala/org/broadinstitute/dsde/firecloud/EntityService.scala b/src/main/scala/org/broadinstitute/dsde/firecloud/EntityService.scala
@@ -203,12 +203,12 @@ class EntityService(rawlsDAO: RawlsDAO,
   ): Future[PerRequestMessage] = {
     import spray.json._
     val dataBytes = rawlsCalls.toJson.prettyPrint.getBytes(StandardCharsets.UTF_8)
-    getWorkspaceId(workspaceNamespace, workspaceName, userInfo) map { workspaceId =>
+    rawlsDAO.getWorkspaceId(workspaceNamespace, workspaceName)(userInfo) map { workspaceId =>
       val bucketToWrite = GcsBucketName(FireCloudConfig.Cwds.bucket)
       val fileToWrite = GcsObjectName(s"to-cwds/${workspaceId}/${java.util.UUID.randomUUID()}.json")
       val gcsPath = writeDataToGcs(bucketToWrite, fileToWrite, dataBytes)
       val importRequest = getRawlsJsonImportRequest(gcsPath, isUpsert)
-      importToCWDS(workspaceNamespace, workspaceName, workspaceId, userInfo, importRequest)
+      importToCWDS(workspaceNamespace, workspaceName, workspaceId.toString, userInfo, importRequest)
     }
   }
 
@@ -220,9 +220,6 @@ class EntityService(rawlsDAO: RawlsDAO,
   private def getRawlsJsonImportRequest(gcsPath: String, isUpsert: Boolean): AsyncImportRequest =
     AsyncImportRequest(gcsPath, FILETYPE_RAWLS, Some(ImportOptions(None, Some(isUpsert))))
 
-  private def getWorkspaceId(workspaceNamespace: String, workspaceName: String, userInfo: UserInfo): Future[String] =
-    rawlsDAO.getWorkspace(workspaceNamespace, workspaceName)(userInfo).map(_.workspace.workspaceId)
-
   private def importToCWDS(workspaceNamespace: String,
                            workspaceName: String,
                            workspaceId: String,
@@ -339,8 +336,8 @@ class EntityService(rawlsDAO: RawlsDAO,
     if (importRequest.filetype.isEmpty)
       throw new FireCloudExceptionWithErrorReport(ErrorReport(BadRequest, "filetype must be specified"))
 
-    getWorkspaceId(workspaceNamespace, workspaceName, userInfo) map { workspaceId =>
-      importToCWDS(workspaceNamespace, workspaceName, workspaceId, userInfo, importRequest)
+    rawlsDAO.getWorkspaceId(workspaceNamespace, workspaceName)(userInfo) map { workspaceId =>
+      importToCWDS(workspaceNamespace, workspaceName, workspaceId.toString, userInfo, importRequest)
     } recover { case apiEx: ApiException =>
       throw wrapCwdsException(apiEx)
     }

diff --git a/src/test/scala/org/broadinstitute/dsde/firecloud/EntityServiceSpec.scala b/src/test/scala/org/broadinstitute/dsde/firecloud/EntityServiceSpec.scala
@@ -160,8 +160,8 @@ class EntityServiceSpec extends BaseServiceSpec with BeforeAndAfterEach {
 
         when(cwdsDAO.isEnabled).thenReturn(true)
         when(cwdsDAO.getSupportedFormats).thenReturn(List("pfb", "tdrexport", "rawlsjson"))
-        when(rawlsDAO.getWorkspace(any[String], any[String])(any[UserInfo]))
-          .thenReturn(Future.successful(workspaceResponse))
+        when(rawlsDAO.getWorkspaceId(any[String], any[String])(any[UserInfo]))
+          .thenReturn(Future.successful(UUID.fromString(workspaceResponse.workspace.workspaceId)))
 
         entityService
           .importEntitiesFromTSV("workspaceNamespace", "workspaceName", tsvData, dummyUserInfo("token"), true)
@@ -176,7 +176,7 @@ class EntityServiceSpec extends BaseServiceSpec with BeforeAndAfterEach {
         val capturedRequest = argumentCaptor.getValue
         capturedRequest.options should be(Some(ImportOptions(None, Some(tsvType != "update"))))
         verify(rawlsDAO, times(1))
-          .getWorkspace(any[String], any[String])(any[UserInfo])
+          .getWorkspaceId(any[String], any[String])(any[UserInfo])
 
       }
     }
@@ -289,8 +289,8 @@ class EntityServiceSpec extends BaseServiceSpec with BeforeAndAfterEach {
 
       when(cwdsDAO.importV1(any[String], any[AsyncImportRequest])(any[UserInfo])).thenReturn(genericJob)
 
-      when(rawlsDAO.getWorkspace(any[String], any[String])(any[UserInfo]))
-        .thenReturn(Future.successful(workspaceResponse))
+      when(rawlsDAO.getWorkspaceId(any[String], any[String])(any[UserInfo]))
+        .thenReturn(Future.successful(UUID.fromString(workspaceResponse.workspace.workspaceId)))
 
       // create input
       val input = AsyncImportRequest(url = "https://example.com", filetype = importFiletype)
@@ -302,7 +302,7 @@ class EntityServiceSpec extends BaseServiceSpec with BeforeAndAfterEach {
       verify(cwdsDAO, times(1))
         .importV1(any[String], any[AsyncImportRequest])(any[UserInfo])
       verify(rawlsDAO, times(1))
-        .getWorkspace(any[String], any[String])(any[UserInfo])
+        .getWorkspaceId(any[String], any[String])(any[UserInfo])
     }
 
   }

diff --git a/src/test/scala/org/broadinstitute/dsde/firecloud/dataaccess/MockRawlsDAO.scala b/src/test/scala/org/broadinstitute/dsde/firecloud/dataaccess/MockRawlsDAO.scala
@@ -200,7 +200,7 @@ class MockRawlsDAO extends RawlsDAO {
   private val rawlsWorkspaceWithAttributes = WorkspaceDetails(
     "attributes",
     "att",
-    "id",
+    "00000000-0000-0000-0000-000000000000",
     "", // bucketname
     Some("wf-collection"),
     DateTime.now(),