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 4f0489e Changed scale
4f0489e is described below
commit 4f0489e51aa79e4b7837f2333e22419298ed0b95
Author: Oleh Fuks <olegfuk...@gmail.com>
AuthorDate: Fri Apr 3 11:39:35 2020 +0300
Changed scale
---
.../src/main/java/com/epam/dlab/dao/impl/BillingDAOImpl.java | 2 +-
.../main/java/com/epam/dlab/billing/azure/dao/impl/BillingDAOImpl.java | 2 +-
.../java/com/epam/dlab/billing/gcp/dao/impl/BigQueryBillingDAO.java | 2 +-
.../java/com/epam/dlab/backendapi/service/impl/BillingServiceImpl.java | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git
a/services/billing-aws/src/main/java/com/epam/dlab/dao/impl/BillingDAOImpl.java
b/services/billing-aws/src/main/java/com/epam/dlab/dao/impl/BillingDAOImpl.java
index b0ff9f1..4015538 100644
---
a/services/billing-aws/src/main/java/com/epam/dlab/dao/impl/BillingDAOImpl.java
+++
b/services/billing-aws/src/main/java/com/epam/dlab/dao/impl/BillingDAOImpl.java
@@ -121,7 +121,7 @@ public class BillingDAOImpl implements BillingDAO {
.usageDateTo(Optional.ofNullable(billingData.getString("to")).map(LocalDate::parse).orElse(null))
.product(billingData.getString(FIELD_PRODUCT))
.usageType(billingData.getString(FIELD_RESOURCE_TYPE))
-
.cost(BigDecimal.valueOf(billingData.getDouble(FIELD_COST)).setScale(3,
BigDecimal.ROUND_HALF_UP).doubleValue())
+
.cost(BigDecimal.valueOf(billingData.getDouble(FIELD_COST)).setScale(2,
BigDecimal.ROUND_HALF_UP).doubleValue())
.currency(billingData.getString(FIELD_CURRENCY_CODE))
.build();
}
diff --git
a/services/billing-azure/src/main/java/com/epam/dlab/billing/azure/dao/impl/BillingDAOImpl.java
b/services/billing-azure/src/main/java/com/epam/dlab/billing/azure/dao/impl/BillingDAOImpl.java
index c39385a..a4dcec5 100644
---
a/services/billing-azure/src/main/java/com/epam/dlab/billing/azure/dao/impl/BillingDAOImpl.java
+++
b/services/billing-azure/src/main/java/com/epam/dlab/billing/azure/dao/impl/BillingDAOImpl.java
@@ -114,7 +114,7 @@ public class BillingDAOImpl implements BillingDAO {
.usageDateFrom(Optional.ofNullable(billingData.getUsageStartDate()).map(LocalDate::parse).orElse(null))
.usageDateTo(Optional.ofNullable(billingData.getUsageEndDate()).map(LocalDate::parse).orElse(null))
.product(billingData.getMeterCategory())
- .cost(BigDecimal.valueOf(billingData.getCost()).setScale(3,
BigDecimal.ROUND_HALF_UP).doubleValue())
+ .cost(BigDecimal.valueOf(billingData.getCost()).setScale(2,
BigDecimal.ROUND_HALF_UP).doubleValue())
.currency(billingData.getCurrencyCode())
.build();
}
diff --git
a/services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/dao/impl/BigQueryBillingDAO.java
b/services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/dao/impl/BigQueryBillingDAO.java
index 6db993a..d0b969a 100644
---
a/services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/dao/impl/BigQueryBillingDAO.java
+++
b/services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/dao/impl/BigQueryBillingDAO.java
@@ -206,7 +206,7 @@ public class BigQueryBillingDAO implements BillingDAO {
.usageDateTo(billingData.getUsageDateTo())
.product(billingData.getProduct())
.usageType(billingData.getUsageType())
-
.cost(BigDecimal.valueOf(billingData.getCost()).setScale(3,
BigDecimal.ROUND_HALF_UP).doubleValue())
+
.cost(BigDecimal.valueOf(billingData.getCost()).setScale(2,
BigDecimal.ROUND_HALF_UP).doubleValue())
.currency(billingData.getCurrency())
.tag(billingData.getTag())
.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 176f22b..b687e62 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
@@ -108,7 +108,7 @@ public class BillingServiceImpl implements BillingService {
.reportLines(billingReportLines)
.usageDateFrom(min)
.usageDateTo(max)
- .totalCost(new BigDecimal(sum).setScale(3,
BigDecimal.ROUND_HALF_UP).doubleValue())
+ .totalCost(new BigDecimal(sum).setScale(2,
BigDecimal.ROUND_HALF_UP).doubleValue())
.currency(currency)
.isFull(isFullReport(user))
.build();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
