diff options
author | Øyvind Grønnesby <oyving@yahooinc.com> | 2023-01-02 13:49:12 +0100 |
---|---|---|
committer | Øyvind Grønnesby <oyving@yahooinc.com> | 2023-01-02 14:16:21 +0100 |
commit | 6b2741297e51f0edd710d70b07af28d8d104096f (patch) | |
tree | 020830d8c867160f862007680070a5c745029f9c /controller-api | |
parent | f06cfb7712be14df320502decdb3251f5b39dbcc (diff) |
Move until parameter handling to controller
Diffstat (limited to 'controller-api')
2 files changed, 6 insertions, 0 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 40bc9b27449..8b0f58c79d2 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 @@ -62,6 +62,7 @@ public interface BillingController { * @return The ID of the new bill. */ Bill.Id createBillForPeriod(TenantName tenant, ZonedDateTime startTime, ZonedDateTime endTime, String agent); + Bill.Id createBillForPeriod(TenantName tenant, LocalDate startDate, LocalDate endDate, String agent); /** * Create an unpersisted bill of unbilled use for the given tenant from the end of last bill until the given date. 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 c9f9b7f50e4..6ea4c7442d8 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 @@ -77,6 +77,11 @@ public class MockBillingController implements BillingController { } @Override + public Bill.Id createBillForPeriod(TenantName tenant, LocalDate startDate, LocalDate endDate, String agent) { + return createBillForPeriod(tenant, startDate.atStartOfDay(ZoneOffset.UTC), endDate.plusDays(1).atStartOfDay(ZoneOffset.UTC), agent); + } + + @Override public Bill createUncommittedBill(TenantName tenant, LocalDate until) { return uncommittedBills.getOrDefault(tenant, emptyBill()); } |