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 16fd6d1 fixed billing issues 16fd6d1 is described below commit 16fd6d130c60a29f49360e5edadbd9f59d9e7d8d Author: Oleh Fuks <olegfuk...@gmail.com> AuthorDate: Tue Apr 14 17:49:06 2020 +0300 fixed billing issues --- .../src/main/java/com/epam/dlab/backendapi/util/BillingUtils.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/util/BillingUtils.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/util/BillingUtils.java index 49ad999..b258e93 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/util/BillingUtils.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/util/BillingUtils.java @@ -136,7 +136,7 @@ public class BillingUtils { public static Stream<BillingReportLine> customImageBillingDataStream(ImageInfoRecord image, String sbn) { String imageId = String.format(IMAGE_CUSTOM_FORMAT, sbn, image.getProject(), image.getEndpoint(), image.getApplication(), image.getName()).toLowerCase(); return Stream.of( - BillingReportLine.builder().resourceName(IMAGE_NAME).project(image.getProject()).dlabId(imageId).resourceType(IMAGE).build() + BillingReportLine.builder().resourceName(IMAGE_NAME).project(image.getProject()).dlabId(imageId).user(SHARED_RESOURCE).resourceType(IMAGE).build() ); } @@ -165,7 +165,7 @@ public class BillingUtils { List<BillingReportLine> list = new ArrayList<>(); for (String notebook : AVAILABLE_NOTEBOOKS) { list.add(BillingReportLine.builder().resourceName(IMAGE_NAME).dlabId(String.format(IMAGE_STANDARD_FORMAT2, sbn, endpoint, notebook).toLowerCase()) - .project(SHARED_RESOURCE).resourceType(IMAGE).build()); + .user(SHARED_RESOURCE).project(SHARED_RESOURCE).resourceType(IMAGE).build()); } return list.stream(); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org