You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by of...@apache.org on 2020/02/10 11:42:13 UTC
[incubator-dlab] branch develop updated: [DLAB-1521] Added notebook
name as unique parameter per project while creating notebook
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 5adc03f [DLAB-1521] Added notebook name as unique parameter per project while creating notebook
5adc03f is described below
commit 5adc03ff008cc018e498c226e522baf249d88067
Author: Oleh Fuks <ol...@gmail.com>
AuthorDate: Mon Feb 10 13:41:57 2020 +0200
[DLAB-1521] Added notebook name as unique parameter per project while creating notebook
---
.../epam/dlab/backendapi/dao/ExploratoryDAO.java | 29 +++++++++++++++---
.../backendapi/resources/ExploratoryResource.java | 4 +++
.../resources/dto/ExploratoryCreatePopUp.java | 35 ++++++++++++++++++++++
.../backendapi/service/ExploratoryService.java | 3 ++
.../service/impl/ExploratoryServiceImpl.java | 16 ++++++++++
5 files changed, 83 insertions(+), 4 deletions(-)
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ExploratoryDAO.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ExploratoryDAO.java
index 9993171..160ccce 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ExploratoryDAO.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ExploratoryDAO.java
@@ -21,7 +21,11 @@ package com.epam.dlab.backendapi.dao;
import com.epam.dlab.backendapi.util.DateRemoverUtil;
-import com.epam.dlab.dto.*;
+import com.epam.dlab.dto.ResourceURL;
+import com.epam.dlab.dto.SchedulerJobDTO;
+import com.epam.dlab.dto.StatusEnvBaseDTO;
+import com.epam.dlab.dto.UserInstanceDTO;
+import com.epam.dlab.dto.UserInstanceStatus;
import com.epam.dlab.dto.aws.computational.ClusterConfig;
import com.epam.dlab.dto.exploratory.ExploratoryStatusDTO;
import com.epam.dlab.exceptions.DlabException;
@@ -35,13 +39,26 @@ import org.bson.conversions.Bson;
import java.time.LocalDateTime;
import java.time.ZoneId;
-import java.util.*;
+import java.util.Collections;
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
import java.util.stream.Collectors;
import static com.epam.dlab.backendapi.dao.MongoCollections.USER_INSTANCES;
import static com.epam.dlab.backendapi.dao.SchedulerJobDAO.SCHEDULER_DATA;
-import static com.mongodb.client.model.Filters.*;
-import static com.mongodb.client.model.Projections.*;
+import static com.mongodb.client.model.Filters.and;
+import static com.mongodb.client.model.Filters.eq;
+import static com.mongodb.client.model.Filters.in;
+import static com.mongodb.client.model.Filters.not;
+import static com.mongodb.client.model.Filters.or;
+import static com.mongodb.client.model.Projections.exclude;
+import static com.mongodb.client.model.Projections.excludeId;
+import static com.mongodb.client.model.Projections.fields;
+import static com.mongodb.client.model.Projections.include;
import static com.mongodb.client.model.Updates.set;
import static java.util.stream.Collectors.toList;
import static org.apache.commons.lang3.StringUtils.EMPTY;
@@ -134,6 +151,10 @@ public class ExploratoryDAO extends BaseDAO {
return getUserInstances(and(eq(PROJECT, project), eq(STATUS, UserInstanceStatus.RUNNING.toString())), false);
}
+ public List<UserInstanceDTO> fetchExploratoryFieldsForProject(String project) {
+ return getUserInstances(and(eq(PROJECT, project)), false);
+ }
+
/**
* Finds and returns the info of all user's notebooks whose status is present among predefined ones.
*
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ExploratoryResource.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ExploratoryResource.java
index 9f478c3..cb2c7d2 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ExploratoryResource.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ExploratoryResource.java
@@ -58,6 +58,10 @@ public class ExploratoryResource implements ExploratoryAPI {
this.exploratoryService = exploratoryService;
}
+ @GET
+ public Response getExploratoryPopUp(@Auth UserInfo userInfo) {
+ return Response.ok(exploratoryService.getUserInstances(userInfo)).build();
+ }
/**
* Creates the exploratory environment for user.
*
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/ExploratoryCreatePopUp.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/ExploratoryCreatePopUp.java
new file mode 100644
index 0000000..d061204
--- /dev/null
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/ExploratoryCreatePopUp.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.epam.dlab.backendapi.resources.dto;
+
+import com.epam.dlab.backendapi.domain.ProjectDTO;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+@Data
+public class ExploratoryCreatePopUp {
+ @JsonProperty("user_projects")
+ private final List<ProjectDTO> userProjects;
+ @JsonProperty("project_exploratories")
+ private final Map<String, List<String>> projectExploratories;
+}
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ExploratoryService.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ExploratoryService.java
index 76956c6..4348819 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ExploratoryService.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ExploratoryService.java
@@ -21,6 +21,7 @@ package com.epam.dlab.backendapi.service;
import com.epam.dlab.auth.UserInfo;
+import com.epam.dlab.backendapi.resources.dto.ExploratoryCreatePopUp;
import com.epam.dlab.dto.UserInstanceDTO;
import com.epam.dlab.dto.UserInstanceStatus;
import com.epam.dlab.dto.aws.computational.ClusterConfig;
@@ -54,4 +55,6 @@ public interface ExploratoryService {
Optional<UserInstanceDTO> getUserInstance(String user, String exploratoryName);
List<ClusterConfig> getClusterConfig(UserInfo user, String exploratoryName);
+
+ ExploratoryCreatePopUp getUserInstances(UserInfo user);
}
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 1006bec..17b8967 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
@@ -29,6 +29,7 @@ import com.epam.dlab.backendapi.dao.ImageExploratoryDao;
import com.epam.dlab.backendapi.domain.EndpointDTO;
import com.epam.dlab.backendapi.domain.ProjectDTO;
import com.epam.dlab.backendapi.domain.RequestId;
+import com.epam.dlab.backendapi.resources.dto.ExploratoryCreatePopUp;
import com.epam.dlab.backendapi.service.EndpointService;
import com.epam.dlab.backendapi.service.ExploratoryService;
import com.epam.dlab.backendapi.service.ProjectService;
@@ -58,6 +59,7 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import java.util.List;
+import java.util.Map;
import java.util.Optional;
import java.util.stream.Collectors;
@@ -231,6 +233,20 @@ public class ExploratoryServiceImpl implements ExploratoryService {
return exploratoryDAO.getClusterConfig(user.getName(), exploratoryName);
}
+ @Override
+ public ExploratoryCreatePopUp getUserInstances(UserInfo user) {
+ List<ProjectDTO> userProjects = projectService.getUserProjects(user, false);
+ Map<String, List<String>> collect = userProjects.stream()
+ .collect(Collectors.toMap(ProjectDTO::getName, this::getProjectExploratoryNames));
+ return new ExploratoryCreatePopUp(userProjects, collect);
+ }
+
+ private List<String> getProjectExploratoryNames(ProjectDTO project) {
+ return exploratoryDAO.fetchExploratoryFieldsForProject(project.getName()).stream()
+ .map(UserInstanceDTO::getExploratoryName)
+ .collect(Collectors.toList());
+ }
+
private List<UserComputationalResource> computationalResourcesWithStatus(UserInstanceDTO userInstance,
UserInstanceStatus computationalStatus) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org