Merge pull request #28909 from vespa-engine/maintain-invoices

Allow maintaining and updating invoices.

6 files changed, 78 insertions, 5 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 95b2ba9f8f8..f5543002a26 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
@@ -130,6 +130,7 @@ public interface BillingController {
 
     default void updateCache(List<TenantName> tenants) {}
 
+    /** Export a bill to a payment service. Returns the invoice ID in the external system. */
     default String exportBill(Bill bill, String exportMethod, CloudTenant tenant) {
         return "NOT_IMPLEMENTED";
     }
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/BillingDatabaseClientMock.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/BillingDatabaseClientMock.java
index 300c1658c29..ee7679f54ca 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/BillingDatabaseClientMock.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/BillingDatabaseClientMock.java
@@ -29,6 +29,7 @@ public class BillingDatabaseClientMock implements BillingDatabaseClient {
     private final Map<Bill.Id, Bill.StatusHistory> statuses = new HashMap<>();
     private final Map<Bill.Id, ZonedDateTime> startTimes = new HashMap<>();
     private final Map<Bill.Id, ZonedDateTime> endTimes = new HashMap<>();
+    private final Map<Bill.Id, String> exportedInvoiceIds = new HashMap<>();
 
     private final ZonedDateTime startTime = LocalDate.of(2020, 4, 1).atStartOfDay(ZoneId.of("UTC"));
     private final ZonedDateTime endTime = LocalDate.of(2020, 5, 1).atStartOfDay(ZoneId.of("UTC"));
@@ -74,7 +75,8 @@ public class BillingDatabaseClientMock implements BillingDatabaseClient {
         var status = statuses.getOrDefault(billId, Bill.StatusHistory.open(clock));
         var start = startTimes.getOrDefault(billId, startTime);
         var end = endTimes.getOrDefault(billId, endTime);
-        return invoice.map(tenant -> new Bill(billId, tenant, status, lines, start, end));
+        var exportedId = exportedInvoiceId(billId);
+        return invoice.map(tenant -> new Bill(billId, tenant, status, lines, start, end, exportedId));
     }
 
     @Override
@@ -157,7 +159,7 @@ public class BillingDatabaseClientMock implements BillingDatabaseClient {
                     var status = statuses.get(invoiceId);
                     var start = startTimes.get(invoiceId);
                     var end = endTimes.get(invoiceId);
-                    return new Bill(invoiceId, tenant, status, items, start, end);
+                    return new Bill(invoiceId, tenant, status, items, start, end, exportedInvoiceId(invoiceId));
                 })
                 .toList();
     }
@@ -171,7 +173,7 @@ public class BillingDatabaseClientMock implements BillingDatabaseClient {
                     var status = statuses.get(invoiceId);
                     var start = startTimes.get(invoiceId);
                     var end = endTimes.get(invoiceId);
-                    return new Bill(invoiceId, tenant, status, items, start, end);
+                    return new Bill(invoiceId, tenant, status, items, start, end, exportedInvoiceId(invoiceId));
                 })
                 .toList();
     }
