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/03/25 10:07:28 UTC
[incubator-dlab] branch DLAB-1661 updated: Added 'cloud' parameter
This is an automated email from the ASF dual-hosted git repository.
ofuks pushed a commit to branch DLAB-1661
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1661 by this push:
new d73056e Added 'cloud' parameter
new d5012da Merge remote-tracking branch 'origin/DLAB-1661' into DLAB-1661
d73056e is described below
commit d73056e66f3bff7a06ddd2509cdb881434217185
Author: Oleh Fuks <ol...@gmail.com>
AuthorDate: Wed Mar 25 12:06:38 2020 +0200
Added 'cloud' parameter
---
.../src/main/java/com/epam/dlab/backendapi/dao/UserRoleDaoImpl.java | 2 ++
.../main/java/com/epam/dlab/backendapi/resources/dto/UserRoleDto.java | 2 ++
2 files changed, 4 insertions(+)
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/UserRoleDaoImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/UserRoleDaoImpl.java
index f4deb0a..fffc70b 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/UserRoleDaoImpl.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/UserRoleDaoImpl.java
@@ -56,6 +56,7 @@ public class UserRoleDaoImpl extends BaseDAO implements UserRoleDao {
private static final String GROUPS_FIELD = "groups";
private static final String DESCRIPTION = "description";
private static final String TYPE = "type";
+ private static final String CLOUD = "cloud";
private static final String ROLES = "roles";
private static final String GROUPS = "$groups";
private static final String GROUP = "group";
@@ -171,6 +172,7 @@ public class UserRoleDaoImpl extends BaseDAO implements UserRoleDao {
return new Document().append(ID, "$" + ID)
.append(DESCRIPTION, "$" + DESCRIPTION)
.append(TYPE, "$" + TYPE)
+ .append(CLOUD, "$" + CLOUD)
.append(USERS_FIELD, "$" + USERS_FIELD)
.append(EXPLORATORY_SHAPES_FIELD, "$" + EXPLORATORY_SHAPES_FIELD)
.append(PAGES_FIELD, "$" + PAGES_FIELD)
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/UserRoleDto.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/UserRoleDto.java
index b1d3337..5c90602 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/UserRoleDto.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/UserRoleDto.java
@@ -18,6 +18,7 @@
*/
package com.epam.dlab.backendapi.resources.dto;
+import com.epam.dlab.cloud.CloudProvider;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Getter;
@@ -35,6 +36,7 @@ public class UserRoleDto {
private String id;
private String description;
private Type type;
+ private CloudProvider cloud;
private Set<String> pages;
private Set<String> computationals;
private Set<String> exploratories;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org