You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by of...@apache.org on 2020/04/09 13:41:06 UTC
[incubator-dlab] branch DLAB-1571 updated: set scale
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
The following commit(s) were added to refs/heads/DLAB-1571 by this push:
new 965ba14 set scale
965ba14 is described below
commit 965ba14a20b8ce32296a5bb646fd05d8e2ca76c7
Author: Oleh Fuks <ol...@gmail.com>
AuthorDate: Thu Apr 9 16:40:54 2020 +0300
set scale
---
.../billing-aws/src/main/java/com/epam/dlab/BillingServiceImpl.java | 3 +--
.../java/com/epam/dlab/billing/azure/CalculateBillingServiceImpl.java | 3 +--
.../src/main/java/com/epam/dlab/backendapi/dao/BaseBillingDAO.java | 2 +-
.../java/com/epam/dlab/backendapi/service/impl/BillingServiceImpl.java | 2 +-
4 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/services/billing-aws/src/main/java/com/epam/dlab/BillingServiceImpl.java b/services/billing-aws/src/main/java/com/epam/dlab/BillingServiceImpl.java
index 8da6402..b2ad457 100644
--- a/services/billing-aws/src/main/java/com/epam/dlab/BillingServiceImpl.java
+++ b/services/billing-aws/src/main/java/com/epam/dlab/BillingServiceImpl.java
@@ -31,7 +31,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
-import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.Arrays;
import java.util.Collections;
@@ -83,7 +82,7 @@ public class BillingServiceImpl implements BillingService {
.usageDate(billingData.getString(FIELD_USAGE_DATE))
.product(billingData.getString(FIELD_PRODUCT))
.usageType(billingData.getString(FIELD_RESOURCE_TYPE))
- .cost(BigDecimal.valueOf(billingData.getDouble(FIELD_COST)).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue())
+ .cost(billingData.getDouble(FIELD_COST))
.currency(billingData.getString(FIELD_CURRENCY_CODE))
.build();
}
diff --git a/services/billing-azure/src/main/java/com/epam/dlab/billing/azure/CalculateBillingServiceImpl.java b/services/billing-azure/src/main/java/com/epam/dlab/billing/azure/CalculateBillingServiceImpl.java
index 6b96d87..de38aff 100644
--- a/services/billing-azure/src/main/java/com/epam/dlab/billing/azure/CalculateBillingServiceImpl.java
+++ b/services/billing-azure/src/main/java/com/epam/dlab/billing/azure/CalculateBillingServiceImpl.java
@@ -43,7 +43,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.io.IOException;
-import java.math.BigDecimal;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.time.LocalDate;
@@ -239,7 +238,7 @@ public class CalculateBillingServiceImpl implements CalculateBillingService {
.usageDateTo(Optional.ofNullable(billingData.getUsageEndDate()).map(LocalDate::parse).orElse(null))
.usageDate(billingData.getDay())
.product(billingData.getMeterCategory())
- .cost(BigDecimal.valueOf(billingData.getCost()).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue())
+ .cost(billingData.getCost())
.currency(billingData.getCurrencyCode())
.build();
}
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/BaseBillingDAO.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/BaseBillingDAO.java
index 189a282..4c1612f 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/BaseBillingDAO.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/BaseBillingDAO.java
@@ -221,7 +221,7 @@ public class BaseBillingDAO extends BaseDAO implements BillingDAO {
.resourceType(BillingResourceType.valueOf(id.getString(RESOURCE_TYPE)))
.usageDateFrom(d.getDate(FROM).toInstant().atZone(ZoneId.systemDefault()).toLocalDate())
.usageDateTo(d.getDate(TO).toInstant().atZone(ZoneId.systemDefault()).toLocalDate())
- .cost(d.getDouble(COST))
+ .cost(BigDecimal.valueOf(d.getDouble(COST)).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue())
.currency(id.getString(CURRENCY))
.build();
}
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/BillingServiceImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/BillingServiceImpl.java
index 41dbeb4..516eb30 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/BillingServiceImpl.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/BillingServiceImpl.java
@@ -281,7 +281,7 @@ public class BillingServiceImpl implements BillingService {
private BillingReportLine toBillingReport(BillingData billingData, BillingReportLine billingReportLine) {
return BillingReportLine.builder()
.application(billingData.getApplication())
- .cost(BigDecimal.valueOf(billingData.getCost()).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue())
+ .cost(billingData.getCost())
.currency(billingData.getCurrency())
.product(billingData.getProduct())
.project(billingReportLine.getProject())
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org