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/24 09:42:10 UTC

[incubator-dlab] branch develop updated: DLAB-936 added possibility to set quote for multiple projects

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 55669ec  DLAB-936 added possibility to set quote for multiple projects
55669ec is described below

commit 55669ecc3a3bcfd8f15d916bb6d656ddce950f29
Author: bhliva <bo...@epam.com>
AuthorDate: Wed Jul 24 12:41:58 2019 +0300

    DLAB-936 added possibility to set quote for multiple projects
---
 .../com/epam/dlab/backendapi/resources/ProjectResource.java    | 10 ++++++++--
 .../java/com/epam/dlab/backendapi/service/ProjectService.java  |  2 ++
 .../epam/dlab/backendapi/service/impl/ProjectServiceImpl.java  |  5 +++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java
index 52ffdee..397d12d 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java
@@ -25,6 +25,8 @@ import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.UriInfo;
 import java.net.URI;
+import java.util.List;
+import java.util.stream.Collectors;
 
 @Path("project")
 public class ProjectResource {
@@ -204,8 +206,12 @@ public class ProjectResource {
 	public Response updateBudget(
 			@Parameter(hidden = true) @Auth UserInfo userInfo,
 			@Parameter(description = "Project name")
-					UpdateProjectBudgetDTO dto) {
-		projectService.updateBudget(dto.getProject(), dto.getBudget());
+					List<UpdateProjectBudgetDTO> dtos) {
+		final List<ProjectDTO> projects = dtos
+				.stream()
+				.map(dto -> new ProjectDTO(dto.getProject(), null, null, null, null, dto.getBudget()))
+				.collect(Collectors.toList());
+		projectService.updateBudget(projects);
 		return Response.ok().build();
 	}
 }
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 27451bc..4c1a69c 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
@@ -27,5 +27,7 @@ public interface ProjectService {
 
 	void updateBudget(String project, Integer budget);
 
+	void updateBudget(List<ProjectDTO> projects);
+
 	boolean isAnyProjectAssigned(UserInfo userInfo);
 }
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 22e2f7e..2b042b8 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
@@ -116,6 +116,11 @@ public class ProjectServiceImpl implements ProjectService {
 	}
 
 	@Override
+	public void updateBudget(List<ProjectDTO> projects) {
+		projects.forEach(p -> projectDAO.updateBudget(p.getName(), p.getBudget()));
+	}
+
+	@Override
 	public boolean isAnyProjectAssigned(UserInfo userInfo) {
 		final Set<String> userGroups = concat(userInfo.getRoles().stream(),
 				userGroupDao.getUserGroups(userInfo.getName()).stream())


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