[incubator-dlab] branch develop updated: [DLAB-1334] Error handling improvement for project actions

[ofuks]

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 332d52b  [DLAB-1334] Error handling improvement for project actions
332d52b is described below

commit 332d52b4380f8cf5cbbc951d7d393bcf9d07b14c
Author: Oleh Fuks <olegfuk...@gmail.com>
AuthorDate: Fri Dec 6 13:09:59 2019 +0200

    [DLAB-1334] Error handling improvement for project actions
---
 .../epam/dlab/backendapi/service/impl/ProjectServiceImpl.java    | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

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 b3c3665..cd9e3eb 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
@@ -227,9 +227,11 @@ public class ProjectServiceImpl implements ProjectService {
 
                List<UserInstanceDTO> userInstanceDTOs = 
exploratoryDAO.fetchProjectExploratoriesWhereStatusIn(projectName,
                                Arrays.asList(UserInstanceStatus.CREATING, 
UserInstanceStatus.STARTING,
-                        UserInstanceStatus.CREATING_IMAGE, 
UserInstanceStatus.RECONFIGURING),
+                                               
UserInstanceStatus.CREATING_IMAGE, UserInstanceStatus.CONFIGURING,
+                                               
UserInstanceStatus.RECONFIGURING, UserInstanceStatus.STOPPING, 
UserInstanceStatus.TERMINATING),
                 UserInstanceStatus.CREATING, UserInstanceStatus.CONFIGURING, 
UserInstanceStatus.STARTING,
-                UserInstanceStatus.RECONFIGURING, 
UserInstanceStatus.CREATING_IMAGE);
+                               UserInstanceStatus.RECONFIGURING, 
UserInstanceStatus.CREATING_IMAGE, UserInstanceStatus.STOPPING,
+                               UserInstanceStatus.TERMINATING);
         if (edgeProgress || !userInstanceDTOs.isEmpty()) {
                        throw new ResourceConflictException((String.format("Can 
not %s environment because one of project " +
                                        "resource is in processing stage", 
action)));
@@ -241,7 +243,8 @@ public class ProjectServiceImpl implements ProjectService {
         return !endpoints.stream().allMatch(e -> 
exploratoryDAO.fetchProjectExploratoriesWhereStatusNotIn(
                 projectDTO.getName(), e.getName(), UserInstanceStatus.STOPPED, 
UserInstanceStatus.TERMINATED,
                 UserInstanceStatus.TERMINATING).isEmpty()) ||
-                endpoints.stream().anyMatch(e -> e.getStatus() == 
UserInstanceStatus.RUNNING);
+                               endpoints.stream().anyMatch(e -> 
Arrays.asList(UserInstanceStatus.RUNNING, UserInstanceStatus.STARTING)
+                                               .contains(e.getStatus()));
        }
 
        private boolean isCanBeTerminated(ProjectDTO projectDTO) {


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