You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by bh...@apache.org on 2019/07/09 14:01:18 UTC
[incubator-dlab] branch feature/projects updated: DLAB-000 fixed
bug connected with project deletion
This is an automated email from the ASF dual-hosted git repository.
bhliva pushed a commit to branch feature/projects
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/feature/projects by this push:
new 05e7046 DLAB-000 fixed bug connected with project deletion
05e7046 is described below
commit 05e7046f2856eec933cb06e57eb70676a04e05e1
Author: bhliva <bo...@epam.com>
AuthorDate: Tue Jul 9 17:01:07 2019 +0300
DLAB-000 fixed bug connected with project deletion
---
.../com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java | 2 +-
.../src/main/java/com/epam/dlab/backendapi/dao/ProjectDAO.java | 2 ++
.../src/main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java | 5 +++++
.../main/java/com/epam/dlab/backendapi/service/ProjectService.java | 4 ++++
.../epam/dlab/backendapi/service/impl/EnvironmentServiceImpl.java | 4 +++-
.../com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java | 5 +++++
.../dlab/backendapi/service/impl/EnvironmentServiceImplTest.java | 4 ++--
7 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java
index 7e53c97..9504fad 100644
--- a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java
+++ b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java
@@ -65,7 +65,7 @@ public class ProjectServiceImpl implements ProjectService {
RunDockerCommand runDockerCommand = new RunDockerCommand()
.withInteractive()
- .withName(String.join("_", projectName, resourceType))
+ .withName(String.join("_", projectName, resourceType, action.toString()))
.withVolumeForRootKeys(configuration.getKeyDirectory())
.withVolumeForResponse(configuration.getKeyLoaderDirectory())
.withVolumeForLog(configuration.getDockerLogDirectory(), resourceType)
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAO.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAO.java
index 7624bce..b94b2e6 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAO.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAO.java
@@ -12,6 +12,8 @@ import java.util.Set;
public interface ProjectDAO {
List<ProjectDTO> getProjects();
+ List<ProjectDTO> getProjectsWithStatus(ProjectDTO.Status status);
+
List<ProjectDTO> getUserProjectsWithStatus(UserInfo userInfo, ProjectDTO.Status status);
void create(ProjectDTO projectDTO);
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java
index 059d08e..013e38c 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java
@@ -40,6 +40,11 @@ public class ProjectDAOImpl extends BaseDAO implements ProjectDAO {
}
@Override
+ public List<ProjectDTO> getProjectsWithStatus(ProjectDTO.Status status) {
+ return find(PROJECTS_COLLECTION, eq(STATUS_FIELD, status.toString()), ProjectDTO.class);
+ }
+
+ @Override
public List<ProjectDTO> getUserProjectsWithStatus(UserInfo userInfo, ProjectDTO.Status status) {
return find(PROJECTS_COLLECTION, and(in(GROUPS, Sets.union(userGroupDao.getUserGroups(userInfo.getName()),
userInfo.getRoles())), eq(STATUS_FIELD, status.toString())), ProjectDTO.class);
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java
index 250aca3..27451bc 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java
@@ -11,12 +11,16 @@ public interface ProjectService {
List<ProjectDTO> getUserProjects(UserInfo userInfo);
+ List<ProjectDTO> getProjectsWithStatus(ProjectDTO.Status status);
+
void create(UserInfo userInfo, ProjectDTO projectDTO);
ProjectDTO get(String name);
void terminate(UserInfo userInfo, String name);
+
void start(UserInfo userInfo, String name);
+
void stop(UserInfo userInfo, String name);
void update(UpdateProjectDTO projectDTO);
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/EnvironmentServiceImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/EnvironmentServiceImpl.java
index 300b41f..1a68cd1 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/EnvironmentServiceImpl.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/EnvironmentServiceImpl.java
@@ -98,7 +98,9 @@ public class EnvironmentServiceImpl implements EnvironmentService {
public List<UserResourceInfo> getAllEnv() {
log.debug("Getting all user's environment...");
List<UserInstanceDTO> expList = exploratoryDAO.getInstances();
- return projectService.getProjects().stream().map(projectDTO -> getProjectEnv(projectDTO, expList)).flatMap(Collection::stream)
+ return projectService.getProjectsWithStatus(ProjectDTO.Status.ACTIVE)
+ .stream()
+ .map(projectDTO -> getProjectEnv(projectDTO, expList)).flatMap(Collection::stream)
.collect(toList());
}
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java
index 23d0e9f..c43b9a4 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java
@@ -61,6 +61,11 @@ public class ProjectServiceImpl implements ProjectService {
}
@Override
+ public List<ProjectDTO> getProjectsWithStatus(ProjectDTO.Status status) {
+ return projectDAO.getProjectsWithStatus(status);
+ }
+
+ @Override
public void create(UserInfo user, ProjectDTO projectDTO) {
if (!projectDAO.get(projectDTO.getName()).isPresent()) {
projectDAO.create(projectDTO);
diff --git a/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/EnvironmentServiceImplTest.java b/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/EnvironmentServiceImplTest.java
index 2c6a2b6..5d63724 100644
--- a/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/EnvironmentServiceImplTest.java
+++ b/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/EnvironmentServiceImplTest.java
@@ -145,7 +145,7 @@ public class EnvironmentServiceImplTest {
"key", "tag", null);
project.setEdgeInfo(new EdgeInfo());
when(exploratoryDAO.getInstances()).thenReturn(instances);
- doReturn(Collections.singletonList(project)).when(projectService).getProjects();
+ doReturn(Collections.singletonList(project)).when(projectService).getProjectsWithStatus(ProjectDTO.Status.ACTIVE);
EdgeInfo edgeInfo = new EdgeInfo();
edgeInfo.setEdgeStatus("running");
@@ -168,7 +168,7 @@ public class EnvironmentServiceImplTest {
assertEquals(3, actualEnv.size());
verify(exploratoryDAO).getInstances();
- verify(projectService).getProjects();
+ verify(projectService).getProjectsWithStatus(ProjectDTO.Status.ACTIVE);
verifyNoMoreInteractions(exploratoryDAO, envDAO, keyDAO);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org