Merge pull request #29076 from vespa-engine/olaa/more-billing-fields

Add tax code/purchase order/invoice email

8 files changed, 295 insertions, 30 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/tenant/Email.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/tenant/Email.java
index c1c8a780df1..702a183e7af 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/tenant/Email.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/tenant/Email.java
@@ -36,6 +36,10 @@ public class Email {
         return new Email(emailAddress, isVerified);
     }
 
+    public boolean isBlank() {
+        return emailAddress.isBlank();
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/tenant/PurchaseOrder.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/tenant/PurchaseOrder.java
new file mode 100644
index 00000000000..d222864a388
--- /dev/null
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/tenant/PurchaseOrder.java
@@ -0,0 +1,21 @@
+// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.vespa.hosted.controller.tenant;
+
+import ai.vespa.validation.StringWrapper;
+
+import static ai.vespa.validation.Validation.requireLength;
+
+/**
+ * @author olaa
+ */
+public class PurchaseOrder extends StringWrapper<PurchaseOrder> {
+
+    public PurchaseOrder(String value) {
+        super(value);
+        requireLength(value, "purchase order length", 0, 64);
+    }
+
+    public static PurchaseOrder empty() {
+        return new PurchaseOrder("");
+    }
+}
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/tenant/TaxId.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/tenant/TaxId.java
new file mode 100644
index 00000000000..bd7a9402033
--- /dev/null
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/tenant/TaxId.java
@@ -0,0 +1,21 @@
+// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.vespa.hosted.controller.tenant;
+
+import ai.vespa.validation.StringWrapper;
+
+import static ai.vespa.validation.Validation.requireLength;
+
+/**
+ * @author olaa
+ */
+public class TaxId extends StringWrapper<TaxId> {
+
+    public TaxId(String value) {
+        super(value);
+        requireLength(value, "tax code length", 0, 64);
+    }
+
+    public static TaxId empty() {
+        return new TaxId("");
+    }
+}
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/tenant/TenantBilling.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/tenant/TenantBilling.java
index 5377b820e18..6e3b26661e5 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/tenant/TenantBilling.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/tenant/TenantBilling.java
@@ -10,14 +10,20 @@ public class TenantBilling {
 
     private final TenantContact contact;
     private final TenantAddress address;
+    private final TaxId taxId;
+    private final PurchaseOrder purchaseOrder;
+    private final Email invoiceEmail;
 
-    public TenantBilling(TenantContact contact, TenantAddress address) {
+    public TenantBilling(TenantContact contact, TenantAddress address, TaxId taxId, PurchaseOrder purchaseOrder, Email invoiceEmail) {
         this.contact = Objects.requireNonNull(contact);
         this.address = Objects.requireNonNull(address);
+        this.taxId = Objects.requireNonNull(taxId);
+        this.purchaseOrder = Objects.requireNonNull(purchaseOrder);
+        this.invoiceEmail = Objects.requireNonNull(invoiceEmail);
     }
 
     public static TenantBilling empty() {
-        return new TenantBilling(TenantContact.empty(), TenantAddress.empty());
+        return new TenantBilling(TenantContact.empty(), TenantAddress.empty(), TaxId.empty(), PurchaseOrder.empty(), Email.empty());
     }
 
     public TenantContact contact() {
@@ -28,12 +34,36 @@ public class TenantBilling {
         return address;
     }
 
+    public TaxId getTaxId() {
+        return taxId;
+    }
+
+    public PurchaseOrder getPurchaseOrder() {
+        return purchaseOrder;
+    }
+
+    public Email getInvoiceEmail() {
+        return invoiceEmail;
+    }
+
     public TenantBilling withContact(TenantContact updatedContact) {
-        return new TenantBilling(updatedContact, this.address);
+        return new TenantBilling(updatedContact, this.address, this.taxId, this.purchaseOrder, this.invoiceEmail);
     }
 
     public TenantBilling withAddress(TenantAddress updatedAddress) {
-        return new TenantBilling(this.contact, updatedAddress);
+        return new TenantBilling(this.contact, updatedAddress, this.taxId, this.purchaseOrder, this.invoiceEmail);
+    }
+
+    public TenantBilling withTaxId(TaxId updatedTaxId) {
+        return new TenantBilling(this.contact, this.address, updatedTaxId, this.purchaseOrder, this.invoiceEmail);
+    }
+
+    public TenantBilling withPurchaseOrder(PurchaseOrder updatedPurchaseOrder) {
+        return new TenantBilling(this.contact, this.address, this.taxId, updatedPurchaseOrder, this.invoiceEmail);
+    }
+
+    public TenantBilling withInvoiceEmail(Email updatedInvoiceEmail) {
+        return new TenantBilling(this.contact, this.address, this.taxId, this.purchaseOrder, updatedInvoiceEmail);
     }
 
     public boolean isEmpty() {
@@ -45,19 +75,26 @@ public class TenantBilling {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         TenantBilling that = (TenantBilling) o;
-        return Objects.equals(contact, that.contact) && Objects.equals(address, that.address);
+        return Objects.equals(contact, that.contact) &&
+                Objects.equals(address, that.address) &&
+                Objects.equals(taxId, that.taxId) &&
+                Objects.equals(purchaseOrder, that.purchaseOrder) &&
+                Objects.equals(invoiceEmail, that.invoiceEmail);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(contact, address);
+        return Objects.hash(contact, address, taxId, purchaseOrder, invoiceEmail);
     }
 
     @Override
     public String toString() {
-        return "TenantInfoBillingContact{" +
+        return "TenantBilling{" +
                 "contact=" + contact +
                 ", address=" + address +
+                ", taxId='" + taxId + '\'' +
+                ", purchaseOrder='" + purchaseOrder + '\'' +
+                ", invoiceEmail=" + invoiceEmail +
                 '}';
     }
 }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/TenantSerializer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/TenantSerializer.java
index d5bb47c94b0..eae8f86f289 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/TenantSerializer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/TenantSerializer.java
@@ -28,6 +28,8 @@ import com.yahoo.vespa.hosted.controller.tenant.CloudTenant;
 import com.yahoo.vespa.hosted.controller.tenant.DeletedTenant;
 import com.yahoo.vespa.hosted.controller.tenant.Email;
 import com.yahoo.vespa.hosted.controller.tenant.LastLoginInfo;
+import com.yahoo.vespa.hosted.controller.tenant.PurchaseOrder;
+import com.yahoo.vespa.hosted.controller.tenant.TaxId;
 import com.yahoo.vespa.hosted.controller.tenant.Tenant;
 import com.yahoo.vespa.hosted.controller.tenant.TenantAddress;
 import com.yahoo.vespa.hosted.controller.tenant.TenantBilling;
@@ -93,6 +95,9 @@ public class TenantSerializer {
     private static final String cloudAccountsField = "cloudAccounts";
     private static final String accountField = "account";
     private static final String templateVersionField = "templateVersion";
+    private static final String taxIdField = "taxId";
+    private static final String purchaseOrderField = "purchaseOrder";
+    private static final String invoiceEmailField = "invoiceEmail";
 
     private static final String awsIdField = "awsId";
     private static final String roleField = "role";
@@ -282,12 +287,19 @@ public class TenantSerializer {
     }
 
     private TenantBilling tenantInfoBillingContactFromSlime(Inspector billingObject) {
+        var taxId = new TaxId(billingObject.field(taxIdField).asString());
+        var purchaseOrder = new PurchaseOrder(billingObject.field(purchaseOrderField).asString());
+        var invoiceEmail = new Email(billingObject.field(invoiceEmailField).asString(), false);
+
         return TenantBilling.empty()
                 .withContact(TenantContact.from(
                         billingObject.field("name").asString(),
                         new Email(billingObject.field("email").asString(), billingObject.field("emailVerified").asBool()),
                         billingObject.field("phone").asString()))
-                .withAddress(tenantInfoAddressFromSlime(billingObject.field("address")));
+                .withAddress(tenantInfoAddressFromSlime(billingObject.field("address")))
+                .withTaxId(taxId)
+                .withPurchaseOrder(purchaseOrder)
+                .withInvoiceEmail(invoiceEmail);
     }
 
     private List<TenantSecretStore> secretStoresFromSlime(Inspector secretStoresObject) {
@@ -349,6 +361,9 @@ public class TenantSerializer {
         billingCursor.setString("email", billingContact.contact().email().getEmailAddress());
         billingCursor.setBool("emailVerified", billingContact.contact().email().isVerified());
         billingCursor.setString("phone", billingContact.contact().phone());
+        billingCursor.setString(taxIdField, billingContact.getTaxId().value());
+        billingCursor.setString(purchaseOrderField, billingContact.getPurchaseOrder().value());
+        billingCursor.setString(invoiceEmailField, billingContact.getInvoiceEmail().getEmailAddress());
         toSlime(billingContact.address(), billingCursor);
     }
 
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
index 6a6c8a51d72..5548928b9d0 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
@@ -127,6 +127,8 @@ import com.yahoo.vespa.hosted.controller.tenant.DeletedTenant;
 import com.yahoo.vespa.hosted.controller.tenant.Email;
 import com.yahoo.vespa.hosted.controller.tenant.LastLoginInfo;
 import com.yahoo.vespa.hosted.controller.tenant.PendingMailVerification;
+import com.yahoo.vespa.hosted.controller.tenant.PurchaseOrder;
+import com.yahoo.vespa.hosted.controller.tenant.TaxId;
 import com.yahoo.vespa.hosted.controller.tenant.Tenant;
 import com.yahoo.vespa.hosted.controller.tenant.TenantAddress;
 import com.yahoo.vespa.hosted.controller.tenant.TenantBilling;
@@ -694,6 +696,9 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler {
             contact.setString("email", billingContact.contact().email().getEmailAddress());
             contact.setBool("emailVerified", billingContact.contact().email().isVerified());
             contact.setString("phone", billingContact.contact().phone());
+            root.setString("taxId", billingContact.getTaxId().value());
+            root.setString("purchaseOrder", billingContact.getPurchaseOrder().value());
+            root.setString("invoiceEmail", billingContact.getInvoiceEmail().getEmailAddress());
 
             toSlime(billingContact.address(), root); // will create "address" on the parent
         }
@@ -703,15 +708,22 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler {
 
     private SlimeJsonResponse putTenantInfoBilling(CloudTenant cloudTenant, Inspector inspector) {
         var info = cloudTenant.info();
-        var contact = info.billingContact().contact();
-        var address = info.billingContact().address();
+        var billing = info.billingContact();
+        var contact = billing.contact();
+        var address = billing.address();
 
         var mergedContact = updateBillingContact(inspector.field("contact"), cloudTenant.name(), contact);
-        var mergedAddress = updateTenantInfoAddress(inspector.field("address"), info.billingContact().address());
+        var mergedAddress = updateTenantInfoAddress(inspector.field("address"), billing.address());
+        var mergedTaxId = optional("taxId", inspector).map(TaxId::new).orElse(billing.getTaxId());
+        var mergedPurchaseOrder = optional("purchaseOrder", inspector).map(PurchaseOrder::new).orElse(billing.getPurchaseOrder());
+        var mergedInvoiceEmail = optional("invoiceEmail", inspector).map(mail -> new Email(mail, false)).orElse(billing.getInvoiceEmail());
 
         var mergedBilling = info.billingContact()
                 .withContact(mergedContact)
-                .withAddress(mergedAddress);
+                .withAddress(mergedAddress)
+                .withTaxId(mergedTaxId)
+                .withPurchaseOrder(mergedPurchaseOrder)
+                .withInvoiceEmail(mergedInvoiceEmail);
 
         var mergedInfo = info.withBilling(mergedBilling);
 
@@ -764,6 +776,11 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler {
                 throw new IllegalArgumentException("'website' needs to be a valid address");
             }
         }
+        if (! mergedInfo.billingContact().getInvoiceEmail().isBlank()) {
+            // TODO: Validate invoice email is set if collection method is INVOICE
+            if (! mergedInfo.billingContact().getInvoiceEmail().getEmailAddress().contains("@"))
+                throw new IllegalArgumentException("'Invoice email' needs to be an email address");
+        }
     }
 
     private void toSlime(TenantAddress address, Cursor parentCursor) {
@@ -785,6 +802,9 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler {
         billingCursor.setString("email", billingContact.contact().email().getEmailAddress());
         billingCursor.setBool("emailVerified", billingContact.contact().email().isVerified());
         billingCursor.setString("phone", billingContact.contact().phone());
+        billingCursor.setString("taxId", billingContact.getTaxId().value());
+        billingCursor.setString("purchaseOrder", billingContact.getPurchaseOrder().value());
+        billingCursor.setString("invoiceEmail", billingContact.getInvoiceEmail().getEmailAddress());
         toSlime(billingContact.address(), billingCursor);
     }
 
@@ -914,9 +934,15 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler {
     private TenantBilling updateTenantInfoBillingContact(Inspector insp, TenantName tenantName, TenantBilling oldContact) {
         if (!insp.valid()) return oldContact;
 
+        var taxId = optional("taxId", insp).map(TaxId::new).orElse(oldContact.getTaxId());
+        var purchaseOrder = optional("purchaseOrder", insp).map(PurchaseOrder::new).orElse(oldContact.getPurchaseOrder());
+        var invoiceEmail = optional("invoiceEmail", insp).map(mail -> new Email(mail, false)).orElse(oldContact.getInvoiceEmail());
         return TenantBilling.empty()
                 .withContact(updateBillingContact(insp, tenantName, oldContact.contact()))
-                .withAddress(updateTenantInfoAddress(insp.field("address"), oldContact.address()));
+                .withAddress(updateTenantInfoAddress(insp.field("address"), oldContact.address()))
+                .withTaxId(taxId)
+                .withPurchaseOrder(purchaseOrder)
+                .withInvoiceEmail(invoiceEmail);
     }
 
     private TenantContacts updateTenantInfoContacts(Inspector insp, TenantName tenantName, TenantContacts oldContacts) {
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/TenantSerializerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/TenantSerializerTest.java
index 9de856971c9..4912c9ae407 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/TenantSerializerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/TenantSerializerTest.java
@@ -24,6 +24,8 @@ import com.yahoo.vespa.hosted.controller.tenant.CloudTenant;
 import com.yahoo.vespa.hosted.controller.tenant.DeletedTenant;
 import com.yahoo.vespa.hosted.controller.tenant.Email;
 import com.yahoo.vespa.hosted.controller.tenant.LastLoginInfo;
+import com.yahoo.vespa.hosted.controller.tenant.PurchaseOrder;
+import com.yahoo.vespa.hosted.controller.tenant.TaxId;
 import com.yahoo.vespa.hosted.controller.tenant.TenantAddress;
 import com.yahoo.vespa.hosted.controller.tenant.TenantBilling;
 import com.yahoo.vespa.hosted.controller.tenant.TenantContact;
@@ -234,7 +236,11 @@ public class TenantSerializerTest {
                                 .withCity("Suddery")
                                 .withCountry("Sodor")
                                 .withAddress("Central Station")
-                                .withRegion("Irish Sea")));
+                                .withRegion("Irish Sea"))
+                        .withPurchaseOrder(new PurchaseOrder("PO42"))
+                        .withTaxId(new TaxId("1234L"))
+                        .withInvoiceEmail(new Email("billing@mycomp.any", false))
+                );
 
         Slime slime = new Slime();
         Cursor parentCursor = slime.setObject();
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiCloudTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiCloudTest.java
index 2b01d87c903..32f0247b3bc 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiCloudTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiCloudTest.java
@@ -98,19 +98,68 @@ public class ApplicationApiCloudTest extends ControllerContainerCloudTest {
 
     @Test
     void tenant_info_billing() {
+        var expectedResponse = """
+                {
+                    "contact": {
+                        "name":"",
+                        "email":"",
+                        "emailVerified":false,
+                        "phone":""
+                    },
+                    "taxId":"",
+                    "purchaseOrder":"",
+                    "invoiceEmail":""
+                }
+                """;
         var request = request("/application/v4/tenant/scoober/info/billing", GET)
                 .roles(Set.of(Role.reader(tenantName)));
-        tester.assertResponse(request, "{\"contact\":{\"name\":\"\",\"email\":\"\",\"emailVerified\":false,\"phone\":\"\"}}", 200);
-
-        var fullAddress = "{\"addressLines\":\"addressLines\",\"postalCodeOrZip\":\"postalCodeOrZip\",\"city\":\"city\",\"stateRegionProvince\":\"stateRegionProvince\",\"country\":\"country\"}";
-        var fullBillingContact = "{\"contact\":{\"name\":\"name\",\"email\":\"foo@example\",\"phone\":\"phone\"},\"address\":" + fullAddress + "}";
-
+        tester.assertJsonResponse(request, expectedResponse, 200);
+
+        var fullBillingContact = """
+                {
+                    "contact": {
+                        "name":"name",
+                        "email":"foo@example",
+                        "phone":"phone"
+                    },
+                    "taxId":"1234L",
+                    "purchaseOrder":"PO9001",
+                    "invoiceEmail":"billing@mycomp.any",
+                    "address": {
+                        "addressLines":"addressLines",
+                        "postalCodeOrZip":"postalCodeOrZip",
+                        "city":"city",
+                        "stateRegionProvince":"stateRegionProvince",
+                        "country":"country"
+                    }
+                }
+                """;
         var updateRequest = request("/application/v4/tenant/scoober/info/billing", PUT)
                 .data(fullBillingContact)
                 .roles(Set.of(Role.administrator(tenantName)));
         tester.assertResponse(updateRequest, "{\"message\":\"Tenant info updated\"}", 200);
 
-        tester.assertResponse(request, "{\"contact\":{\"name\":\"name\",\"email\":\"foo@example\",\"emailVerified\":false,\"phone\":\"phone\"},\"address\":{\"addressLines\":\"addressLines\",\"postalCodeOrZip\":\"postalCodeOrZip\",\"city\":\"city\",\"stateRegionProvince\":\"stateRegionProvince\",\"country\":\"country\"}}", 200);
+        expectedResponse = """
+                {
+                    "contact": {
+                        "name":"name",
+                        "email":"foo@example",
+                        "emailVerified": false,
+                        "phone":"phone"
+                    },
+                    "taxId":"1234L",
+                    "purchaseOrder":"PO9001",
+                    "invoiceEmail":"billing@mycomp.any",
+                    "address": {
+                        "addressLines":"addressLines",
+                        "postalCodeOrZip":"postalCodeOrZip",
+                        "city":"city",
+                        "stateRegionProvince":"stateRegionProvince",
+                        "country":"country"
+                    }
+                }
+                """;
+        tester.assertJsonResponse(request, expectedResponse, 200);
     }
 
     @Test
@@ -120,12 +169,32 @@ public class ApplicationApiCloudTest extends ControllerContainerCloudTest {
         tester.assertResponse(request, "{\"contacts\":[{\"audiences\":[\"tenant\",\"notifications\"],\"email\":\"developer@scoober\",\"emailVerified\":true}]}", 200);
 
 
-        var fullContacts = "{\"contacts\":[{\"audiences\":[\"tenant\"],\"email\":\"contact1@example.com\",\"emailVerified\":false},{\"audiences\":[\"notifications\"],\"email\":\"contact2@example.com\",\"emailVerified\":false},{\"audiences\":[\"tenant\",\"notifications\"],\"email\":\"contact3@example.com\",\"emailVerified\":false}]}";
+        var fullContacts = """
+                {
+                    "contacts":[
+                        {
+                            "audiences":["tenant"]
+                            ,"email":"contact1@example.com",
+                            "emailVerified":false
+                        },
+                        {
+                            "audiences":["notifications"],
+                            "email":"contact2@example.com",
+                            "emailVerified":false
+                        },
+                        {
+                            "audiences":["tenant","notifications"],
+                            "email":"contact3@example.com",
+                            "emailVerified":false
+                        }
+                    ]
+                }
+                """;
         var updateRequest = request("/application/v4/tenant/scoober/info/contacts", PUT)
                 .data(fullContacts)
                 .roles(Set.of(Role.administrator(tenantName)));
         tester.assertResponse(updateRequest, "{\"message\":\"Tenant info updated\"}", 200);
-        tester.assertResponse(request, fullContacts, 200);
+        tester.assertJsonResponse(request, fullContacts, 200);
     }
 
     @Test
@@ -150,13 +219,79 @@ public class ApplicationApiCloudTest extends ControllerContainerCloudTest {
         tester.assertResponse(postPartialContacts, "{\"message\":\"Tenant info updated\"}", 200);
 
         // Read back the updated info
-        tester.assertResponse(infoRequest, "{\"name\":\"\",\"email\":\"\",\"website\":\"\",\"contactName\":\"newName\",\"contactEmail\":\"foo@example.com\",\"contactEmailVerified\":false,\"billingContact\":{\"name\":\"billingName\",\"email\":\"\",\"emailVerified\":false,\"phone\":\"\"},\"contacts\":[{\"audiences\":[\"tenant\"],\"email\":\"contact1@example.com\",\"emailVerified\":false}]}", 200);
-
-        String fullAddress = "{\"addressLines\":\"addressLines\",\"postalCodeOrZip\":\"postalCodeOrZip\",\"city\":\"city\",\"stateRegionProvince\":\"stateRegionProvince\",\"country\":\"country\"}";
-        String fullBillingContact = "{\"name\":\"name\",\"email\":\"foo@example\",\"emailVerified\":false,\"phone\":\"phone\",\"address\":" + fullAddress + "}";
-        String fullContacts = "[{\"audiences\":[\"tenant\"],\"email\":\"contact1@example.com\",\"emailVerified\":false},{\"audiences\":[\"notifications\"],\"email\":\"contact2@example.com\",\"emailVerified\":false},{\"audiences\":[\"tenant\",\"notifications\"],\"email\":\"contact3@example.com\",\"emailVerified\":false}]";
-        String fullInfo = "{\"name\":\"name\",\"email\":\"foo@example\",\"website\":\"https://yahoo.com\",\"contactName\":\"contactName\",\"contactEmail\":\"contact@example.com\",\"contactEmailVerified\":false,\"address\":" + fullAddress + ",\"billingContact\":" + fullBillingContact + ",\"contacts\":" + fullContacts + "}";
-
+        var expectedResponse = """
+                {
+                    "name":"",
+                    "email":"",
+                    "website":"",
+                    "contactName":"newName",
+                    "contactEmail":"foo@example.com",
+                    "contactEmailVerified":false,
+                    "billingContact": {
+                        "name":"billingName",
+                        "email":"","emailVerified":false,
+                        "phone":"",
+                        "taxId":"",
+                        "purchaseOrder":"",
+                        "invoiceEmail":""
+                    },
+                    "contacts": [
+                        {"audiences":["tenant"],"email":"contact1@example.com","emailVerified":false}
+                    ]
+                }
+                """;
+        tester.assertJsonResponse(infoRequest, expectedResponse, 200);
+
+        var fullInfo = """
+                {
+                    "name":"name",
+                    "email":"foo@example",
+                    "website":"https://yahoo.com",
+                    "contactName":"contactName",
+                    "contactEmail":"contact@example.com",
+                    "contactEmailVerified":false,
+                    "address": {
+                        "addressLines":"addressLines",
+                        "postalCodeOrZip":"postalCodeOrZip",
+                        "city":"city",
+                        "stateRegionProvince":"stateRegionProvince",
+                        "country":"country"
+                    },
+                    "billingContact": {
+                        "name":"name",
+                        "email":"foo@example",
+                        "emailVerified":false,
+                        "phone":"phone",
+                        "taxId":"",
+                        "purchaseOrder":"",
+                        "invoiceEmail":"",
+                        "address": {
+                            "addressLines":"addressLines",
+                            "postalCodeOrZip":"postalCodeOrZip",
+                            "city":"city",
+                            "stateRegionProvince":"stateRegionProvince",
+                            "country":"country"
+                        }
+                    },
+                    "contacts": [
+                        {
+                            "audiences":["tenant"],
+                            "email":"contact1@example.com",
+                            "emailVerified":false
+                        },
+                        {
+                            "audiences":["notifications"],
+                            "email":"contact2@example.com",
+                            "emailVerified":false
+                        },
+                        {
+                            "audiences":["tenant","notifications"]
+                            ,"email":"contact3@example.com",
+                            "emailVerified":false
+                        }
+                    ]
+                }
+                """;
         // Now set all fields
         var postFull =
                 request("/application/v4/tenant/scoober/info", PUT)
@@ -165,7 +300,7 @@ public class ApplicationApiCloudTest extends ControllerContainerCloudTest {
         tester.assertResponse(postFull, "{\"message\":\"Tenant info updated\"}", 200);
 
         // Now compare the updated info with the full info we sent
-        tester.assertResponse(infoRequest, fullInfo, 200);
+        tester.assertJsonResponse(infoRequest, fullInfo, 200);
 
         var invalidBody = "{\"mail\":\"contact1@example.com\", \"mailType\":\"blurb\"}";
         var resendMailRequest =