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

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


The following commit(s) were added to refs/heads/DLAB-1749 by this push:
     new 6737547  [DLAB-1749] BE support library installation of particular 
version
6737547 is described below

commit 67375474d8bc94440e6e43e8abd22c94c1d7c2d9
Author: Oleh Fuks <[email protected]>
AuthorDate: Mon Jul 13 17:24:20 2020 +0300

    [DLAB-1749] BE support library installation of particular version
---
 .../main/java/com/epam/dlab/backendapi/dao/ExploratoryLibDAO.java   | 4 ++--
 .../java/com/epam/dlab/backendapi/resources/dto/LibraryStatus.java  | 6 ++++++
 .../com/epam/dlab/backendapi/service/impl/LibraryServiceImpl.java   | 4 +++-
 .../epam/dlab/backendapi/service/impl/LibraryServiceImplTest.java   | 4 ++--
 4 files changed, 13 insertions(+), 5 deletions(-)

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 9842673..7fbb47a 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
@@ -59,10 +59,10 @@ public class ExploratoryLibDAO extends BaseDAO {
        public static final String LIB_GROUP = "group";
        public static final String LIB_NAME = "name";
        public static final String LIB_VERSION = "version";
+       public static final String LIB_AVAILABLE_VERSION = "available_versions";
+       public static final String LIB_ADDED_PACKAGES = "add_pkgs";
        private static final String LIB_INSTALL_DATE = "install_date";
        private static final String LIB_ERROR_MESSAGE = "error_message";
-       private static final String LIB_AVAILABLE_VERSION = 
"available_versions";
-       private static final String LIB_ADDED_PACKAGES = "add_pkgs";
        private static final String COMPUTATIONAL_NAME_FIELD = 
"computational_name";
 
        /**
diff --git 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/LibraryStatus.java
 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/LibraryStatus.java
index cec0306..eb70c20 100644
--- 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/LibraryStatus.java
+++ 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/LibraryStatus.java
@@ -25,6 +25,8 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.List;
+
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
@@ -38,4 +40,8 @@ public class LibraryStatus {
     private String status;
     @JsonProperty
     private String error;
+    @JsonProperty("available_versions")
+    private List<String> availableVersions;
+    @JsonProperty("add_pkgs")
+    private List<String> addedPackages;
 }
diff --git 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/LibraryServiceImpl.java
 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/LibraryServiceImpl.java
index 87bd5d4..70b5b16 100644
--- 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/LibraryServiceImpl.java
+++ 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/LibraryServiceImpl.java
@@ -238,6 +238,8 @@ public class LibraryServiceImpl implements LibraryService {
                String version = 
document.getString(ExploratoryLibDAO.LIB_VERSION);
                String group = document.getString(ExploratoryLibDAO.LIB_GROUP);
                String status = document.getString(ExploratoryLibDAO.STATUS);
+               List<String> availableVersions = (List<String>) 
document.get(ExploratoryLibDAO.LIB_AVAILABLE_VERSION);
+               List<String> addedPackages = (List<String>) 
document.get(ExploratoryLibDAO.LIB_ADDED_PACKAGES);
                String error = 
document.getString(ExploratoryLibDAO.ERROR_MESSAGE);
 
                LibKey libKey = new LibKey(name, version, group);
@@ -247,7 +249,7 @@ public class LibraryServiceImpl implements LibraryService {
                        model.put(libKey, statuses);
                }
 
-               statuses.add(new LibraryStatus(exploratoryName, resourceType, 
status, error));
+               statuses.add(new LibraryStatus(exploratoryName, resourceType, 
status, error, availableVersions, addedPackages));
        }
 
        @SuppressWarnings("unchecked")
diff --git 
a/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/LibraryServiceImplTest.java
 
b/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/LibraryServiceImplTest.java
index f926b17..76d2360 100644
--- 
a/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/LibraryServiceImplTest.java
+++ 
b/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/LibraryServiceImplTest.java
@@ -419,11 +419,11 @@ public class LibraryServiceImplTest {
        private List<LibInfoRecord> getLibInfoRecordList() {
                LibKey explLibKey = new LibKey("expLibName", "expLibVersion", 
"expLibGroup");
                List<LibraryStatus> explLibStatuses = Collections.singletonList(
-                               new LibraryStatus(EXPLORATORY_NAME, "notebook", 
"expLibStatus", "expLibErrorMessage"));
+                               new LibraryStatus(EXPLORATORY_NAME, "notebook", 
"expLibStatus", "expLibErrorMessage", null, null));
 
                LibKey compLibKey = new LibKey("compLibName", "compLibVersion", 
"compLibGroup");
                List<LibraryStatus> compLibStatuses = Collections.singletonList(
-                               new LibraryStatus("compName", "cluster", 
"compLibStatus", "compLibErrorMessage"));
+                               new LibraryStatus("compName", "cluster", 
"compLibStatus", "compLibErrorMessage", null, null));
 
                return Arrays.asList(
                                new LibInfoRecord(compLibKey, compLibStatuses),


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

Reply via email to