More cleanup

6 files changed, 37 insertions, 136 deletions

diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandlerV2Test.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandlerV2Test.java
index 4d3297ddb0c..46c1aa107f0 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandlerV2Test.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandlerV2Test.java
@@ -4,7 +4,10 @@ package com.yahoo.vespa.hosted.controller.restapi.billing;
 import com.yahoo.application.container.handler.Request;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.test.ManualClock;
+import com.yahoo.vespa.hosted.controller.api.integration.billing.Bill;
+import com.yahoo.vespa.hosted.controller.api.integration.billing.BillStatus;
 import com.yahoo.vespa.hosted.controller.api.integration.billing.MockBillingController;
+import com.yahoo.vespa.hosted.controller.api.integration.billing.StatusHistory;
 import com.yahoo.vespa.hosted.controller.api.role.Role;
 import com.yahoo.vespa.hosted.controller.restapi.ContainerTester;
 import com.yahoo.vespa.hosted.controller.restapi.ControllerContainerCloudTest;
@@ -13,8 +16,15 @@ import com.yahoo.vespa.hosted.controller.security.CloudTenantSpec;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import java.math.BigDecimal;
 import java.time.Instant;
+import java.time.LocalDate;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.util.List;
+import java.util.Map;
 import java.util.Set;
+import java.util.TreeMap;
 
 /**
  * @author ogronnesby
@@ -29,11 +39,6 @@ public class BillingApiHandlerV2Test extends ControllerContainerCloudTest {
     private static final Set<Role> tenantAdmin = Set.of(Role.administrator(tenant));
     private static final Set<Role> financeAdmin = Set.of(Role.hostedAccountant());
 
-    private static final String ACCESS_DENIED = "{\n" +
-            "  \"code\" : 403,\n" +
-            "  \"message\" : \"Access denied\"\n" +
-            "}";
-
     private MockBillingController billingController;
     private ContainerTester tester;
 
@@ -44,7 +49,7 @@ public class BillingApiHandlerV2Test extends ControllerContainerCloudTest {
         var clock = (ManualClock) tester.controller().serviceRegistry().clock();
         clock.setInstant(Instant.parse("2021-04-13T00:00:00Z"));
         billingController = (MockBillingController) tester.serviceRegistry().billingController();
-        billingController.addBill(tenant, BillingApiHandlerTest.createBill(), true);
+        billingController.addBill(tenant, createBill(), true);
     }
 
     @Override
@@ -122,7 +127,7 @@ public class BillingApiHandlerV2Test extends ControllerContainerCloudTest {
     @Test
     void require_accountant_preview() {
         var accountantRequest = request("/billing/v2/accountant/preview").roles(Role.hostedAccountant());
-        billingController.uncommittedBills.put(tenant, BillingApiHandlerTest.createBill());
+        billingController.uncommittedBills.put(tenant, createBill());
 
         tester.assertResponse(accountantRequest, """
                         {"tenants":[{"tenant":"tenant1","plan":{"id":"trial","name":"Free Trial - for testing purposes"},"quota":{"budget":-1.0},"collection":"AUTO","lastBill":"2020-05-23","unbilled":"123.00"}]}""");
@@ -245,4 +250,29 @@ public class BillingApiHandlerV2Test extends ControllerContainerCloudTest {
         tester.assertResponse(accountantRequest, """
                 {"tenant":"tenant1","plan":{"id":"trial","name":"Free Trial - for testing purposes","billed":false,"supported":false},"billing":{},"collection":"AUTO"}""");
    }
+
+    private static Bill createBill() {
+        var start = LocalDate.of(2020, 5, 23).atStartOfDay(ZoneOffset.UTC);
+        var end = start.toLocalDate().plusDays(6).atStartOfDay(ZoneOffset.UTC);
+        var statusHistory = new StatusHistory(new TreeMap<>(Map.of(start, BillStatus.OPEN)));
+        return new Bill(
+                Bill.Id.of("id-1"),
+                TenantName.defaultName(),
+                statusHistory,
+                List.of(createLineItem(start)),
+                start,
+                end
+        );
+    }
+
+    static Bill.LineItem createLineItem(ZonedDateTime addedAt) {
+        return new Bill.LineItem(
+                "some-id",
+                "description",
+                new BigDecimal("123.00"),
+                "paid",
+                "Smith",
+                addedAt
+        );
+    }
 }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/responses/billing-all-invoices b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/responses/billing-all-invoices
deleted file mode 100644
index 957ed858951..00000000000
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/responses/billing-all-invoices
+++ /dev/null
@@ -1,2 +0,0 @@
-ID,Tenant,From,To,CpuHours,MemoryHours,DiskHours,Cpu,Memory,Disk,Additional
-id-1,default,2020-05-23,2020-05-28,0.00,0.00,0.00,0.00,0.00,0.00,123.00
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/responses/billing-all-tenants.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/responses/billing-all-tenants.json
deleted file mode 100644
index 85c34edf7db..00000000000
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/responses/billing-all-tenants.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "until": "2020-05-28",
-  "tenants": [
-    {
-      "tenant": "tenant1",
-      "plan": "some-plan",
-      "planName": "Plan with id: some-plan",
-      "collection": "AUTO",
-      "current": {
-        "amount": "123.00",
-        "status": "accrued",
-        "from": "2020-05-23",
-        "items": [
-          {
-            "id": "some-id",
-            "description": "description",
-            "amount": "123.00",
-            "plan": "paid",
-            "planName": "Plan with id: paid",
-            "majorVersion": 0
-          }
-        ]
-      },
-      "additional": {
-        "items": [
-          {
-            "id": "line-item-id",
-            "description": "support",
-            "amount": "42.00",
-            "plan": "paid",
-            "planName": "Plan with id: paid",
-            "majorVersion": 0
-          }
-        ]
-      }
-    },
-    {
-      "tenant": "tenant2",
-      "plan": "some-plan",
-      "planName": "Plan with id: some-plan",
-      "collection": "AUTO",
-      "current": {
-        "amount": "123.00",
-        "status": "accrued",
-        "from": "2020-05-23",
-        "items": [
-          {
-            "id": "some-id",
-            "description": "description",
-            "amount": "123.00",
-            "plan": "paid",
-            "planName": "Plan with id: paid",
-            "majorVersion": 0
-          }
-        ]
-      },
-      "additional": {
-        "items": [ ]
-      }
-    }
-  ]
-}
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/responses/invoice-creation-response.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/responses/invoice-creation-response.json
deleted file mode 100644
index 49fde010c58..00000000000
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/responses/invoice-creation-response.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "message": "Created invoice with ID id-123",
-  "id": "id-123"
-}
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/responses/line-item-list.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/responses/line-item-list.json
deleted file mode 100644
index 8b69ea78754..00000000000
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/responses/line-item-list.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "lineItems": [
-    {
-      "id": "line-item-id",
-      "description": "some description",
-      "amount": "123.45",
-      "plan": "paid",
-      "planName": "Plan with id: paid",
-      "majorVersion": 0
-    }
-  ]
-}
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/responses/tenant-billing-view.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/responses/tenant-billing-view.json
deleted file mode 100644
index 4e255205e19..00000000000
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/responses/tenant-billing-view.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "until": "2020-05-28",
-  "plan": "some-plan",
-  "planName": "Plan with id: some-plan",
-  "current": {
-    "amount": "123.00",
-    "status": "accrued",
-    "from": "2020-05-23",
-    "items": [
-      {
-        "id": "some-id",
-        "description": "description",
-        "amount": "123.00",
-        "plan": "paid",
-        "planName": "Plan with id: paid",
-        "majorVersion": 0
-      }
-    ]
-  },
-  "additional": {
-    "items": [ ]
-  },
-  "bills": [
-    {
-      "id": "id-1",
-      "from": "2020-05-23",
-      "to": "2020-05-28",
-      "amount": "123.00",
-      "status": "OPEN",
-      "statusHistory": [
-        {
-          "at": "2020-05-23",
-          "status": "OPEN"
-        }
-      ],
-      "items": [
-        {
-          "id": "some-id",
-          "description": "description",
-          "amount": "123.00",
-          "plan": "paid",
-          "planName": "Plan with id: paid",
-          "majorVersion": 0
-        }
-      ]
-    }
-  ],
-  "collection": "AUTO"
-}