@@ -180,9 +182,14 @@ public class BillingDatabaseClientMock implements BillingDatabaseClient {
     public void maintain() {}
 
     @Override
-    public void setExportedInvoiceId(Bill.Id billId, String invoiceId) { }
+    public void setExportedInvoiceId(Bill.Id billId, String invoiceId) {
+        exportedInvoiceIds.put(billId, invoiceId);
+    }
 
     @Override
     public void setExportedInvoiceItemId(String lineItemId, String invoiceItemId) { }
 
+    private String exportedInvoiceId(Bill.Id billId) {
+        return exportedInvoiceIds.getOrDefault(billId, null);
+    }
 }
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/BillingReporter.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/BillingReporter.java
index 7339555e578..0d6d840591c 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/BillingReporter.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/BillingReporter.java
@@ -6,4 +6,7 @@ import com.yahoo.vespa.hosted.controller.tenant.CloudTenant;
 
 public interface BillingReporter {
     BillingReference maintainTenant(CloudTenant tenant);
+
+    InvoiceUpdate maintainInvoice(Bill bill);
+
 }
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/BillingReporterMock.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/BillingReporterMock.java
index 29c7fbbf410..9531745556f 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/BillingReporterMock.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/BillingReporterMock.java
@@ -18,4 +18,10 @@ public class BillingReporterMock implements BillingReporter {
     public BillingReference maintainTenant(CloudTenant tenant) {
         return new BillingReference(UUID.randomUUID().toString(), clock.instant());
     }
+
+    @Override
+    public InvoiceUpdate maintainInvoice(Bill bill) {
+        return new InvoiceUpdate(0,0,1);
+    }
+
 }
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/InvoiceUpdate.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/InvoiceUpdate.java
new file mode 100644
index 00000000000..6ca3cf6ebb1
--- /dev/null
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/InvoiceUpdate.java
@@ -0,0 +1,45 @@
+package com.yahoo.vespa.hosted.controller.api.integration.billing;
+
+/**
+ * Helper to track changes to an invoice.
+ *
+ * @author gjoranv
+ */
+public record InvoiceUpdate(int itemsAdded, int itemsRemoved, int itemsModified) {
+    public boolean isEmpty() {
+        return itemsAdded == 0 && itemsRemoved == 0 && itemsModified == 0;
+    }
+
+    public static InvoiceUpdate empty() {
+        return new InvoiceUpdate(0, 0, 0);
+    }
+
+    public static class Counter {
+        private int itemsAdded = 0;
+        private int itemsRemoved = 0;
+        private int itemsModified = 0;
+
+        public void addedItem() {
+            itemsAdded++;
+        }
+
+        public void removedItem() {
+            itemsRemoved++;
+        }
+
+        public void modifiedItem() {
+            itemsModified++;
+        }
+
+        public void add(InvoiceUpdate other) {
+            itemsAdded += other.itemsAdded;
+            itemsRemoved += other.itemsRemoved;
+            itemsModified += other.itemsModified;
+        }
+
+        public InvoiceUpdate finish() {
+            return new InvoiceUpdate(itemsAdded, itemsRemoved, itemsModified);
+        }
+    }
+
+}
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 d5a817dd40e..52a41f8da56 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
@@ -2,6 +2,7 @@
 package com.yahoo.vespa.hosted.controller.api.integration.billing;
 
 import com.yahoo.config.provision.TenantName;
+import com.yahoo.vespa.hosted.controller.tenant.CloudTenant;
 
 import java.math.BigDecimal;
 import java.time.Clock;
@@ -22,6 +23,7 @@ import java.util.stream.Stream;
 public class MockBillingController implements BillingController {
 
     private final Clock clock;
+    private final BillingDatabaseClient dbClient;
 
     PlanId defaultPlan = PlanId.from("trial");
     List<TenantName> tenants = new ArrayList<>();
@@ -32,8 +34,9 @@ public class MockBillingController implements BillingController {
     Map<TenantName, List<Bill.LineItem>> unusedLineItems = new HashMap<>();
     Map<TenantName, CollectionMethod> collectionMethod = new HashMap<>();
 
-    public MockBillingController(Clock clock) {
+    public MockBillingController(Clock clock, BillingDatabaseClient dbClient) {
         this.clock = clock;
+        this.dbClient = dbClient;
     }
 
     @Override
@@ -203,6 +206,14 @@ public class MockBillingController implements BillingController {
         return count < limit;
     }
 
+    @Override
+    public String exportBill(Bill bill, String exportMethod, CloudTenant tenant) {
+        // Replace bill with a copy with exportedId set
+        var exportedId = "EXT-ID-123";
+        dbClient.setExportedInvoiceId(bill.id(), exportedId);
+        return exportedId;
+    }
+
     public void setTenants(List<TenantName> tenants) {
         this.tenants = tenants;
     }