This is an automated email from the ASF dual-hosted git repository.
bhliva pushed a commit to branch bugfix-DLAB-518
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 41ee4c788fd3304c77fce562b3571192c3dde3ec
Author: bhliva <bohdan_hl...@epam.com>
AuthorDate: Mon Apr 1 14:21:39 2019 +0300
DLAB-518 fixed bug with wrong billing information for personal bucket
---
.../src/main/java/com/epam/dlab/mongo/DlabResourceTypeDAO.java | 7 +++++--
1 file changed, 5 insertions(+), 2 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 f576dbf..9738de6 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
@@ -152,9 +152,12 @@ public class DlabResourceTypeDAO implements MongoConstants
{
Iterable<Document> docs =
connection.getCollection(COLLECTION_USER_EDGE).find().projection(projection);
for (Document d : docs) {
String username = d.getString(FIELD_ID);
- resourceList.append(sbName + "-" +
BillingUtils.getSimpleUserName(username) + "-edge", "EDGE Node",
+ final String simpleUserName =
BillingUtils.getSimpleUserName(username);
+ resourceList.append(sbName + "-" + simpleUserName +
"-edge", "EDGE Node",
DlabResourceType.EDGE, username, null);
- resourceList.append(sbName + "-" +
BillingUtils.getSimpleUserName(username) + "-edge-volume-primary",
+ resourceList.append(sbName + "-" + simpleUserName +
"-bucket", "Personal bucket",
+ DlabResourceType.COLLABORATION_BUCKET,
username, null);
+ resourceList.append(sbName + "-" + simpleUserName +
"-edge-volume-primary",
"EDGE Volume", DlabResourceType.VOLUME,
username, null);
resourceList.append(getBucketName(d.getString(FIELD_EDGE_BUCKET)), "EDGE
bucket", DlabResourceType
.EDGE_BUCKET, username, null);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
