You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by dy...@apache.org on 2022/07/08 09:56:50 UTC
[incubator-datalab] branch DATALAB-2872 created (now b83ee4c3a)
This is an automated email from the ASF dual-hosted git repository.
dyankiv pushed a change to branch DATALAB-2872
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
at b83ee4c3a change the way info about libraries added from images
This branch includes the following new commits:
new b83ee4c3a change the way info about libraries added from images
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org
[incubator-datalab] 01/01: change the way info about libraries added from images
Posted by dy...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dyankiv pushed a commit to branch DATALAB-2872
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit b83ee4c3a7f5248cfcb2f6261972242ce80d7fd7
Author: Denys Yankiv <de...@gmail.com>
AuthorDate: Fri Jul 8 12:56:28 2022 +0300
change the way info about libraries added from images
---
.../epam/datalab/backendapi/dao/ImageExploratoryDAO.java | 2 +-
.../datalab/backendapi/dao/ImageExploratoryDAOImpl.java | 14 ++++++--------
.../backendapi/service/impl/ExploratoryServiceImpl.java | 6 +++---
3 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/dao/ImageExploratoryDAO.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/dao/ImageExploratoryDAO.java
index 8b9ccc84c..9638dec8e 100644
--- a/services/self-service/src/main/java/com/epam/datalab/backendapi/dao/ImageExploratoryDAO.java
+++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/dao/ImageExploratoryDAO.java
@@ -47,5 +47,5 @@ public interface ImageExploratoryDAO {
List<ImageInfoRecord> getAllImages();
Optional<ImageInfoRecord> getImage(String user, String name, String project, String endpoint);
- List<Library> getLibraries(String user, String imageFullName, String project, String endpoint, LibStatus status);
+ List<Library> getLibraries(String imageName, String project, String endpoint, LibStatus status);
}
diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/dao/ImageExploratoryDAOImpl.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/dao/ImageExploratoryDAOImpl.java
index 9fb160585..cc93a4b01 100644
--- a/services/self-service/src/main/java/com/epam/datalab/backendapi/dao/ImageExploratoryDAOImpl.java
+++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/dao/ImageExploratoryDAOImpl.java
@@ -111,19 +111,18 @@ public class ImageExploratoryDAOImpl extends BaseDAO implements ImageExploratory
}
@Override
- @SuppressWarnings("unchecked")
- public List<Library> getLibraries(String user, String imageFullName, String project, String endpoint, LibStatus status) {
- return ((List<Document>) libDocument(user, imageFullName, project, endpoint, status)
+ public List<Library> getLibraries(String imageName, String project, String endpoint, LibStatus status) {
+ return ((List<Document>) libDocument(imageName, project, endpoint, status)
.orElse(emptyLibrariesDocument()).get(LIBRARIES))
.stream()
.map(d -> convertFromDocument(d, Library.class))
.collect(Collectors.toList());
}
- private Optional<Document> libDocument(String user, String imageFullName, String project, String endpoint,
+ private Optional<Document> libDocument(String imageName, String project, String endpoint,
LibStatus status) {
return findOne(MongoCollections.IMAGES,
- imageLibraryCondition(user, imageFullName, project, endpoint, status),
+ imageLibraryCondition(imageName,project,endpoint,status),
fields(include(LIBRARIES), excludeId()));
}
@@ -131,9 +130,8 @@ public class ImageExploratoryDAOImpl extends BaseDAO implements ImageExploratory
return new Document(LIBRARIES, Collections.emptyList());
}
- private Bson imageLibraryCondition(String user, String imageFullName, String project, String endpoint,
- LibStatus status) {
- return and(eq(USER, user), eq(IMAGE_NAME, imageFullName), eq(PROJECT, project), eq(ENDPOINT, endpoint),
+ private Bson imageLibraryCondition(String imageName, String project, String endpoint, LibStatus status){
+ return and(eq(IMAGE_NAME, imageName), eq(PROJECT, project), eq(ENDPOINT, endpoint),
elemMatch(LIBRARIES, eq(STATUS, status.name())));
}
diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/ExploratoryServiceImpl.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/ExploratoryServiceImpl.java
index e338b23c7..05bdd8b5f 100644
--- a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/ExploratoryServiceImpl.java
+++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/ExploratoryServiceImpl.java
@@ -422,16 +422,16 @@ public class ExploratoryServiceImpl implements ExploratoryService {
.withGPUEnabled(exploratory.getEnabledGPU())
.withGPUType(exploratory.getGpuType());
if (StringUtils.isNotBlank(exploratory.getImageName())) {
- final List<LibInstallDTO> libInstallDtoList = getImageRelatedLibraries(userInfo, exploratory.getImageName(),
+ final List<LibInstallDTO> libInstallDtoList = getImageRelatedLibraries(exploratory.getImageName(),
project, exploratory.getEndpoint());
userInstance.withLibs(libInstallDtoList);
}
return userInstance;
}
- private List<LibInstallDTO> getImageRelatedLibraries(UserInfo userInfo, String imageFullName, String project,
+ private List<LibInstallDTO> getImageRelatedLibraries(String imageName, String project,
String endpoint) {
- final List<Library> libraries = imageExploratoryDao.getLibraries(userInfo.getName(), imageFullName, project,
+ final List<Library> libraries = imageExploratoryDao.getLibraries(imageName, project,
endpoint, LibStatus.INSTALLED);
return toLibInstallDtoList(libraries);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org