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/08/06 09:42:06 UTC

[incubator-dlab] branch develop updated: DLAB-974 fixed issue with billing report when there is a project with status FAILED/CREATING

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

bhliva 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 a0e2b6b  DLAB-974 fixed issue with billing report when there is a project with status FAILED/CREATING
a0e2b6b is described below

commit a0e2b6b08847b6b0b2ef4f542fbef514cc558459
Author: bhliva <bo...@epam.com>
AuthorDate: Tue Aug 6 12:40:13 2019 +0300

    DLAB-974 fixed issue with billing report when there is a project with status FAILED/CREATING
---
 .../src/main/java/com/epam/dlab/backendapi/domain/ProjectDTO.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectDTO.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectDTO.java
index 08b02ac..07d018d 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectDTO.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectDTO.java
@@ -51,6 +51,10 @@ public class ProjectDTO {
 				return NOT_ACTIVE;
 			} else if (userInstanceStatus == UserInstanceStatus.STARTING) {
 				return ACTIVATING;
+			} else if (userInstanceStatus == UserInstanceStatus.CREATING) {
+				return CREATING;
+			} else if (userInstanceStatus == UserInstanceStatus.FAILED) {
+				return FAILED;
 			}
 			return Status.valueOf(userInstanceStatus.name());
 		}
@@ -68,6 +72,10 @@ public class ProjectDTO {
 				return UserInstanceStatus.TERMINATING;
 			} else if (status == DELETED) {
 				return UserInstanceStatus.TERMINATED;
+			} else if (status == CREATING) {
+				return UserInstanceStatus.CREATING;
+			} else if (status == FAILED) {
+				return UserInstanceStatus.FAILED;
 			}
 			throw new IllegalArgumentException();
 		}


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