Method to access all invoices in database

2 files changed, 11 insertions, 2 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/BillingController.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/BillingController.java
index 90c4622d803..0fc20095b41 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/BillingController.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/BillingController.java
@@ -49,7 +49,9 @@ public interface BillingController {
 
     InstrumentList listInstruments(TenantName tenant, String userId);
 
-    List<Invoice> getInvoices(TenantName tenant);
+    List<Invoice> getInvoicesForTenant(TenantName tenant);
+
+    List<Invoice> getInvoices();
 
     void deleteBillingInfo(TenantName tenant, Set<User> users, boolean isPrivileged);
 
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/MockBillingController.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/MockBillingController.java
index b28ba28a201..21eada37ab1 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/MockBillingController.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/MockBillingController.java
@@ -8,11 +8,13 @@ import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.ZonedDateTime;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * @author olaa
@@ -135,11 +137,16 @@ public class MockBillingController implements BillingController {
     }
 
     @Override
-    public List<Invoice> getInvoices(TenantName tenant) {
+    public List<Invoice> getInvoicesForTenant(TenantName tenant) {
         return committedInvoices.getOrDefault(tenant, List.of());
     }
 
     @Override
+    public List<Invoice> getInvoices() {
+        return committedInvoices.values().stream().flatMap(Collection::stream).collect(Collectors.toList());
+    }
+
+    @Override
     public void deleteBillingInfo(TenantName tenant, Set<User> users, boolean isPrivileged) {}
 
     @Override