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 2019/12/06 10:52:24 UTC
[incubator-dlab] branch develop updated: [DLAB-1223] Fixed billing
values according to updates on billing page
This is an automated email from the ASF dual-hosted git repository.
ofuks pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/develop by this push:
new 754107e [DLAB-1223] Fixed billing values according to updates on billing page
754107e is described below
commit 754107ea4793261ee02c454c1dc9aceb1228b561
Author: Oleh Fuks <ol...@gmail.com>
AuthorDate: Fri Dec 6 12:52:04 2019 +0200
[DLAB-1223] Fixed billing values according to updates on billing page
---
.../main/java/com/epam/dlab/mongo/DlabResourceTypeDAO.java | 6 ++++--
.../java/com/epam/dlab/backendapi/dao/BaseBillingDAO.java | 11 +++++------
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/services/billing-aws/src/main/java/com/epam/dlab/mongo/DlabResourceTypeDAO.java b/services/billing-aws/src/main/java/com/epam/dlab/mongo/DlabResourceTypeDAO.java
index 8e56aea..dcfe369 100644
--- a/services/billing-aws/src/main/java/com/epam/dlab/mongo/DlabResourceTypeDAO.java
+++ b/services/billing-aws/src/main/java/com/epam/dlab/mongo/DlabResourceTypeDAO.java
@@ -145,10 +145,12 @@ public class DlabResourceTypeDAO implements MongoConstants {
.stream()
.map(endpoint -> endpoint.getString("name"))
.forEach(endpoint -> {
+ resourceList.append(sbName + "-" + endpoint + "-shared-bucket", "Shared endpoint bucket",
+ DlabResourceType.COLLABORATION_BUCKET);
+ resourceList.append(sbName + "-" + projectName + "-" + endpoint + "-bucket", "Project bucket",
+ DlabResourceType.COLLABORATION_BUCKET, null, null, projectName);
resourceList.append(sbName + "-" + projectName + "-" + endpoint + "-edge", "EDGE Node",
DlabResourceType.EDGE, null, null, projectName);
- resourceList.append(sbName + "-" + projectName+ "-" + endpoint + "-bucket", "Project bucket",
- DlabResourceType.COLLABORATION_BUCKET, null, null, projectName);
resourceList.append(sbName + "-" + projectName+ "-" + endpoint + "-edge-volume-primary",
"EDGE Volume", DlabResourceType.VOLUME, null, null, projectName);
});
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 980c452..4fc374a 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
@@ -156,7 +156,7 @@ public abstract class BaseBillingDAO<T extends BillingFilter> extends BaseDAO im
.orElse(StringUtils.EMPTY);
Document item = new Document()
- .append(MongoKeyWords.DLAB_USER, getUserOrDefault(id.getString(USER)))
+ .append(MongoKeyWords.DLAB_USER, getOrDefault(id.getString(USER)))
.append(dlabIdFieldName(), resourceId)
.append(shapeFieldName(), Optional.ofNullable(shape).map(BaseShape::format)
.orElse(StringUtils.EMPTY))
@@ -165,14 +165,13 @@ 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(PROJECT, getOrDefault(id.getString(PROJECT)))
.append(MongoKeyWords.COST, d.getDouble(MongoKeyWords.COST))
.append(costFieldName(), BillingCalculationUtils.formatDouble(d.getDouble(MongoKeyWords
.COST)))
.append(currencyCodeFieldName(), id.getString(currencyCodeFieldName()))
.append(usageDateFromFieldName(), dateStart)
- .append(usageDateToFieldName(), dateEnd)
- .append(TAGS, Optional.ofNullable(shape).map(BaseShape::getTags));
+ .append(usageDateToFieldName(), dateEnd);
reportItems.add(item);
}
@@ -310,8 +309,8 @@ public abstract class BaseBillingDAO<T extends BillingFilter> extends BaseDAO im
return toPercentage(() -> projectDAO.getAllowedBudget(project), getProjectCost(project));
}
- protected String getUserOrDefault(String user) {
- return StringUtils.isNotBlank(user) ? user : SHARED_RESOURCE_NAME;
+ private String getOrDefault(String value) {
+ return StringUtils.isNotBlank(value) ? value : SHARED_RESOURCE_NAME;
}
private Integer toPercentage(Supplier<Optional<Integer>> allowedBudget, Double totalCost) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org