diff options
| author | Harald Musum <musum@yahooinc.com> | 2023-10-12 11:10:40 +0200 |
|---|---|---|
| committer | Harald Musum <musum@yahooinc.com> | 2023-10-12 11:10:40 +0200 |
| commit | 11c322ef6ce77857e5b7ef67db174705707eec4f (patch) | |
| tree | 300479c62042a1db1d57e1a36779aaf3e48d1a47 /controller-api | |
| parent | 0f14059f373b486987f82b1d161ff89b01f03204 (diff) | |
Combine list price and support cost into one price item
Diffstat (limited to 'controller-api')
2 files changed, 4 insertions, 4 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/MockPricingController.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/MockPricingController.java index 13fc29d1bb7..f72f80155ed 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/MockPricingController.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/MockPricingController.java @@ -24,12 +24,12 @@ public class MockPricingController implements PricingController { .sum()); BigDecimal supportLevelCost = pricingInfo.supportLevel() == BASIC ? new BigDecimal("-160.00") : new BigDecimal("800.00"); + BigDecimal listPriceWithSupport = listPrice.add(supportLevelCost); BigDecimal enclaveDiscount = pricingInfo.enclave() ? new BigDecimal("-15.1234") : BigDecimal.ZERO; BigDecimal volumeDiscount = new BigDecimal("-5.64315634"); BigDecimal committedAmountDiscount = new BigDecimal("-1.23"); BigDecimal totalAmount = listPrice.add(supportLevelCost).add(enclaveDiscount).add(volumeDiscount).add(committedAmountDiscount); - return new PriceInformation(listPrice, volumeDiscount, committedAmountDiscount, enclaveDiscount, totalAmount, - supportLevelCost); + return new PriceInformation(listPriceWithSupport, volumeDiscount, committedAmountDiscount, enclaveDiscount, totalAmount); } } diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/pricing/PriceInformation.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/pricing/PriceInformation.java index 3511d6008ba..887741f9196 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/pricing/PriceInformation.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/pricing/PriceInformation.java @@ -3,7 +3,7 @@ package com.yahoo.vespa.hosted.controller.api.integration.pricing; import java.math.BigDecimal; -public record PriceInformation(BigDecimal listPrice, BigDecimal volumeDiscount, BigDecimal committedAmountDiscount, - BigDecimal enclaveDiscount, BigDecimal totalAmount, BigDecimal supportLevelCost) { +public record PriceInformation(BigDecimal listPriceWithSupport, BigDecimal volumeDiscount, BigDecimal committedAmountDiscount, + BigDecimal enclaveDiscount, BigDecimal totalAmount) { } |