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 11aebbe  [DLAB-1710] added extra values for image record
11aebbe is described below

commit 11aebbe6d033d199e2428b55b2e72da5c1335749
Author: Oleh Fuks <[email protected]>
AuthorDate: Wed Apr 15 14:51:28 2020 +0300

    [DLAB-1710] added extra values for image record
---
 .../java/com/epam/dlab/backendapi/resources/dto/ImageInfoRecord.java    | 1 +
 .../src/main/java/com/epam/dlab/backendapi/util/BillingUtils.java       | 2 +-
 .../epam/dlab/backendapi/resources/ImageExploratoryResourceTest.java    | 2 +-
 .../dlab/backendapi/service/impl/ImageExploratoryServiceImplTest.java   | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/ImageInfoRecord.java
 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/ImageInfoRecord.java
index d430701..ed722ee 100644
--- 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/ImageInfoRecord.java
+++ 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/ImageInfoRecord.java
@@ -30,6 +30,7 @@ public class ImageInfoRecord {
        private final String description;
        private final String project;
        private final String endpoint;
+       private final String user;
        private final String application;
        private final String fullName;
        private final ImageStatus status;
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 c1f311f..a0ec1c9 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
@@ -137,7 +137,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).user(SHARED_RESOURCE).resourceType(IMAGE).build()
+                
BillingReportLine.builder().resourceName(image.getName()).project(image.getProject()).dlabId(imageId).user(image.getUser()).resourceType(IMAGE).build()
         );
     }
 
diff --git 
a/services/self-service/src/test/java/com/epam/dlab/backendapi/resources/ImageExploratoryResourceTest.java
 
b/services/self-service/src/test/java/com/epam/dlab/backendapi/resources/ImageExploratoryResourceTest.java
index 38c0e46..d74f94e 100644
--- 
a/services/self-service/src/test/java/com/epam/dlab/backendapi/resources/ImageExploratoryResourceTest.java
+++ 
b/services/self-service/src/test/java/com/epam/dlab/backendapi/resources/ImageExploratoryResourceTest.java
@@ -272,7 +272,7 @@ public class ImageExploratoryResourceTest extends TestBase {
        }
 
        private List<ImageInfoRecord> getImageList() {
-               ImageInfoRecord imageInfoRecord = new 
ImageInfoRecord("someName", "someDescription", "someProject", "someEndpoint", 
"someApp",
+               ImageInfoRecord imageInfoRecord = new 
ImageInfoRecord("someName", "someDescription", "someProject", "someEndpoint", 
"someUser", "someApp",
                                "someFullName", ImageStatus.CREATED);
                return Collections.singletonList(imageInfoRecord);
        }
diff --git 
a/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/ImageExploratoryServiceImplTest.java
 
b/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/ImageExploratoryServiceImplTest.java
index b600879..e15044b 100644
--- 
a/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/ImageExploratoryServiceImplTest.java
+++ 
b/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/ImageExploratoryServiceImplTest.java
@@ -308,7 +308,7 @@ public class ImageExploratoryServiceImplTest {
        }
 
        private ImageInfoRecord getImageInfoRecord() {
-               return new ImageInfoRecord("someName", "someDescription", 
"someProject", "someEndpoint", "someApp",
+               return new ImageInfoRecord("someName", "someDescription", 
"someProject", "someEndpoint", "someUser", "someApp",
                                "someFullName", ImageStatus.CREATED);
        }
 


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to