You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by bh...@apache.org on 2019/09/16 13:47:37 UTC
[incubator-dlab] branch DLAB-1056 updated: DLAB-000 added project
field to billing report
This is an automated email from the ASF dual-hosted git repository.
bhliva pushed a commit to branch DLAB-1056
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1056 by this push:
new deca22e DLAB-000 added project field to billing report
deca22e is described below
commit deca22e164e9376dc21c962c8f6babbf70d99fc5
Author: bhliva <bo...@epam.com>
AuthorDate: Mon Sep 16 16:47:28 2019 +0300
DLAB-000 added project field to billing report
---
.../src/main/java/com/epam/dlab/backendapi/dao/BaseBillingDAO.java | 1 +
.../src/main/java/com/epam/dlab/backendapi/dao/aws/AwsBillingDAO.java | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
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 77d05e5..dd0f088 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
@@ -152,6 +152,7 @@ public abstract class BaseBillingDAO<T extends BillingFilter> extends BaseDAO im
.append(STATUS, statusString)
.append(FIELD_RESOURCE_TYPE, resourceType(id))
.append(productFieldName(), id.getString(productFieldName()))
+ .append(PROJECT, id.getString(PROJECT))
.append(MongoKeyWords.COST, d.getDouble(MongoKeyWords.COST))
.append(costFieldName(), BillingCalculationUtils.formatDouble(d.getDouble(MongoKeyWords
.COST)))
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/aws/AwsBillingDAO.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/aws/AwsBillingDAO.java
index 71bda09..66eff68 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/aws/AwsBillingDAO.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/aws/AwsBillingDAO.java
@@ -52,6 +52,7 @@ public class AwsBillingDAO extends BaseBillingDAO<AwsBillingFilter> {
public static final String USAGE_DATE_START = "usage_date_start";
public static final String USAGE_DATE_END = "usage_date_end";
public static final String TAG_RESOURCE_ID = "tag_resource_id";
+ private static final String FIELD_PROJECT = "project";
@Override
protected Bson sortCriteria() {
@@ -64,7 +65,7 @@ public class AwsBillingDAO extends BaseBillingDAO<AwsBillingFilter> {
@Override
protected Bson groupCriteria() {
return group(getGroupingFields(USER, FIELD_DLAB_ID, DLAB_RESOURCE_TYPE, FIELD_PRODUCT, FIELD_RESOURCE_TYPE,
- FIELD_CURRENCY_CODE),
+ FIELD_CURRENCY_CODE, FIELD_PROJECT),
sum(FIELD_COST, "$" + FIELD_COST),
min(MongoKeyWords.USAGE_FROM, "$" + FIELD_USAGE_DATE),
max(MongoKeyWords.USAGE_TO, "$" + FIELD_USAGE_DATE));
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org