[incubator-dlab] branch DLAB-1748 updated: [DLAB-1947] Implemented additional changes for lib management

[ofuks]

This is an automated email from the ASF dual-hosted git repository.

ofuks pushed a commit to branch DLAB-1748
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git


The following commit(s) were added to refs/heads/DLAB-1748 by this push:
     new 43cd662  [DLAB-1947] Implemented additional changes for lib management
43cd662 is described below

commit 43cd662499b2a2edea94948fe910f0ddc459efd2
Author: Oleh Fuks <olegfuk...@gmail.com>
AuthorDate: Wed Jul 15 14:02:37 2020 +0300

    [DLAB-1947] Implemented additional changes for lib management
---
 .../dlab/backendapi/domain/ExploratoryLibCache.java | 21 +++++++++++++++++++--
 .../resources/LibExploratoryResource.java           |  4 ++--
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ExploratoryLibCache.java
 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ExploratoryLibCache.java
index 0faf66c..41debbb 100644
--- 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ExploratoryLibCache.java
+++ 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ExploratoryLibCache.java
@@ -43,6 +43,7 @@ import org.slf4j.LoggerFactory;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * Cache of libraries for exploratory.
@@ -50,6 +51,7 @@ import java.util.Map;
 @Singleton
 public class ExploratoryLibCache implements Managed, Runnable {
        private static final Logger LOGGER = 
LoggerFactory.getLogger(ExploratoryLibCache.class);
+       private static final String PIP2_GROUP = "pip2";
 
        @Inject
        @Named(ServiceConsts.PROVISIONING_SERVICE_NAME)
@@ -115,13 +117,28 @@ public class ExploratoryLibCache implements Managed, 
Runnable {
        }
 
        /**
-        * Return the list of libraries groups from cache.
+        * Return the list of libraries groups from cache for compute resource.
         *
         * @param userInfo     the user info.
         * @param userInstance the notebook info.
         * @return list of libraries groups
         */
-       public List<String> getLibGroupList(UserInfo userInfo, UserInstanceDTO 
userInstance) {
+       public List<String> getComputeLibGroupList(UserInfo userInfo, 
UserInstanceDTO userInstance) {
+               ExploratoryLibList libs = getLibs(userInfo, userInstance);
+               return libs.getGroupList()
+                               .stream()
+                               .filter(g -> !PIP2_GROUP.equals(g))
+                               .collect(Collectors.toList());
+       }
+
+       /**
+        * Return the list of libraries groups from cache for exploratory 
resource.
+        *
+        * @param userInfo     the user info.
+        * @param userInstance the notebook info.
+        * @return list of libraries groups
+        */
+       public List<String> getExploratoryLibGroupList(UserInfo userInfo, 
UserInstanceDTO userInstance) {
                ExploratoryLibList libs = getLibs(userInfo, userInstance);
                return libs.getGroupList();
        }
diff --git 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/LibExploratoryResource.java
 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/LibExploratoryResource.java
index 8e81708..2244460 100644
--- 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/LibExploratoryResource.java
+++ 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/LibExploratoryResource.java
@@ -96,7 +96,7 @@ public class LibExploratoryResource {
                        if (StringUtils.isEmpty(computationalName)) {
                                UserInstanceDTO userInstance = 
exploratoryDAO.fetchExploratoryFields(userInfo.getName(), projectName,
                                                exploratoryName);
-                               return 
ExploratoryLibCache.getCache().getLibGroupList(userInfo, userInstance);
+                               return 
ExploratoryLibCache.getCache().getExploratoryLibGroupList(userInfo, 
userInstance);
                        } else {
                                UserInstanceDTO userInstance = 
exploratoryDAO.fetchExploratoryFields(userInfo.getName(), projectName,
                                                exploratoryName, 
computationalName);
@@ -105,7 +105,7 @@ public class LibExploratoryResource {
                                                .filter(e -> 
e.getComputationalName().equals(computationalName))
                                                .collect(Collectors.toList()));
 
-                               return 
ExploratoryLibCache.getCache().getLibGroupList(userInfo, userInstance);
+                               return 
ExploratoryLibCache.getCache().getComputeLibGroupList(userInfo, userInstance);
                        }
                } catch (Exception t) {
                        log.error("Cannot load list of lib groups for user {} 
and exploratory {}", userInfo.getName(),


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org