Add region filter for use case and activity

Author: mcanoy

src/main/java/com/redhat/labs/lodestar/model/filter/ListFilterOptions.java

@@ -1,7 +1,6 @@
 package com.redhat.labs.lodestar.model.filter;
 
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -157,4 +156,25 @@ public Integer getNextPage() {
         return this.page == null ? null : this.page + 1;
     }
 
+    public Set<String> getV2Regions() {
+        Set<String> region = new HashSet<>();
+
+        if(search == null) {
+            return region;
+        }
+
+        String[] params = search.split("&");
+
+        for (String param : params) {
+            String[] keyValues = param.split("=");
+
+            if (keyValues[0].equals("engagement_region")) {
+                String[] regionsArray = keyValues[1].split(",");
+                Collections.addAll(region, regionsArray);
+            }
+        }
+
+        return region;
+    }
+
 }

src/main/java/com/redhat/labs/lodestar/rest/client/ActivityApiClient.java

@@ -37,7 +37,7 @@ public interface ActivityApiClient {
 
     @GET
     @Path("/latest")
-    List<Commit> getLatestActivity(@QueryParam("page") int page, @QueryParam("pageSize") int pageSize);
+    List<String> getLatestActivity(@QueryParam("page") int page, @QueryParam("pageSize") int pageSize, @QueryParam("regions") Set<String> regions);
 
     @GET
     @Path("/uuid/{engagementUuid}")

src/main/java/com/redhat/labs/lodestar/rest/client/UseCaseApiClient.java

@@ -9,6 +9,7 @@
 import javax.ws.rs.*;
 import javax.ws.rs.core.*;
 import java.util.List;
+import java.util.Set;
 
 @ApplicationScoped
 @RegisterRestClient(configKey = "lodestar.engagements.api")
@@ -17,7 +18,7 @@
 public interface UseCaseApiClient {
 
     @GET
-    Response getUseCases(@QueryParam("page") int page, @QueryParam("pageSize") int pageSize);//TODO sort????
+    Response getUseCases(@QueryParam("page") int page, @QueryParam("pageSize") int pageSize, @QueryParam("regions") Set<String> regions);//TODO sort????
 
     @GET
     @Path("{uuid}")

src/main/java/com/redhat/labs/lodestar/service/ActivityService.java

@@ -47,8 +47,8 @@ public Instant getLatestActivity(String engagementUuid) {
      * @param pageSize page size
      * @return A list of the last activity (commit) for each engagement
      */
-    public List<Commit> getLatestActivity(int page, int pageSize) {
-        return activityApiClient.getLatestActivity(page, pageSize);
+    public List<String> getLatestActivity(int page, int pageSize, Set<String> regions) {
+        return activityApiClient.getLatestActivity(page, pageSize, regions);
     }
 
     public Response getPaginatedActivityForUuid(String engagementUuid, int page, int pageSize) {

src/main/java/com/redhat/labs/lodestar/service/EngagementService.java

@@ -20,6 +20,7 @@
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
 import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.GenericType;
 import javax.ws.rs.core.Response;
 import java.time.Instant;
 import java.util.*;
@@ -81,6 +82,7 @@ public void flushCache() { //TODO
     //TODO cache this - btw - this caching will probably only work in a single pod sitch.
     // could continue to leverage the db or use distribute cache (back to Alpha!)
     public Engagement getEngagement(String uuid) {
+        LOGGER.debug("getting uuid {}", uuid);
         Engagement engagement = engagementApiClient.getEngagement(uuid);
         List<HostingEnvironment> hes = hostingEnvironmentService.getHostingEnvironments(uuid);
         List<Artifact> artifacts = artifactService.getArtifacts(uuid);
@@ -242,7 +244,7 @@ private void nullToEmpty(Engagement engagement) {
     /**
      * Returns Optional containing {@link Engagement} if found with given subdomain.
      * 
-     * @param subdomain
+     * @param subdomain check this
      * @return
      */
     public Response getBySubdomain(String engagementUuid, String subdomain) {
@@ -264,14 +266,6 @@ public void updateStatusAndCommits(Hook hook) {
 
         Engagement engagement = getByCustomerAndProjectName(hook.getCustomerName(), hook.getEngagementName());
 
-        // refresh entire engagement if requested
-        if (hook.containsAnyMessage(commitFilteredMessages)) {
-            activityService.postHook(hook);
-            getEngagement(engagement.getUuid());
-            LOGGER.debug("hook triggered refresh of engagement for project {}", hook.getProjectId());
-            return;
-        }
-
         // send update status event
         if (hook.didFileChange(statusFile)) {
             LOGGER.debug("Status update {}", hook.getProjectId());
@@ -288,6 +282,14 @@ public void updateStatusAndCommits(Hook hook) {
             //TODO should return the uuid from the post as header
             //TODO invalidate cache + load new into cache
         }
+
+        // refresh entire engagement if requested
+        if (hook.containsAnyMessage(commitFilteredMessages)) {
+            //TODO Need to call a single refresh of engagement in every service
+            LOGGER.debug("hook triggered refresh of engagement for project {}", hook.getProjectId());
+        }
+
+        getEngagement(engagement.getUuid());
     }
 
 
@@ -319,29 +321,20 @@ public Response getEngagementsPaged(ListFilterOptions listFilterOptions) {
         // we can just filter on engagement instead of hitting the activity service
         String sort = listFilterOptions.getSortFields().orElse("");
         int pageSize = listFilterOptions.getPerPage().orElse(5);
+
         if(pageSize == 5 && sort.equals("last_update")) {
-            List<Commit> activity = activityService.getLatestActivity(0,5);
-            List<Engagement> engagements = activity.stream().map(a -> getEngagement(a.getEngagementUuid())).collect(Collectors.toList());
+            List<String> activity = activityService.getLatestActivity(0,5, listFilterOptions.getV2Regions());
+            List<Engagement> engagements = activity.stream().map(this::getEngagement).collect(Collectors.toList());
             return Response.ok(engagements).build();
         }
 
         int page = listFilterOptions.getPage().orElse(1) - 1;
         pageSize = listFilterOptions.getPerPage().orElse(1000);
 
-        String search = listFilterOptions.getSearch().orElse("");
-        String[] params = search.split("&");
-
-        Set<String> region = new HashSet<>();
-        for (String param : params) {
-            String[] keyValues = param.split("=");
-
-            if (keyValues[0].equals("engagement_region")) {
-                String[] regionsArray = keyValues[1].split(",");
-                Collections.addAll(region, regionsArray);
-            }
-        }
-
-        return engagementApiClient.getEngagements(page, pageSize, region);
+        Response response = engagementApiClient.getEngagements(page, pageSize, listFilterOptions.getV2Regions());
+        List<Engagement> engagements = response.readEntity(new GenericType<>(){});
+        //engagements.forEach(e ->LOGGER.debug(" {} --- {} ", e.getProjectName(), e.getName() ));
+        return Response.ok(engagements).header("x-total-engagements", response.getHeaderString("x-total-engagements")).build();
     }
 
     /**
@@ -385,7 +378,7 @@ public Response getCategories(List<String> regions, ListFilterOptions filterOpti
     public Response getUseCases(ListFilterOptions filterOptions) {
         int page = filterOptions.getPage().orElse(1) -1;
         int pageSize = filterOptions.getPerPage().orElse(500);
-        return useCaseApiClient.getUseCases(page, pageSize);
+        return useCaseApiClient.getUseCases(page, pageSize, filterOptions.getV2Regions());
     }
 
     /**

src/test/java/com/redhat/labs/lodestar/resource/StatusResourceTest.java

@@ -3,10 +3,8 @@
 import com.redhat.labs.lodestar.model.Engagement;
 import com.redhat.labs.lodestar.model.Hook;
 import com.redhat.labs.lodestar.model.Status;
-import com.redhat.labs.lodestar.rest.client.ActivityApiClient;
-import com.redhat.labs.lodestar.rest.client.EngagementApiClient;
-import com.redhat.labs.lodestar.rest.client.EngagementStatusApiClient;
-import com.redhat.labs.lodestar.rest.client.StatusApiClient;
+import com.redhat.labs.lodestar.model.filter.ArtifactOptions;
+import com.redhat.labs.lodestar.rest.client.*;
 import com.redhat.labs.lodestar.utils.ResourceLoader;
 import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.junit.mockito.InjectMock;
@@ -20,6 +18,8 @@
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.Response;
 
+import java.util.Collections;
+
 import static io.restassured.RestAssured.given;
 import static org.hamcrest.CoreMatchers.is;
 
@@ -43,6 +43,22 @@ class StatusResourceTest {
     @RestClient
     ActivityApiClient activityApiClient;
 
+    @InjectMock
+    @RestClient
+    HostingEnvironmentApiClient hostingEnvironmentApiClient;
+
+    @InjectMock
+    @RestClient
+    ArtifactApiClient artifactApiClient;
+
+    @InjectMock
+    @RestClient
+    ParticipantApiClient participantApiClient;
+
+    @InjectMock
+    @RestClient
+    CategoryApiClient categoryApiClient;
+
     @BeforeEach
     void setUp() {
         String customer = "jello";
@@ -51,6 +67,7 @@ void setUp() {
         Engagement engagement = Engagement.builder().uuid(uuid1).customerName(customer).projectName(exists).build();
 
         Mockito.when(engagementApiClient.getEngagement(customer, exists)).thenReturn(engagement);
+        Mockito.when(engagementApiClient.getEngagement(uuid1)).thenReturn(engagement);
         Mockito.when(engagementApiClient.getEngagement(customer, "doesnotexist")).thenThrow(
                 new WebApplicationException(404)
         );
@@ -59,6 +76,9 @@ void setUp() {
         Mockito.when(engagementStatusApiClient.getEngagementStatus(uuid1)).thenReturn(status);
 
         Mockito.when(engagementStatusApiClient.updateEngagementStatus(uuid1)).thenReturn(Response.ok().build());
+
+        Mockito.when(artifactApiClient.getArtifacts(Mockito.any(ArtifactOptions.class)))
+                .thenReturn(javax.ws.rs.core.Response.ok(Collections.emptyList()).build());
     }
 
     @Test
@@ -76,9 +96,10 @@ void testStatusValid() {
             .statusCode(200);
 
         Mockito.verify(engagementApiClient).getEngagement("jello", "exists");
+        Mockito.verify(engagementApiClient).getEngagement("uuid1");
         Mockito.verify(engagementStatusApiClient).updateEngagementStatus("uuid1");
         Mockito.verify(engagementStatusApiClient).getEngagementStatus("uuid1");
-        Mockito.verify(activityApiClient, Mockito.times(0)).getActivityForUuid("uuid1");
+        Mockito.verify(activityApiClient).getActivityForUuid("uuid1");
     } 
 
     @Test

src/test/java/com/redhat/labs/lodestar/resource/UseCaseResourceTest.java

@@ -11,7 +11,8 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
-import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
 
 import static io.restassured.RestAssured.given;
 import static org.hamcrest.CoreMatchers.containsString;
@@ -27,13 +28,13 @@ public class UseCaseResourceTest {
     UseCaseApiClient useCaseApiClient;
 
     @Test
-    void testGetUseCase() throws Exception {
+    void testGetUseCase() {
 
         UseCase useCase = UseCase.builder().title("useCase1").description("use case 1").order(0).build();
-        javax.ws.rs.core.Response response = javax.ws.rs.core.Response.ok(Arrays.asList(useCase))
+        javax.ws.rs.core.Response response = javax.ws.rs.core.Response.ok(List.of(useCase))
                 .header("x-total-use-cases", 1).build();
 
-        Mockito.when(useCaseApiClient.getUseCases(0, 500)).thenReturn(response);
+        Mockito.when(useCaseApiClient.getUseCases(0, 500, Collections.emptySet())).thenReturn(response);
         given()
                 .auth()
                 .oauth2(validToken)