This is an automated email from the ASF dual-hosted git repository.
bhliva pushed a commit to branch DLAB-terraform
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-terraform by this push:
new 2f836d9 DLAB-1080 fixed billing on aws
2f836d9 is described below
commit 2f836d978f17fbc5e39e5815075b3c06f7840876
Author: bhliva <[email protected]>
AuthorDate: Mon Sep 30 14:11:03 2019 +0300
DLAB-1080 fixed billing on aws
---
.../billing-aws/src/main/java/com/epam/dlab/mongo/MongoConstants.java | 4 ++--
.../src/main/java/com/epam/dlab/backendapi/dao/BaseBillingDAO.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git
a/services/billing-aws/src/main/java/com/epam/dlab/mongo/MongoConstants.java
b/services/billing-aws/src/main/java/com/epam/dlab/mongo/MongoConstants.java
index 4e9de76..68c56cd 100644
--- a/services/billing-aws/src/main/java/com/epam/dlab/mongo/MongoConstants.java
+++ b/services/billing-aws/src/main/java/com/epam/dlab/mongo/MongoConstants.java
@@ -53,7 +53,7 @@ public interface MongoConstants {
/** Collection billingTotal. */
String COLLECTION_BILLING_TOTAL = "billingTotal";
- String FIELD_USAGE_DATE_START = "usage_date_start";
- String FIELD_USAGE_DATE_END = "usage_date_end";
+ String FIELD_USAGE_DATE_START = "from";
+ String FIELD_USAGE_DATE_END = "to";
String BILLING_DATA_COLLECTION = "BillingData";
}
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 d475eed..ea0cf06 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
@@ -104,7 +104,7 @@ public abstract class BaseBillingDAO<T extends
BillingFilter> extends BaseDAO im
pipeline.add(sortCriteria());
final Map<String, ShapeInfo> shapes =
getShapes(filter.getShapes());
return prepareReport(filter.getStatuses(),
!filter.getShapes().isEmpty(),
- getCollection(BILLING).aggregate(pipeline),
shapes, isFullReport); //TODO add shapes
+ getCollection(BILLING).aggregate(pipeline),
shapes, isFullReport);
}
private Document prepareReport(List<UserInstanceStatus> statuses,
boolean filterByShape,
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
