This is an automated email from the ASF dual-hosted git repository.
dyankiv pushed a commit to branch DATALAB-2812
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
The following commit(s) were added to refs/heads/DATALAB-2812 by this push:
new 659ffe439 update image dto and model
659ffe439 is described below
commit 659ffe439870d771cc6c4710f03e8145cdc38418
Author: Denys Yankiv <[email protected]>
AuthorDate: Wed Jun 1 17:37:20 2022 +0300
update image dto and model
---
.../main/java/com/epam/datalab/model/exploratory/Image.java | 3 ++-
.../datalab/backendapi/resources/dto/ImageInfoRecord.java | 11 ++++++++++-
.../backendapi/service/impl/ImageExploratoryServiceImpl.java | 1 +
3 files changed, 13 insertions(+), 2 deletions(-)
diff --git
a/services/datalab-model/src/main/java/com/epam/datalab/model/exploratory/Image.java
b/services/datalab-model/src/main/java/com/epam/datalab/model/exploratory/Image.java
index 322d5511a..57bf7dfc6 100644
---
a/services/datalab-model/src/main/java/com/epam/datalab/model/exploratory/Image.java
+++
b/services/datalab-model/src/main/java/com/epam/datalab/model/exploratory/Image.java
@@ -19,12 +19,12 @@
package com.epam.datalab.model.exploratory;
+import com.epam.datalab.dto.aws.computational.ClusterConfig;
import com.epam.datalab.dto.exploratory.ImageStatus;
import com.epam.datalab.model.library.Library;
import lombok.Builder;
import lombok.Data;
-import java.time.Instant;
import java.util.List;
import java.util.Map;
@@ -44,6 +44,7 @@ public class Image {
private final String instanceName;
private final String cloudProvider;
private final String dockerImage;
+ private final List<ClusterConfig> clusterConfig;
private final List<Library> libraries;
private final Map<String, List<Library>> computationalLibraries;
}
diff --git
a/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/dto/ImageInfoRecord.java
b/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/dto/ImageInfoRecord.java
index 00e5c94c6..caa6cc209 100644
---
a/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/dto/ImageInfoRecord.java
+++
b/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/dto/ImageInfoRecord.java
@@ -20,17 +20,22 @@
package com.epam.datalab.backendapi.resources.dto;
import com.epam.datalab.cloud.CloudProvider;
+import com.epam.datalab.dto.aws.computational.ClusterConfig;
import com.epam.datalab.dto.exploratory.ImageStatus;
+import com.epam.datalab.model.library.Library;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import lombok.Data;
import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
@Data
@JsonIgnoreProperties(ignoreUnknown = true)
public class ImageInfoRecord {
private final String name;
- private final String creationDate;
+ private final Date timestamp;
private final String description;
private final String project;
private final String endpoint;
@@ -41,4 +46,8 @@ public class ImageInfoRecord {
private final String fullName;
private final ImageStatus status;
private final String sharedStatus;
+ private final List<ClusterConfig> clusterConfig;
+ private final String exploratoryURL;
+ private final List<Library> libraries;
+ private final Map<String, List<Library>> computationalLibraries;
}
diff --git
a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/ImageExploratoryServiceImpl.java
b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/ImageExploratoryServiceImpl.java
index c0cd6e54d..d2ec48e0f 100644
---
a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/ImageExploratoryServiceImpl.java
+++
b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/ImageExploratoryServiceImpl.java
@@ -105,6 +105,7 @@ public class ImageExploratoryServiceImpl implements
ImageExploratoryService {
.user(user.getName())
.libraries(fetchExploratoryLibs(libraries))
.computationalLibraries(fetchComputationalLibs(libraries))
+ .clusterConfig(userInstance.getClusterConfig())
.dockerImage(userInstance.getImageName())
.exploratoryId(userInstance.getId())
.instanceName(userInstance.getExploratoryName())
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
