From bc258b8cc592d8f20d05b6e4be22d37b04ea1358 Mon Sep 17 00:00:00 2001
From: aherbst-broad <aherbst@broadinstitute.org>
Date: Fri, 19 Apr 2024 14:55:53 -0400
Subject: [PATCH] Undo

---
 .../azure/AmalgamatedLandingZoneService.java           |  8 ++++++++
 .../landingzone/azure/HttpLandingZoneService.java      |  5 +++++
 .../landingzone/azure/LandingZoneApiDispatch.java      | 10 +++++-----
 .../landingzone/azure/WorkspaceLandingZoneService.java |  2 ++
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/service/src/main/java/bio/terra/workspace/amalgam/landingzone/azure/AmalgamatedLandingZoneService.java b/service/src/main/java/bio/terra/workspace/amalgam/landingzone/azure/AmalgamatedLandingZoneService.java
index c74992aa11..59f04b08da 100644
--- a/service/src/main/java/bio/terra/workspace/amalgam/landingzone/azure/AmalgamatedLandingZoneService.java
+++ b/service/src/main/java/bio/terra/workspace/amalgam/landingzone/azure/AmalgamatedLandingZoneService.java
@@ -108,6 +108,14 @@ public ApiAzureLandingZoneList listLandingZonesByBillingProfile(
     return result;
   }
 
+  @Override
+  public ApiAzureLandingZoneList listLandingZones(BearerToken bearerToken) {
+    List<LandingZone> landingZones = landingZoneService.listLandingZones(bearerToken);
+    return new ApiAzureLandingZoneList()
+        .landingzones(
+            landingZones.stream().map(typeAdapter::toApiAzureLandingZoneFromApiClient).toList());
+  }
+
   @Override
   public String getLandingZoneRegion(BearerToken bearerToken, UUID landingZoneId) {
     return landingZoneService.getLandingZoneRegion(bearerToken, landingZoneId);
diff --git a/service/src/main/java/bio/terra/workspace/amalgam/landingzone/azure/HttpLandingZoneService.java b/service/src/main/java/bio/terra/workspace/amalgam/landingzone/azure/HttpLandingZoneService.java
index 9f04be3278..5881a089ba 100644
--- a/service/src/main/java/bio/terra/workspace/amalgam/landingzone/azure/HttpLandingZoneService.java
+++ b/service/src/main/java/bio/terra/workspace/amalgam/landingzone/azure/HttpLandingZoneService.java
@@ -149,6 +149,11 @@ public ApiAzureLandingZoneList listLandingZonesByBillingProfile(
     return result;
   }
 
+  @Override
+  public ApiAzureLandingZoneList listLandingZones(BearerToken bearerToken) {
+    throw new RuntimeException("todo");
+  }
+
   @Override
   public String getLandingZoneRegion(BearerToken bearerToken, UUID landingZoneId)
       throws InterruptedException {
diff --git a/service/src/main/java/bio/terra/workspace/amalgam/landingzone/azure/LandingZoneApiDispatch.java b/service/src/main/java/bio/terra/workspace/amalgam/landingzone/azure/LandingZoneApiDispatch.java
index cf719990a2..da254e3a7b 100644
--- a/service/src/main/java/bio/terra/workspace/amalgam/landingzone/azure/LandingZoneApiDispatch.java
+++ b/service/src/main/java/bio/terra/workspace/amalgam/landingzone/azure/LandingZoneApiDispatch.java
@@ -1,6 +1,5 @@
 package bio.terra.workspace.amalgam.landingzone.azure;
 
-import bio.terra.common.exception.BadRequestException;
 import bio.terra.common.iam.BearerToken;
 import bio.terra.landingzone.library.landingzones.deployment.LandingZonePurpose;
 import bio.terra.landingzone.library.landingzones.deployment.ResourcePurpose;
@@ -220,12 +219,13 @@ public ApiAzureLandingZone getAzureLandingZone(BearerToken bearerToken, UUID lan
   public ApiAzureLandingZoneList listAzureLandingZones(
       BearerToken bearerToken, UUID billingProfileId) {
     features.azureEnabledCheck();
-    if (billingProfileId == null) {
-      throw new BadRequestException("billingProfileId is required");
+    if (billingProfileId != null) {
+      return Rethrow.onInterrupted(
+          () -> amalgamated.listLandingZonesByBillingProfile(bearerToken, billingProfileId),
+          "listLandingZonesByBillingProfile");
     }
     return Rethrow.onInterrupted(
-        () -> amalgamated.listLandingZonesByBillingProfile(bearerToken, billingProfileId),
-        "listLandingZonesByBillingProfile");
+        () -> amalgamated.listLandingZones(bearerToken), "listLandingZones");
   }
 
   public ApiResourceQuota getResourceQuota(
diff --git a/service/src/main/java/bio/terra/workspace/amalgam/landingzone/azure/WorkspaceLandingZoneService.java b/service/src/main/java/bio/terra/workspace/amalgam/landingzone/azure/WorkspaceLandingZoneService.java
index 37df241f8e..89c05ccaf1 100644
--- a/service/src/main/java/bio/terra/workspace/amalgam/landingzone/azure/WorkspaceLandingZoneService.java
+++ b/service/src/main/java/bio/terra/workspace/amalgam/landingzone/azure/WorkspaceLandingZoneService.java
@@ -50,6 +50,8 @@ ApiAzureLandingZone getAzureLandingZone(BearerToken bearerToken, UUID landingZon
   ApiAzureLandingZoneList listLandingZonesByBillingProfile(
       BearerToken bearerToken, UUID billingProfileId) throws InterruptedException;
 
+  ApiAzureLandingZoneList listLandingZones(BearerToken bearerToken);
+
   String getLandingZoneRegion(BearerToken bearerToken, UUID landingZoneId)
       throws InterruptedException;