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 41b38a6 DLAB-000 added endpoint property to user instance dto
41b38a6 is described below
commit 41b38a6a534fffe4baffff61323e56e387d05851
Author: bhliva <[email protected]>
AuthorDate: Tue Jun 4 11:10:42 2019 +0300
DLAB-000 added endpoint property to user instance dto
---
.../src/main/java/com/epam/dlab/dto/UserInstanceDTO.java | 7 +++++++
.../main/java/com/epam/dlab/model/exploratory/Exploratory.java | 1 +
.../src/main/java/com/epam/dlab/backendapi/dao/ProjectDAO.java | 3 +++
.../main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java | 8 ++++++++
.../com/epam/dlab/backendapi/resources/ExploratoryResource.java | 4 +++-
.../epam/dlab/backendapi/service/impl/ExploratoryServiceImpl.java | 3 ++-
6 files changed, 24 insertions(+), 2 deletions(-)
diff --git
a/services/dlab-model/src/main/java/com/epam/dlab/dto/UserInstanceDTO.java
b/services/dlab-model/src/main/java/com/epam/dlab/dto/UserInstanceDTO.java
index b509942..1cb4efc 100644
--- a/services/dlab-model/src/main/java/com/epam/dlab/dto/UserInstanceDTO.java
+++ b/services/dlab-model/src/main/java/com/epam/dlab/dto/UserInstanceDTO.java
@@ -53,6 +53,8 @@ public class UserInstanceDTO {
private String imageVersion;
@JsonProperty("project")
private String project;
+ @JsonProperty("endpoint")
+ private String endpoint;
@JsonProperty("template_name")
private String templateName;
@JsonProperty
@@ -167,4 +169,9 @@ public class UserInstanceDTO {
setLibs(libs);
return this;
}
+
+ public UserInstanceDTO withEndpoint(String endpoint) {
+ setEndpoint(endpoint);
+ return this;
+ }
}
diff --git
a/services/dlab-model/src/main/java/com/epam/dlab/model/exploratory/Exploratory.java
b/services/dlab-model/src/main/java/com/epam/dlab/model/exploratory/Exploratory.java
index 923adab..dd8dcbb 100644
---
a/services/dlab-model/src/main/java/com/epam/dlab/model/exploratory/Exploratory.java
+++
b/services/dlab-model/src/main/java/com/epam/dlab/model/exploratory/Exploratory.java
@@ -34,5 +34,6 @@ public class Exploratory {
private final String templateName;
private final String shape;
private final String imageName;
+ private final String endpoint;
private final List<ClusterConfig> clusterConfig;
}
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 26f4920..f7d4ce2 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
@@ -4,6 +4,7 @@ import com.epam.dlab.backendapi.domain.ProjectDTO;
import java.util.List;
import java.util.Optional;
+import java.util.Set;
public interface ProjectDAO {
List<ProjectDTO> getProjects();
@@ -19,4 +20,6 @@ public interface ProjectDAO {
Optional<Integer> getAllowedBudget(String project);
void updateBudget(String project, Integer budget);
+
+ boolean anyProjectAssigned(Set<String> groups);
}
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 478cebd..3d2bc02 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
@@ -6,12 +6,15 @@ import org.bson.conversions.Bson;
import java.util.List;
import java.util.Optional;
+import java.util.Set;
import static com.mongodb.client.model.Filters.eq;
+import static com.mongodb.client.model.Filters.in;
public class ProjectDAOImpl extends BaseDAO implements ProjectDAO {
private static final String PROJECTS_COLLECTION = "Projects";
+ private static final String GROUPS = "groups";
@Override
public List<ProjectDTO> getProjects() {
@@ -49,6 +52,11 @@ public class ProjectDAOImpl extends BaseDAO implements
ProjectDAO {
updateOne(PROJECTS_COLLECTION, projectCondition(project), new
Document(SET, new Document("budget", budget)));
}
+ @Override
+ public boolean anyProjectAssigned(Set<String> groups) {
+ return false;
+ }
+
private Bson projectCondition(String name) {
return eq("name", name);
}
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 be7ad6a..e6aa295 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
@@ -167,6 +167,8 @@ public class ExploratoryResource implements ExploratoryAPI {
.templateName(formDTO.getTemplateName())
.version(formDTO.getVersion())
.clusterConfig(formDTO.getClusterConfig())
- .shape(formDTO.getShape()).build();
+ .shape(formDTO.getShape())
+ .endpoint(formDTO.getEndpoint())
+ .build();
}
}
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 a03f9c9..0489f71 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
@@ -320,7 +320,8 @@ public class ExploratoryServiceImpl implements
ExploratoryService {
.withTemplateName(exploratory.getTemplateName())
.withClusterConfig(exploratory.getClusterConfig())
.withShape(exploratory.getShape())
- .withProject(project);
+ .withProject(project)
+ .withEndpoint(exploratory.getEndpoint());
if (StringUtils.isNotBlank(exploratory.getImageName())) {
final List<LibInstallDTO> libInstallDtoList =
getImageRelatedLibraries(userInfo, exploratory
.getImageName());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
