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 bd944de Remote billing
new c7c5acf Merge remote-tracking branch 'origin/DLAB-1571' into DLAB-1571
bd944de is described below
commit bd944de63e70ad5c7bcbdd1e2b3f31e105e255ee
Author: Oleh Fuks <olegfuk...@gmail.com>
AuthorDate: Fri Mar 27 13:44:47 2020 +0200
Remote billing
---
.../java/com/epam/dlab/billing/gcp/dao/impl/BigQueryBillingDAO.java | 6 +++---
.../main/java/com/epam/dlab/billing/gcp/model/GcpBillingData.java | 3 +--
.../com/epam/dlab/billing/gcp/service/BillingServiceImplTest.java | 3 +--
3 files changed, 5 insertions(+), 7 deletions(-)
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 ee917b5..5b92d82 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
@@ -137,7 +137,7 @@ public class BigQueryBillingDAO implements BillingDAO {
}
private GroupOperation getGroupOperation() {
- return group("product", "currency", "usageType", "dlabId")
+ return group("product", "currency", "dlabId")
.min("from").as("from")
.max("to").as("to")
.sum("cost").as("cost");
@@ -166,7 +166,7 @@ public class BigQueryBillingDAO implements BillingDAO {
return GcpBillingData.builder()
.usageDateFrom(toLocalDate(fields,
"usage_date_from"))
.usageDateTo(toLocalDate(fields,
"usage_date_to"))
-
.cost(fields.get("cost").getNumericValue().setScale(3,
BigDecimal.ROUND_HALF_UP))
+
.cost(fields.get("cost").getNumericValue().doubleValue())
.product(fields.get("product").getStringValue())
.usageType(fields.get("usageType").getStringValue())
.currency(fields.get("currency").getStringValue())
@@ -186,7 +186,7 @@ public class BigQueryBillingDAO implements BillingDAO {
.usageDateTo(billingData.getUsageDateTo())
.product(billingData.getProduct())
.usageType(billingData.getUsageType())
- .cost(billingData.getCost().setScale(3,
BigDecimal.ROUND_HALF_UP).doubleValue())
+
.cost(BigDecimal.valueOf(billingData.getCost()).setScale(3,
BigDecimal.ROUND_HALF_UP).doubleValue())
.currency(billingData.getCurrency())
.tag(billingData.getTag())
.build();
diff --git
a/services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/model/GcpBillingData.java
b/services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/model/GcpBillingData.java
index d688198..a2bd12b 100644
---
a/services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/model/GcpBillingData.java
+++
b/services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/model/GcpBillingData.java
@@ -24,7 +24,6 @@ import lombok.Data;
import org.springframework.data.mongodb.core.mapping.Document;
import org.springframework.data.mongodb.core.mapping.Field;
-import java.math.BigDecimal;
import java.time.LocalDate;
@Data
@@ -37,7 +36,7 @@ public class GcpBillingData {
private final LocalDate usageDateTo;
private final String product;
private final String usageType;
- private final BigDecimal cost;
+ private final Double cost;
private final String currency;
@Field("dlabId")
private final String tag;
diff --git
a/services/billing-gcp/src/test/java/com/epam/dlab/billing/gcp/service/BillingServiceImplTest.java
b/services/billing-gcp/src/test/java/com/epam/dlab/billing/gcp/service/BillingServiceImplTest.java
index 7a51f62..2ff670a 100644
---
a/services/billing-gcp/src/test/java/com/epam/dlab/billing/gcp/service/BillingServiceImplTest.java
+++
b/services/billing-gcp/src/test/java/com/epam/dlab/billing/gcp/service/BillingServiceImplTest.java
@@ -10,7 +10,6 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
-import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.Collections;
import java.util.List;
@@ -51,7 +50,7 @@ public class BillingServiceImplTest {
.usageDateTo(LocalDate.MAX)
.product("product")
.usageType("usageType")
- .cost(new BigDecimal(1))
+ .cost(1d)
.currency("USD")
.tag("exploratoryId")
.build());
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
