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 038682b [DLAB-1973] Conveyed dependency for custom image
038682b is described below
commit 038682bfb0125fbfa5bc9f25478c17f8f378a705
Author: Oleh Fuks <olegfuk...@gmail.com>
AuthorDate: Thu Jul 30 12:40:13 2020 +0300
[DLAB-1973] Conveyed dependency for custom image
---
.../src/main/java/com/epam/dlab/dto/exploratory/LibInstallDTO.java | 5 +++++
.../src/main/java/com/epam/dlab/model/library/Library.java | 6 ++++++
.../main/java/com/epam/dlab/backendapi/dao/ExploratoryLibDAO.java | 2 ++
.../epam/dlab/backendapi/service/impl/ExploratoryServiceImpl.java | 1 +
4 files changed, 14 insertions(+)
diff --git
a/services/dlab-model/src/main/java/com/epam/dlab/dto/exploratory/LibInstallDTO.java
b/services/dlab-model/src/main/java/com/epam/dlab/dto/exploratory/LibInstallDTO.java
index 78f6e89..1d670a9 100644
---
a/services/dlab-model/src/main/java/com/epam/dlab/dto/exploratory/LibInstallDTO.java
+++
b/services/dlab-model/src/main/java/com/epam/dlab/dto/exploratory/LibInstallDTO.java
@@ -77,4 +77,9 @@ public class LibInstallDTO {
setErrorMessage(errorMessage);
return this;
}
+
+ public LibInstallDTO withAddedPackages(List<String> addedPackages) {
+ setAddedPackages(addedPackages);
+ return this;
+ }
}
diff --git
a/services/dlab-model/src/main/java/com/epam/dlab/model/library/Library.java
b/services/dlab-model/src/main/java/com/epam/dlab/model/library/Library.java
index 0ca4562..f40521c 100644
--- a/services/dlab-model/src/main/java/com/epam/dlab/model/library/Library.java
+++ b/services/dlab-model/src/main/java/com/epam/dlab/model/library/Library.java
@@ -25,6 +25,8 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
+import java.util.List;
+
@Data
@JsonIgnoreProperties(ignoreUnknown = true)
public class Library {
@@ -34,6 +36,10 @@ public class Library {
private final LibStatus status;
@JsonProperty("error_message")
private final String errorMessage;
+ @JsonProperty("available_versions")
+ private List<String> availableVersions;
+ @JsonProperty("add_pkgs")
+ private List<String> addedPackages;
private String resourceName;
private ResourceType type;
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ExploratoryLibDAO.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ExploratoryLibDAO.java
index 7fbb47a..d96f069 100644
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ExploratoryLibDAO.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ExploratoryLibDAO.java
@@ -22,6 +22,7 @@ package com.epam.dlab.backendapi.dao;
import com.epam.dlab.backendapi.util.DateRemoverUtil;
import com.epam.dlab.dto.exploratory.LibInstallDTO;
import com.epam.dlab.dto.exploratory.LibInstallStatusDTO;
+import com.epam.dlab.dto.exploratory.LibStatus;
import com.epam.dlab.exceptions.DlabException;
import com.epam.dlab.model.ResourceType;
import com.epam.dlab.model.library.Library;
@@ -394,6 +395,7 @@ public class ExploratoryLibDAO extends BaseDAO {
return ((List<Document>)
libsDocument.getOrDefault(libFieldName, Collections.emptyList()))
.stream()
.map(d -> convertFromDocument(d, Library.class))
+ .filter(library -> LibStatus.INVALID_VERSION !=
library.getStatus())
.peek(l ->
l.withType(libType).withResourceName(resourceName));
}
}
\ No newline at end of file
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ExploratoryServiceImpl.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ExploratoryServiceImpl.java
index 250245b..cdafb03 100644
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ExploratoryServiceImpl.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ExploratoryServiceImpl.java
@@ -461,6 +461,7 @@ public class ExploratoryServiceImpl implements
ExploratoryService {
private LibInstallDTO toLibInstallDto(Library l) {
return new LibInstallDTO(l.getGroup(), l.getName(),
l.getVersion())
.withStatus(String.valueOf(l.getStatus()))
+ .withAddedPackages(l.getAddedPackages())
.withErrorMessage(l.getErrorMessage());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
