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-server | |
parent | f06cfb7712be14df320502decdb3251f5b39dbcc (diff) |
Move until parameter handling to controller
Diffstat (limited to 'controller-server')
3 files changed, 5 insertions, 12 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 d1962b16120..307880682d9 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 @@ -246,10 +246,8 @@ public class BillingApiHandler extends ThreadedHttpRequestHandler { LocalDate startDate = LocalDate.parse(getInspectorFieldOrThrow(inspector, "startTime")); LocalDate endDate = LocalDate.parse(getInspectorFieldOrThrow(inspector, "endTime")); - ZonedDateTime startTime = startDate.atStartOfDay(ZoneId.of("UTC")); - ZonedDateTime endTime = endDate.plusDays(1).atStartOfDay(ZoneId.of("UTC")); - var billId = billingController.createBillForPeriod(tenantName, startTime, endTime, userId); + var billId = billingController.createBillForPeriod(tenantName, startDate, endDate, userId); Slime slime = new Slime(); Cursor root = slime.setObject(); @@ -476,7 +474,7 @@ public class BillingApiHandler extends ThreadedHttpRequestHandler { private LocalDate untilParameter(String until) { if (until == null || until.isEmpty() || until.isBlank()) - return LocalDate.now().plusDays(1); + return LocalDate.now(); return LocalDate.parse(until); } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandlerV2.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandlerV2.java index 8722e588fa7..0ddaa409ef8 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandlerV2.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandlerV2.java @@ -345,12 +345,7 @@ public class BillingApiHandlerV2 extends RestApiRequestHandler<BillingApiHandler private LocalDate untilParameter(RestApi.RequestContext ctx) { return ctx.queryParameters().getString("until") .map(LocalDate::parse) - .map(date -> date.plusDays(1)) - .orElseGet(this::tomorrow); - } - - private LocalDate tomorrow() { - return LocalDate.now(clock).plusDays(1); + .orElseGet(() -> LocalDate.now(clock)); } private static String getInspectorFieldOrThrow(Inspector inspector, String field) { 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 73d4daf92da..79007a4439a 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 @@ -114,8 +114,8 @@ public class BillingApiHandlerTest extends ControllerContainerCloudTest { bills = billingController.getBillsForTenant(tenant); assertEquals(1, bills.size()); Bill bill = bills.get(0); - assertEquals("2020-04-20T00:00Z[UTC]", bill.getStartTime().toString()); - assertEquals("2020-05-21T00:00Z[UTC]", bill.getEndTime().toString()); + assertEquals("2020-04-20T00:00Z", bill.getStartTime().toString()); + assertEquals("2020-05-21T00:00Z", bill.getEndTime().toString()); assertEquals("2020-04-20", bill.getStartDate().toString()); assertEquals("2020-05-20", bill.getEndDate().toString()); |