Make it possible to specify billId when adding line item

2 files changed, 7 insertions, 1 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandler.java
index 307880682d9..6e012ba619d 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandler.java
@@ -225,11 +225,16 @@ public class BillingApiHandler extends ThreadedHttpRequestHandler {
 
     private HttpResponse addLineItem(HttpRequest request, String tenant, String userId) {
         Inspector inspector = inspectorOrThrow(request);
+
+        Optional<Bill.Id> billId = SlimeUtils.optionalString(inspector.field("billId")).map(Bill.Id::of);
+
         billingController.addLineItem(
                 TenantName.from(tenant),
                 getInspectorFieldOrThrow(inspector, "description"),
                 new BigDecimal(getInspectorFieldOrThrow(inspector, "amount")),
+                billId,
                 userId);
+
         return new MessageResponse("Added line item for tenant " + tenant);
     }
 
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandlerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandlerTest.java
index 79007a4439a..f247b0ed3b6 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandlerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandlerTest.java
@@ -22,6 +22,7 @@ import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.TreeMap;
 
@@ -170,7 +171,7 @@ public class BillingApiHandlerTest extends ControllerContainerCloudTest {
         billingController.setPlan(tenant, PlanId.from("some-plan"), true, false);
         billingController.setPlan(tenant2, PlanId.from("some-plan"), true, false);
         billingController.addBill(tenant, bill, false);
-        billingController.addLineItem(tenant, "support", new BigDecimal("42"), "Smith");
+        billingController.addLineItem(tenant, "support", new BigDecimal("42"), Optional.empty(), "Smith");
         billingController.addBill(tenant2, bill, false);
 
         var request = request("/billing/v1/billing?until=2020-05-28").roles(financeAdmin);