diff options
author | Ola Aunrønning <olaa@verizonmedia.com> | 2020-07-09 14:20:21 +0200 |
---|---|---|
committer | Ola Aunrønning <olaa@verizonmedia.com> | 2020-07-09 14:20:21 +0200 |
commit | 62804fddb12715535c1671fa4ba66301665e63b4 (patch) | |
tree | ad72c755b2b22d3074d9921779be3884be68aba9 | |
parent | 9ba83e0d6bd5a5a0f30434aa343821c29abe8628 (diff) |
Add instrument address
3 files changed, 60 insertions, 7 deletions
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 523f20eaef8..f1fb25e6cea 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 @@ -2,7 +2,6 @@ package com.yahoo.vespa.hosted.controller.api.integration.billing; import com.yahoo.config.provision.TenantName; -import com.yahoo.vespa.hosted.controller.api.identifiers.DeploymentId; import java.math.BigDecimal; import java.time.LocalDate; @@ -130,8 +129,13 @@ public class MockBillingController implements BillingController { "brand", "type", "endingWith", - "expiryDate" - ); + "expiryDate", + "addressLine1", + "addressLine2", + "zip", + "city", + "state", + "country"); } public void addInvoice(TenantName tenantName, Invoice invoice, boolean committed) { diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/PaymentInstrument.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/PaymentInstrument.java index 7b8d36f3d4f..cb0d988f45f 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/PaymentInstrument.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/billing/PaymentInstrument.java @@ -13,9 +13,14 @@ public class PaymentInstrument { private final String type; private final String endingWith; private final String expiryDate; + private final String addressLine1; + private final String addressLine2; + private final String city; + private final String state; + private final String zip; + private final String country; - - public PaymentInstrument(String id, String nameOnCard, String displayText, String brand, String type, String endingWith, String expiryDate) { + public PaymentInstrument(String id, String nameOnCard, String displayText, String brand, String type, String endingWith, String expiryDate, String addressLine1, String addressLine2, String zip, String city, String state, String country) { this.id = id; this.nameOnCard = nameOnCard; this.displayText = displayText; @@ -23,6 +28,12 @@ public class PaymentInstrument { this.type = type; this.endingWith = endingWith; this.expiryDate = expiryDate; + this.addressLine1 = addressLine1; + this.addressLine2 = addressLine2; + this.zip = zip; + this.city = city; + this.state = state; + this.country = country; } public String getId() { @@ -48,4 +59,33 @@ public class PaymentInstrument { public String getEndingWith() { return endingWith; } + + public String getExpiryDate() { + return expiryDate; + } + + public String getAddressLine1() { + return addressLine1; + } + + public String getAddressLine2() { + return addressLine2; + } + + public String getCity() { + return city; + } + + public String getState() { + return state; + } + + public String getZip() { + return zip; + } + + public String getCountry() { + return country; + } + } 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 8fad0db4368..915c5a71cd0 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 @@ -19,8 +19,6 @@ import com.yahoo.slime.Slime; import com.yahoo.slime.SlimeUtils; import com.yahoo.vespa.hosted.controller.ApplicationController; import com.yahoo.vespa.hosted.controller.Controller; -import com.yahoo.vespa.hosted.controller.Instance; -import com.yahoo.vespa.hosted.controller.api.identifiers.DeploymentId; import com.yahoo.vespa.hosted.controller.api.integration.billing.PaymentInstrument; import com.yahoo.vespa.hosted.controller.api.integration.billing.Invoice; import com.yahoo.vespa.hosted.controller.api.integration.billing.InstrumentOwner; @@ -259,9 +257,20 @@ public class BillingApiHandler extends LoggingRequestHandler { } private void renderInstrument(Cursor cursor, PaymentInstrument instrument) { + cursor.setString("pi-id", instrument.getId()); cursor.setString("type", instrument.getType()); cursor.setString("brand", instrument.getBrand()); cursor.setString("endingWith", instrument.getEndingWith()); + cursor.setString("expiryDate", instrument.getExpiryDate()); + cursor.setString("displayText", instrument.getDisplayText()); + cursor.setString("nameOnCard", instrument.getNameOnCard()); + cursor.setString("addressLine1", instrument.getAddressLine1()); + cursor.setString("addressLine2", instrument.getAddressLine2()); + cursor.setString("zip", instrument.getZip()); + cursor.setString("city", instrument.getCity()); + cursor.setString("state", instrument.getState()); + cursor.setString("country", instrument.getCountry()); + } private void renderCurrentUsage(Cursor cursor, Invoice currentUsage) { |