paged results for groups and projects

Author: mcanoy

src/main/java/com/redhat/labs/omp/rest/client/GitLabService.java

@@ -23,7 +23,6 @@
 import com.redhat.labs.omp.models.gitlab.Group;
 import com.redhat.labs.omp.models.gitlab.Hook;
 import com.redhat.labs.omp.models.gitlab.Project;
-import com.redhat.labs.omp.models.gitlab.ProjectSearchResults;
 import com.redhat.labs.omp.resources.filter.Logged;
 
 @Path("/api/v4")
@@ -62,7 +61,7 @@ public interface GitLabService {
     @Logged
     @Path("/groups")
     @Produces("application/json")
-    List<Group> getGroupByName(@QueryParam("search") @Encoded String name);
+    Response getGroupByName(@QueryParam("search") @Encoded String name, @QueryParam("per_page") int perPage, @QueryParam("page") int page);
 
     @GET
     @Logged
@@ -88,7 +87,7 @@ public interface GitLabService {
     @Logged
     @Path("/projects")
     @Produces("application/json")
-    List<ProjectSearchResults> getProjectByName(@QueryParam("search") @Encoded String name);
+    Response getProjectByName(@QueryParam("search") @Encoded String name, @QueryParam("per_page") int perPage, @QueryParam("page") int page);
 
     @GET
     @Logged

src/main/java/com/redhat/labs/omp/service/GroupService.java

@@ -5,12 +5,16 @@
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
+import javax.ws.rs.core.GenericType;
+import javax.ws.rs.core.Response;
 
+import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.eclipse.microprofile.rest.client.inject.RestClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.redhat.labs.exception.UnexpectedGitLabResponseException;
+import com.redhat.labs.omp.models.PagedResults;
 import com.redhat.labs.omp.models.gitlab.Group;
 import com.redhat.labs.omp.rest.client.GitLabService;
 
@@ -21,21 +25,25 @@ public class GroupService {
     @Inject
     @RestClient
     GitLabService gitLabService;
+    
+    @ConfigProperty(name = "commit.page.size")
+    int commitPageSize;
 
     // get a group
     public Optional<Group> getGitLabGroupByName(String name, Integer parentId)
             throws UnexpectedGitLabResponseException {
 
         Optional<Group> optional = Optional.empty();
-
-        List<Group> groupList = gitLabService.getGroupByName(name);
-
-        if (null == groupList || groupList.isEmpty()) {
-            return optional;
+        
+        PagedResults<Group> page = new PagedResults<>();
+                
+        while(page.hasMore()) {
+            Response response = gitLabService.getGroupByName(name, commitPageSize, page.getNumber());
+            page.update(response, new GenericType<List<Group>>() {});
         }
 
         // look for a match between returned name and provided path
-        for (Group group : groupList) {
+        for (Group group : page.getResults()) {
             if (name.equals(group.getName()) && parentId.equals(group.getParentId())) {
                 return Optional.of(group);
             }

src/main/java/com/redhat/labs/omp/service/ProjectService.java

@@ -34,19 +34,22 @@ public class ProjectService {
     @ConfigProperty(name = "commit.page.size")
     int commitPageSize;
 
-    // get a project
+    // get a project - this could be a replaced by a direct call to the project via the path
+    // but must consider changes to the path for special characters
     public Optional<Project> getProjectByName(Integer namespaceId, String name) {
 
         Optional<Project> optional = Optional.empty();
-
-        List<ProjectSearchResults> resultList = gitLabService.getProjectByName(name);
-
-        if (null == resultList || resultList.isEmpty()) {
-            return optional;
+        
+        PagedResults<ProjectSearchResults> page = new PagedResults<>();
+        
+        while(page.hasMore()) {
+            Response response = gitLabService.getProjectByName(name, commitPageSize, page.getNumber());
+            page.update(response, new GenericType<List<ProjectSearchResults>>() {});
         }
 
         // look for a project with name that matches the namespace id and the path
-        for (ProjectSearchResults result : resultList) {
+        for (ProjectSearchResults result : page.getResults()) {
+            LOGGER.debug("PSR {} = {} {}  =  {}", namespaceId, result.getNamespace().getId(), name, result.getPath());
             if (namespaceId.equals(result.getNamespace().getId()) && name.equals(result.getPath())) {
                 return Optional.of(Project.from(result));
             }
@@ -55,11 +58,6 @@ public Optional<Project> getProjectByName(Integer namespaceId, String name) {
         return optional;
 
     }
-
-    //Needed anymore?
-    public List<ProjectSearchResults> getAllProjectsByName(String name) {
-        return gitLabService.getProjectByName(name);
-    }
 
     public List<Project> getProjectsByGroup(int groupId, Boolean includeSubgroups) {
 

src/test/java/com/redhat/labs/omp/mocks/MockGitLabService.java

@@ -57,9 +57,10 @@ public Group updateGroup(Integer groupId, Group group) {
     }
 
     @Override
-    public List<Group> getGroupByName(String name) {
+    public Response getGroupByName(String name, int pageSize, int page) {
 
         List<Group> groupList = new ArrayList<>();
+        int pages = 0;
 
         if ("customer3".equalsIgnoreCase(name)) {
             groupList.add(Group.builder().id(3).name("customer1").path("customer1").build());
@@ -74,7 +75,7 @@ public List<Group> getGroupByName(String name) {
             groupList.add(Group.builder().id(5).name("updated2").path("updated").parentId(3).build());
         }
 
-        return groupList;
+        return Response.ok(groupList).header("X-Total-Pages", pages).build();
     }
 
     @Override
@@ -84,9 +85,10 @@ public void deleteGroupById(Integer groupId) {
     }
 
     @Override
-    public List<ProjectSearchResults> getProjectByName(String name) {
+    public Response getProjectByName(String name, int pageSize, int page) {
 
         List<ProjectSearchResults> results = new ArrayList<>();
+        int pages = 0;
 
         if("iac".contentEquals(name)) {
             ProjectSearchResults project = ProjectSearchResults.builder().id(45).name("iac").description("bla").path("iac")
@@ -95,9 +97,10 @@ public List<ProjectSearchResults> getProjectByName(String name) {
             project = ProjectSearchResults.builder().id(5).name("iac").description("bla5").path("iac")
                     .namespace(Namespace.builder().id(5).build()).build();
             results.add(project);
+            pages++;
         }
 
-        return results;
+        return Response.ok(results).header("X-Total-Pages", pages).build();
 
     }
 

src/test/java/com/redhat/labs/omp/service/EngagementServiceTest.java

@@ -5,7 +5,6 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.List;
 

src/test/java/com/redhat/labs/omp/service/ProjectServiceTest.java

@@ -14,7 +14,6 @@
 import com.redhat.labs.omp.mocks.MockGitLabService;
 import com.redhat.labs.omp.models.gitlab.Commit;
 import com.redhat.labs.omp.models.gitlab.Project;
-import com.redhat.labs.omp.models.gitlab.ProjectSearchResults;
 
 import io.quarkus.test.junit.QuarkusTest;
 
@@ -78,13 +77,6 @@ class ProjectServiceTest {
         assertEquals(Optional.empty(), notFound);
     }
 
-    @Test void getProjectAllByName() {
-        List<ProjectSearchResults> found = projectService.getAllProjectsByName("iac");
-        assertNotNull(found);
-        assertEquals(2, found.size());
-        
-    }
-    
     @Test void getProjectByPath() {
         Optional<Project> found = projectService.getProjectById(66);
         assertFalse(found.isPresent());