This is an automated email from the ASF dual-hosted git repository. ofuks pushed a commit to branch DLAB-1571 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit d96075ee5d89cd918f606a0947f1bdfcefcfa23e Author: Oleh Fuks <[email protected]> AuthorDate: Sun Mar 29 22:57:49 2020 +0300 Admin per project --- .../epam/dlab/backendapi/dao/ExploratoryDAO.java | 4 ++ .../backendapi/service/ExploratoryService.java | 4 ++ .../service/impl/BillingServiceImpl.java | 64 +++++++++++++-------- .../service/impl/ExploratoryServiceImpl.java | 10 ++++ .../impl/InfrastructureInfoServiceImpl.java | 3 +- .../resources/UserGroupResourceTest.java | 67 ---------------------- .../service/impl/UserGroupServiceImplTest.java | 10 ---- 7 files changed, 60 insertions(+), 102 deletions(-) diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ExploratoryDAO.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ExploratoryDAO.java index cbe1c7f..b5ef6c2 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ExploratoryDAO.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ExploratoryDAO.java @@ -140,6 +140,10 @@ public class ExploratoryDAO extends BaseDAO { return getUserInstances(and(eq(PROJECT, project)), true); } + public List<UserInstanceDTO> fetchExploratoryFieldsForProjectWithComp(List<String> projects) { + return getUserInstances(and(in(PROJECT, projects)), true); + } + public List<UserInstanceDTO> findExploratories(String project, String endpoint, String user) { return getUserInstances(and(eq(PROJECT, project), eq(ENDPOINT, endpoint), eq(USER, user)), true); } diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ExploratoryService.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ExploratoryService.java index f6bcb64..5a43fa6 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ExploratoryService.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/ExploratoryService.java @@ -21,6 +21,7 @@ package com.epam.dlab.backendapi.service; import com.epam.dlab.auth.UserInfo; +import com.epam.dlab.backendapi.domain.ProjectDTO; import com.epam.dlab.backendapi.resources.dto.ExploratoryCreatePopUp; import com.epam.dlab.dto.UserInstanceDTO; import com.epam.dlab.dto.UserInstanceStatus; @@ -29,6 +30,7 @@ import com.epam.dlab.model.exploratory.Exploratory; import java.util.List; import java.util.Optional; +import java.util.Set; public interface ExploratoryService { @@ -48,6 +50,8 @@ public interface ExploratoryService { List<UserInstanceDTO> findAll(); + List<UserInstanceDTO> findAll(Set<ProjectDTO> projects); + List<ClusterConfig> getClusterConfig(UserInfo user, String project, String exploratoryName); ExploratoryCreatePopUp getUserInstances(UserInfo user); diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/BillingServiceImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/BillingServiceImpl.java index c710a92..8e07202 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/BillingServiceImpl.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/BillingServiceImpl.java @@ -56,9 +56,11 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.Comparator; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Objects; +import java.util.Set; import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; @@ -78,6 +80,7 @@ public class BillingServiceImpl implements BillingService { private final ExploratoryService exploratoryService; private final SelfServiceApplicationConfiguration configuration; private final RESTService provisioningService; + private final String sbn; @Inject public BillingServiceImpl(ProjectService projectService, EndpointService endpointService, @@ -88,6 +91,7 @@ public class BillingServiceImpl implements BillingService { this.exploratoryService = exploratoryService; this.configuration = configuration; this.provisioningService = provisioningService; + sbn = configuration.getServiceBaseName(); } @Override @@ -98,7 +102,7 @@ public class BillingServiceImpl implements BillingService { double sum = billingReportLines.stream().mapToDouble(BillingReportLine::getCost).sum(); String currency = billingReportLines.stream().map(BillingReportLine::getCurrency).distinct().count() == 1 ? billingReportLines.get(0).getCurrency() : null; return BillingReport.builder() - .sbn(configuration.getServiceBaseName()) + .sbn(sbn) .reportLines(billingReportLines) .usageDateFrom(min) .usageDateTo(max) @@ -126,36 +130,52 @@ public class BillingServiceImpl implements BillingService { @Override public List<BillingReportLine> getBillingReportLines(UserInfo user, BillingFilter filter) { setUserFilter(user, filter); - final String serviceBaseName = configuration.getServiceBaseName(); - final Stream<BillingReportLine> ssnBillingDataStream = BillingUtils.ssnBillingDataStream(serviceBaseName); - final Stream<BillingReportLine> billableUserInstances = exploratoryService.findAll() + Set<ProjectDTO> projects = new HashSet<>(projectService.getProjects(user)); + projects.addAll(projectService.getUserProjects(user, false)); + + final Map<String, BillingReportLine> billableResources = getBillableResources(user, projects); + + List<BillingReportLine> billingReport = getRemoteBillingData(user) .stream() - .filter(userInstance -> Objects.nonNull(userInstance.getExploratoryId())) - .flatMap(ui -> BillingUtils.exploratoryBillingDataStream(ui, configuration.getMaxSparkInstanceCount())); - final Stream<BillingReportLine> billableEdges = projectService.getProjects() + .filter(getBillingDataFilter(filter)) + .filter(bd -> billableResources.containsKey(bd.getTag())) + .map(bd -> toBillingData(bd, billableResources.get(bd.getTag()))) + .filter(getBillingReportFilter(filter)) + .collect(Collectors.toList()); + log.debug("Billing report: {}", billingReport); + + return billingReport; + } + + private Map<String, BillingReportLine> getBillableResources(UserInfo user, Set<ProjectDTO> projects) { + Stream<BillingReportLine> billableAdminResources = Stream.empty(); + final Stream<BillingReportLine> billableEdges = projects .stream() .collect(Collectors.toMap(ProjectDTO::getName, ProjectDTO::getEndpoints)) .entrySet() .stream() - .flatMap(e -> projectEdges(serviceBaseName, e.getKey(), e.getValue())); - final Stream<BillingReportLine> billableSharedEndpoints = endpointService.getEndpoints() + .flatMap(e -> projectEdges(sbn, e.getKey(), e.getValue())); + final Stream<BillingReportLine> billableUserInstances = exploratoryService.findAll(projects) .stream() - .flatMap(endpoint -> BillingUtils.sharedEndpointBillingDataStream(endpoint.getName(), serviceBaseName)); + .filter(userInstance -> Objects.nonNull(userInstance.getExploratoryId())) + .flatMap(ui -> BillingUtils.exploratoryBillingDataStream(ui, configuration.getMaxSparkInstanceCount())); - final Map<String, BillingReportLine> billableResources = Stream.of(billableUserInstances, billableEdges, ssnBillingDataStream, billableSharedEndpoints) + if (UserRoles.isAdmin(user)) { + final Stream<BillingReportLine> ssnBillingDataStream = BillingUtils.ssnBillingDataStream(sbn); + final Stream<BillingReportLine> billableSharedEndpoints = endpointService.getEndpoints() + .stream() + .flatMap(endpoint -> BillingUtils.sharedEndpointBillingDataStream(endpoint.getName(), sbn)); + + billableAdminResources = Stream.of(ssnBillingDataStream, billableSharedEndpoints) + .flatMap(s -> s); + } + + final Map<String, BillingReportLine> billableResources = Stream.of(billableEdges, billableUserInstances, billableAdminResources) .flatMap(s -> s) .collect(Collectors.toMap(BillingReportLine::getDlabId, b -> b)); log.debug("Billable resources are: {}", billableResources); - List<BillingReportLine> billingReport = getRemoteBillingData(user) - .stream() - .filter(getBillingDataFilter(filter)) - .map(bd -> toBillingData(bd, getOrDefault(billableResources, bd.getTag()))) - .filter(getBillingReportFilter(filter)) - .collect(Collectors.toList()); - log.debug("Billing report: {}", billingReport); - - return billingReport; + return billableResources; } private Stream<BillingReportLine> projectEdges(String serviceBaseName, String projectName, List<ProjectEndpointDTO> endpoints) { @@ -165,10 +185,6 @@ public class BillingServiceImpl implements BillingService { endpoint.getStatus().toString())); } - private BillingReportLine getOrDefault(Map<String, BillingReportLine> billableResources, String tag) { - return billableResources.getOrDefault(tag, BillingReportLine.builder().dlabId(tag).build()); - } - public List<BillingData> getExploratoryRemoteBillingData(UserInfo user, String endpoint, List<UserInstanceDTO> userInstanceDTOS) { List<String> dlabIds = null; try { 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 ffa3a6b..6a2a615 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 @@ -61,6 +61,7 @@ import org.apache.commons.lang3.StringUtils; import java.util.List; import java.util.Map; import java.util.Optional; +import java.util.Set; import java.util.stream.Collectors; import static com.epam.dlab.dto.UserInstanceStatus.CREATING; @@ -199,6 +200,15 @@ public class ExploratoryServiceImpl implements ExploratoryService { } @Override + public List<UserInstanceDTO> findAll(Set<ProjectDTO> projects) { + List<String> projectNames = projects + .stream() + .map(ProjectDTO::getName) + .collect(Collectors.toList()); + return exploratoryDAO.fetchExploratoryFieldsForProjectWithComp(projectNames); + } + + @Override public List<ClusterConfig> getClusterConfig(UserInfo user, String project, String exploratoryName) { return exploratoryDAO.getClusterConfig(user.getName(), project, exploratoryName); } diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/InfrastructureInfoServiceImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/InfrastructureInfoServiceImpl.java index 16de358..6d46d71 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/InfrastructureInfoServiceImpl.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/InfrastructureInfoServiceImpl.java @@ -29,8 +29,8 @@ import com.epam.dlab.backendapi.domain.ProjectEndpointDTO; import com.epam.dlab.backendapi.resources.dto.HealthStatusEnum; import com.epam.dlab.backendapi.resources.dto.HealthStatusPageDTO; import com.epam.dlab.backendapi.resources.dto.ProjectInfrastructureInfo; -import com.epam.dlab.backendapi.service.BillingService; import com.epam.dlab.backendapi.roles.UserRoles; +import com.epam.dlab.backendapi.service.BillingService; import com.epam.dlab.backendapi.service.EndpointService; import com.epam.dlab.backendapi.service.InfrastructureInfoService; import com.epam.dlab.backendapi.service.ProjectService; @@ -48,6 +48,7 @@ import org.bson.Document; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/services/self-service/src/test/java/com/epam/dlab/backendapi/resources/UserGroupResourceTest.java b/services/self-service/src/test/java/com/epam/dlab/backendapi/resources/UserGroupResourceTest.java index ec2f73e..713eda9 100644 --- a/services/self-service/src/test/java/com/epam/dlab/backendapi/resources/UserGroupResourceTest.java +++ b/services/self-service/src/test/java/com/epam/dlab/backendapi/resources/UserGroupResourceTest.java @@ -21,15 +21,11 @@ package com.epam.dlab.backendapi.resources; import com.epam.dlab.auth.UserInfo; import com.epam.dlab.backendapi.dao.ProjectDAO; -import com.epam.dlab.backendapi.domain.ProjectDTO; import com.epam.dlab.backendapi.resources.dto.GroupDTO; -import com.epam.dlab.backendapi.resources.dto.UpdateRoleGroupDto; -import com.epam.dlab.backendapi.resources.dto.UpdateUserGroupDto; import com.epam.dlab.backendapi.resources.dto.UserGroupDto; import com.epam.dlab.backendapi.service.UserGroupService; import io.dropwizard.auth.AuthenticationException; import io.dropwizard.testing.junit.ResourceTestRule; -import org.apache.commons.lang3.StringUtils; import org.apache.http.HttpStatus; import org.junit.Before; import org.junit.Rule; @@ -41,11 +37,9 @@ import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import java.util.Collections; -import java.util.HashSet; import java.util.List; import java.util.Set; -import static java.util.Collections.singleton; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.any; @@ -153,20 +147,6 @@ public class UserGroupResourceTest extends TestBase { } @Test - public void addRolesToGroupWithValidationException() { - - final Response response = resources.getJerseyTest() - .target("/group/role") - .request() - .header("Authorization", "Bearer " + TOKEN) - .put(Entity.json(new UpdateRoleGroupDto(singleton(ROLE_ID), StringUtils.EMPTY))); - - assertEquals(HttpStatus.SC_UNPROCESSABLE_ENTITY, response.getStatus()); - - verifyZeroInteractions(userGroupService); - } - - @Test public void deleteGroup() { final Response response = resources.getJerseyTest() .target("/group/" + GROUP) @@ -181,47 +161,6 @@ public class UserGroupResourceTest extends TestBase { verifyNoMoreInteractions(userGroupService); } - @Test - public void deleteGroupFromRoleWithValidationException() { - final Response response = resources.getJerseyTest() - .target("/group/role") - .queryParam("group", GROUP) - .request() - .header("Authorization", "Bearer " + TOKEN) - .delete(); - - assertEquals(HttpStatus.SC_BAD_REQUEST, response.getStatus()); - - verifyZeroInteractions(userGroupService); - } - - @Test - public void addUserToGroupWithValidationException() { - final Response response = resources.getJerseyTest() - .target("/group/user") - .request() - .header("Authorization", "Bearer " + TOKEN) - .put(Entity.json(new UpdateUserGroupDto(StringUtils.EMPTY, singleton(USER)))); - - assertEquals(HttpStatus.SC_UNPROCESSABLE_ENTITY, response.getStatus()); - - verifyZeroInteractions(userGroupService); - } - - @Test - public void deleteUserFromGroupWithValidationException() { - final Response response = resources.getJerseyTest() - .target("/group/user") - .queryParam("group", GROUP) - .request() - .header("Authorization", "Bearer " + TOKEN) - .delete(); - - assertEquals(HttpStatus.SC_BAD_REQUEST, response.getStatus()); - - verifyZeroInteractions(userGroupService); - } - private UserGroupDto getUserGroup() { return new UserGroupDto(GROUP, Collections.emptyList(), Collections.emptySet()); } @@ -233,10 +172,4 @@ public class UserGroupResourceTest extends TestBase { dto.setUsers(Collections.singleton(USER)); return dto; } - - private List<ProjectDTO> getProjects() { - return Collections.singletonList(ProjectDTO.builder() - .groups(new HashSet<>(Collections.singletonList(GROUP))) - .build()); - } } \ No newline at end of file diff --git a/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/UserGroupServiceImplTest.java b/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/UserGroupServiceImplTest.java index e6b0572..4fec7c6 100644 --- a/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/UserGroupServiceImplTest.java +++ b/services/self-service/src/test/java/com/epam/dlab/backendapi/service/impl/UserGroupServiceImplTest.java @@ -170,16 +170,6 @@ public class UserGroupServiceImplTest extends TestBase { userGroupService.removeGroup(GROUP); } - @Test - public void updateGroup() { - userGroupService.updateGroup(getUserInfo(), GROUP, Collections.singleton(ROLE_ID), Collections.singleton(USER)); - - verify(userGroupDao).updateUsers(GROUP, Collections.singleton(USER)); - verify(userRoleDao).removeGroupWhenRoleNotIn(GROUP, Collections.singleton(ROLE_ID)); - verify(userRoleDao).addGroupToRole(Collections.singleton(GROUP), Collections.singleton(ROLE_ID)); - verifyNoMoreInteractions(userRoleDao, userGroupDao); - } - private UserGroupDto getUserGroup() { return new UserGroupDto(GROUP, Collections.emptyList(), Collections.emptySet()); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
