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

Allow maintaining and updating invoices.

2 files changed, 32 insertions, 3 deletions

diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ServiceRegistryMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ServiceRegistryMock.java
index e8e3de697dc..67f77b9a872 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ServiceRegistryMock.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ServiceRegistryMock.java
@@ -89,7 +89,6 @@ public class ServiceRegistryMock extends AbstractComponent implements ServiceReg
     private final MockEnclaveAccessService mockAMIService = new MockEnclaveAccessService();
     private final MockResourceTagger mockResourceTagger = new MockResourceTagger();
     private final MockRoleService roleService = new MockRoleService();
-    private final MockBillingController billingController = new MockBillingController(clock);
     private final ArtifactRegistryMock containerRegistry = new ArtifactRegistryMock();
     private final NoopTenantSecretService tenantSecretService = new NoopTenantSecretService();
     private final NoopEndpointSecretManager secretManager = new NoopEndpointSecretManager();
@@ -100,6 +99,7 @@ public class ServiceRegistryMock extends AbstractComponent implements ServiceReg
     private final PlanRegistry planRegistry = new PlanRegistryMock();
     private final ResourceDatabaseClient resourceDb = new ResourceDatabaseClientMock(planRegistry);
     private final BillingDatabaseClient billingDb = new BillingDatabaseClientMock(clock, planRegistry);
+    private final MockBillingController billingController = new MockBillingController(clock, billingDb);
     private final RoleMaintainerMock roleMaintainer = new RoleMaintainerMock();
     private final MockPricingController pricingController = new MockPricingController();
 
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/BillingReportMaintainerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/BillingReportMaintainerTest.java
index 9e1aa64beae..0a57cf51f2e 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/BillingReportMaintainerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/BillingReportMaintainerTest.java
@@ -4,12 +4,15 @@ package com.yahoo.vespa.hosted.controller.maintenance;
 import com.yahoo.config.provision.SystemName;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.vespa.hosted.controller.ControllerTester;
+import com.yahoo.vespa.hosted.controller.api.integration.billing.InvoiceUpdate;
 import com.yahoo.vespa.hosted.controller.api.integration.billing.PlanRegistryMock;
 import com.yahoo.vespa.hosted.controller.tenant.BillingReference;
 import com.yahoo.vespa.hosted.controller.tenant.CloudTenant;
 import org.junit.jupiter.api.Test;
 
 import java.time.Duration;
+import java.time.LocalDate;
+import java.time.ZoneOffset;
 import java.util.Optional;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -39,8 +42,34 @@ public class BillingReportMaintainerTest {
         assertNotNull(b1.orElseThrow().reference());
     }
 
+    @Test
+    void only_bills_with_exported_id_are_maintained() {
+        var t1 = tester.createTenant("t1");
+        var billingController = tester.controller().serviceRegistry().billingController();
+        var billingDb = tester.controller().serviceRegistry().billingDatabase();
+
+        var start = LocalDate.of(2020, 5, 23).atStartOfDay(ZoneOffset.UTC);
+        var end = start.toLocalDate().plusDays(6).atStartOfDay(ZoneOffset.UTC);
+        var bill1 = billingDb.createBill(t1, start, end, "non-exported");
+        var bill2 = billingDb.createBill(t1, start, end, "exported");
+
+        billingController.setPlan(t1, PlanRegistryMock.paidPlan.id(), false, true);
+
+        billingController.exportBill(billingDb.readBill(bill2).get(), "FOO", cloudTenant(t1));
+        var updates = maintainer.maintainInvoices();
+        assertEquals(new InvoiceUpdate(0, 0, 1), updates);
+
+        var exportedBill = billingDb.readBill(bill2).get();
+        assertEquals("EXT-ID-123", exportedBill.getExportedId().get());
+        assertTrue(billingDb.readBill(bill1).get().getExportedId().isEmpty());
+    }
+
+    private CloudTenant cloudTenant(TenantName tenantName) {
+        return tester.controller().tenants().require(tenantName, CloudTenant.class);
+    }
+
     private Optional<BillingReference> billingReference(TenantName tenantName) {
-        var t = tester.controller().tenants().require(tenantName, CloudTenant.class);
-        return t.billingReference();
+        return cloudTenant(tenantName).billingReference();
     }
+
 }