This is an automated email from the ASF dual-hosted git repository. ofuks pushed a commit to branch DLAB-1357 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1357 by this push: new 0f9a92f Fixed bug with displaying on 'List of Resources' page 0f9a92f is described below commit 0f9a92f3e16755902a49faa70f9e89f086d3e5c9 Author: Oleh Fuks <olegfuk...@gmail.com> AuthorDate: Mon Feb 3 14:52:40 2020 +0200 Fixed bug with displaying on 'List of Resources' page --- .../epam/dlab/backendapi/dao/ExploratoryDAO.java | 29 +++++++++++++++++----- .../impl/InfrastructureInfoServiceBase.java | 2 +- 2 files changed, 24 insertions(+), 7 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 9993171..037b4cc 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 @@ -21,7 +21,11 @@ package com.epam.dlab.backendapi.dao; import com.epam.dlab.backendapi.util.DateRemoverUtil; -import com.epam.dlab.dto.*; +import com.epam.dlab.dto.ResourceURL; +import com.epam.dlab.dto.SchedulerJobDTO; +import com.epam.dlab.dto.StatusEnvBaseDTO; +import com.epam.dlab.dto.UserInstanceDTO; +import com.epam.dlab.dto.UserInstanceStatus; import com.epam.dlab.dto.aws.computational.ClusterConfig; import com.epam.dlab.dto.exploratory.ExploratoryStatusDTO; import com.epam.dlab.exceptions.DlabException; @@ -35,13 +39,26 @@ import org.bson.conversions.Bson; import java.time.LocalDateTime; import java.time.ZoneId; -import java.util.*; +import java.util.Collections; +import java.util.Date; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; import static com.epam.dlab.backendapi.dao.MongoCollections.USER_INSTANCES; import static com.epam.dlab.backendapi.dao.SchedulerJobDAO.SCHEDULER_DATA; -import static com.mongodb.client.model.Filters.*; -import static com.mongodb.client.model.Projections.*; +import static com.mongodb.client.model.Filters.and; +import static com.mongodb.client.model.Filters.eq; +import static com.mongodb.client.model.Filters.in; +import static com.mongodb.client.model.Filters.not; +import static com.mongodb.client.model.Filters.or; +import static com.mongodb.client.model.Projections.exclude; +import static com.mongodb.client.model.Projections.excludeId; +import static com.mongodb.client.model.Projections.fields; +import static com.mongodb.client.model.Projections.include; import static com.mongodb.client.model.Updates.set; import static java.util.stream.Collectors.toList; import static org.apache.commons.lang3.StringUtils.EMPTY; @@ -101,8 +118,8 @@ public class ExploratoryDAO extends BaseDAO { * @param user name * @return list of user resources */ - public Iterable<Document> findExploratory(String user) { - return find(USER_INSTANCES, eq(USER, user), + public Iterable<Document> findExploratory(String user, String project) { + return find(USER_INSTANCES, and(eq(USER, user), eq(PROJECT, project)), fields(exclude(ExploratoryLibDAO.EXPLORATORY_LIBS, ExploratoryLibDAO.COMPUTATIONAL_LIBS, SCHEDULER_DATA, EXPLORATORY_USER, EXPLORATORY_PASS))); } diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/InfrastructureInfoServiceBase.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/InfrastructureInfoServiceBase.java index 651d2ea..12ae644 100644 --- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/InfrastructureInfoServiceBase.java +++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/InfrastructureInfoServiceBase.java @@ -71,7 +71,7 @@ public abstract class InfrastructureInfoServiceBase<T> implements Infrastructure try { return projectService.getUserProjects(user, false).stream() .map(p -> new ProjectInfrastructureInfo(p.getName(), billingDAO.getBillingProjectQuoteUsed(p.getName()), - getSharedInfo(p.getName()), expDAO.findExploratory(user.getName()), p.getOdahu())) + getSharedInfo(p.getName()), expDAO.findExploratory(user.getName(), p.getName()), p.getOdahu())) .collect(Collectors.toList()); } catch (Exception e) { log.error("Could not load list of provisioned resources for user: {}", user, e); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org