This is an automated email from the ASF dual-hosted git repository. ofuks pushed a commit to branch DLAB-1571 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 06dd17607e732f8366682f271c7f4ac46b20b505 Author: Oleh Fuks <[email protected]> AuthorDate: Mon Mar 2 19:22:31 2020 +0200 Refactoring --- .../com/epam/dlab/backendapi/service/impl/BillingServiceImplNew.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/BillingServiceImplNew.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/BillingServiceImplNew.java index 386188f..d7c3c85 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/BillingServiceImplNew.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/BillingServiceImplNew.java @@ -42,6 +42,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.http.client.utils.URIBuilder; import javax.ws.rs.core.GenericType; +import java.math.BigDecimal; import java.net.URI; import java.net.URISyntaxException; import java.time.LocalDate; @@ -85,13 +86,13 @@ public class BillingServiceImplNew implements BillingServiceNew { LocalDate min = billingReportLines.stream().min(Comparator.comparing(BillingReportLines::getUsageDateFrom)).map(BillingReportLines::getUsageDateFrom).orElse(null); LocalDate max = billingReportLines.stream().max(Comparator.comparing(BillingReportLines::getUsageDateTo)).map(BillingReportLines::getUsageDateTo).orElse(null); double sum = billingReportLines.stream().mapToDouble(BillingReportLines::getCost).sum(); - String currency = billingReportLines.stream().findAny().map(BillingReportLines::getCurrency).orElse(null); + String currency = billingReportLines.stream().map(BillingReportLines::getCurrency).distinct().count() == 1 ? billingReportLines.get(0).getCurrency() : null; return BillingReport.builder() .sbn(configuration.getServiceBaseName()) .reportLines(billingReportLines) .usageDateFrom(min) .usageDateTo(max) - .totalCost(sum) + .totalCost(new BigDecimal(sum).setScale(3, BigDecimal.ROUND_HALF_UP).doubleValue()) .currency(currency) .build(); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
