Wire in invoice maintainance

.. and move control to BillingReportMaintainer

1 files changed, 26 insertions, 3 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/BillingReportMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/BillingReportMaintainer.java
index 3aeba07630b..9cb45158bcb 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/BillingReportMaintainer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/BillingReportMaintainer.java
@@ -6,7 +6,9 @@ import com.yahoo.config.provision.TenantName;
 import com.yahoo.vespa.hosted.controller.Controller;
 import com.yahoo.vespa.hosted.controller.LockedTenant;
 import com.yahoo.vespa.hosted.controller.api.integration.billing.BillingController;
+import com.yahoo.vespa.hosted.controller.api.integration.billing.BillingDatabaseClient;
 import com.yahoo.vespa.hosted.controller.api.integration.billing.BillingReporter;
+import com.yahoo.vespa.hosted.controller.api.integration.billing.InvoiceUpdate;
 import com.yahoo.vespa.hosted.controller.api.integration.billing.Plan;
 import com.yahoo.vespa.hosted.controller.api.integration.billing.PlanRegistry;
 import com.yahoo.vespa.hosted.controller.tenant.CloudTenant;
@@ -23,18 +25,25 @@ public class BillingReportMaintainer extends ControllerMaintainer {
 
     private final BillingReporter reporter;
     private final BillingController billing;
+    private final BillingDatabaseClient databaseClient;
+
     private final PlanRegistry plans;
 
     public BillingReportMaintainer(Controller controller, Duration interval) {
         super(controller, interval, null, Set.of(SystemName.PublicCd));
-        this.reporter = controller.serviceRegistry().billingReporter();
-        this.billing = controller.serviceRegistry().billingController();
-        this.plans = controller.serviceRegistry().planRegistry();
+        reporter = controller.serviceRegistry().billingReporter();
+        billing = controller.serviceRegistry().billingController();
+        databaseClient = controller.serviceRegistry().billingDatabase();
+        plans = controller.serviceRegistry().planRegistry();
     }
 
     @Override
     protected double maintain() {
         maintainTenants();
+
+        var updates = maintainInvoices();
+        log.fine("Updated invoices: " + updates);
+
         return 0.0;
     }
 
@@ -53,6 +62,19 @@ public class BillingReportMaintainer extends ControllerMaintainer {
         });
     }
 
+    private InvoiceUpdate maintainInvoices() {
+        var billsNeedingMaintenance = databaseClient.readBills().stream()
+                .filter(bill -> bill.getExportedId().isPresent())
+                .filter(exported -> ! exported.status().equals("ISSUED")) // TODO: This status does not yet exist.
+                .toList();
+
+        var updates = InvoiceUpdate.empty();
+        for (var bill : billsNeedingMaintenance) {
+            updates.add(reporter.maintainInvoice(bill));
+        }
+        return updates;
+    }
+
     private Map<TenantName, CloudTenant> cloudTenants() {
         return controller().tenants().asList()
                 .stream()
@@ -74,4 +96,5 @@ public class BillingReportMaintainer extends ControllerMaintainer {
                 .flatMap(p -> billing.tenantsWithPlan(tenants, p.id()).stream())
                 .toList();
     }
+
 }