From 616c09a31a5a280e862580604f9a73eeaec79a96 Mon Sep 17 00:00:00 2001 From: Martin Lowe Date: Fri, 23 Sep 2022 14:30:47 -0400 Subject: [PATCH 1/2] Fix WG service issue, sets not properly paginating --- .../membership/portal/service/WorkingGroupsService.java | 3 +-- .../portal/service/impl/DefaultInterestGroupService.java | 1 + .../portal/service/impl/DefaultWorkingGroupsService.java | 6 ++---- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/portal/src/main/java/org/eclipsefoundation/membership/portal/service/WorkingGroupsService.java b/portal/src/main/java/org/eclipsefoundation/membership/portal/service/WorkingGroupsService.java index d9382a93..c4ef5c8e 100644 --- a/portal/src/main/java/org/eclipsefoundation/membership/portal/service/WorkingGroupsService.java +++ b/portal/src/main/java/org/eclipsefoundation/membership/portal/service/WorkingGroupsService.java @@ -13,7 +13,6 @@ package org.eclipsefoundation.membership.portal.service; import java.util.List; import java.util.Map; -import java.util.Set; import org.eclipsefoundation.membership.portal.model.WorkingGroupMap.WorkingGroup; @@ -33,7 +32,7 @@ public interface WorkingGroupsService { * @param projectStatus optional, statuses to include in result set * @return set of working groups matching optional filters if present, otherwise all available working groups */ - public Set get(String parentOrganization, List projectStatus); + public List get(String parentOrganization, List projectStatus); public WorkingGroup getByName(String name); diff --git a/portal/src/main/java/org/eclipsefoundation/membership/portal/service/impl/DefaultInterestGroupService.java b/portal/src/main/java/org/eclipsefoundation/membership/portal/service/impl/DefaultInterestGroupService.java index 3a735981..5126c375 100644 --- a/portal/src/main/java/org/eclipsefoundation/membership/portal/service/impl/DefaultInterestGroupService.java +++ b/portal/src/main/java/org/eclipsefoundation/membership/portal/service/impl/DefaultInterestGroupService.java @@ -117,6 +117,7 @@ public class DefaultInterestGroupService implements InterestGroupService { List igUsers = ig.get().getLeads(); igUsers.addAll(ig.get().getParticipants()); List usernames = igUsers.stream().map(User::getUsername).distinct().collect(Collectors.toList()); + LOGGER.debug("Looking up users in relation to IG {}: {}", igId, usernames); // batch requests, reduce, deduplicate, and augment data before returning return Lists .partition(usernames, 25) diff --git a/portal/src/main/java/org/eclipsefoundation/membership/portal/service/impl/DefaultWorkingGroupsService.java b/portal/src/main/java/org/eclipsefoundation/membership/portal/service/impl/DefaultWorkingGroupsService.java index afaec1fb..b67241dc 100644 --- a/portal/src/main/java/org/eclipsefoundation/membership/portal/service/impl/DefaultWorkingGroupsService.java +++ b/portal/src/main/java/org/eclipsefoundation/membership/portal/service/impl/DefaultWorkingGroupsService.java @@ -15,11 +15,9 @@ import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Map.Entry; -import java.util.Set; import java.util.stream.Collectors; import javax.annotation.PostConstruct; @@ -76,8 +74,8 @@ public class DefaultWorkingGroupsService implements WorkingGroupsService { } @Override - public Set get(String parentOrganization, List projectStatuses) { - return new HashSet<>( + public List get(String parentOrganization, List projectStatuses) { + return new ArrayList<>( wgs.entrySet().stream().filter(e -> filterByParentOrganization(parentOrganization, e.getValue())) .filter(e -> filterByProjectStatuses(projectStatuses, e.getValue())) .collect(Collectors.toMap(Entry::getKey, Entry::getValue)).values()); -- GitLab From 51c34aa362c9987954f850bd1e699ae5231a939d Mon Sep 17 00:00:00 2001 From: Martin Lowe Date: Fri, 23 Sep 2022 14:31:32 -0400 Subject: [PATCH 2/2] Update k8s for prod to use 1 replica --- src/main/k8s/production.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/k8s/production.yml b/src/main/k8s/production.yml index bf73860b..eaa65cb6 100644 --- a/src/main/k8s/production.yml +++ b/src/main/k8s/production.yml @@ -11,7 +11,7 @@ spec: matchLabels: app: eclipsefdn-react-membership environment: production - replicas: 2 + replicas: 1 template: metadata: labels: -- GitLab