paginate commits

Author: mcanoy

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

@@ -17,7 +17,6 @@
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
 import org.jboss.resteasy.annotations.jaxrs.PathParam;
 
-import com.redhat.labs.omp.models.gitlab.Commit;
 import com.redhat.labs.omp.models.gitlab.CommitMultiple;
 import com.redhat.labs.omp.models.gitlab.DeployKey;
 import com.redhat.labs.omp.models.gitlab.File;
@@ -181,7 +180,7 @@ File updateFile(@PathParam("id") @Encoded Integer projectId, @PathParam("file_pa
     @Logged
     @Path("/projects/{id}/repository/commits")
     @Produces("application/json")
-    List<Commit> getCommitLog(@PathParam("id") @Encoded String projectId);
+    Response getCommitLog(@PathParam("id") @Encoded String projectId, @QueryParam("per_page") int perPage, @QueryParam("page") int page);
 
     // Deploy Keys
 

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

@@ -1,10 +1,13 @@
 package com.redhat.labs.omp.service;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
 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;
@@ -27,6 +30,9 @@ public class ProjectService {
 
     @ConfigProperty(name = "engagements.do.not.delete")
     boolean doNotDelete;
+    
+    @ConfigProperty(name = "commit.page.size")
+    int commitPageSize;
 
     // get a project
     public Optional<Project> getProjectByName(Integer namespaceId, String name) {
@@ -124,7 +130,27 @@ public void enableDeploymentKeyOnProject(Integer projectId, Integer deployKey) {
     }
 
     public List<Commit> getCommitLog(String projectId) {
-        return gitLabService.getCommitLog(projectId);
+        List<Commit> totalCommits = new ArrayList<>();
+        int totalPages = 1;
+        int page = 0;
+        
+        while(totalPages > page++) {
+            LOGGER.trace("page {}", page);
+            Response response = gitLabService.getCommitLog(projectId, commitPageSize, page);
+            
+            totalCommits.addAll(response.readEntity(new GenericType<List<Commit>>() {}));
+            
+            if(page == 1) {
+                String totalPageString = response.getHeaderString("X-Total-Pages");
+                totalPages = Integer.valueOf(totalPageString);
+                LOGGER.trace("TOTAL PAGES {}", totalPages);
+            }
+            
+        }
+        
+        LOGGER.debug("total commits for project {} {}", projectId, totalCommits.size());
+          
+        return totalCommits;
     }
 
 }

src/main/resources/application.properties

@@ -30,6 +30,7 @@ config.file=${CONFIG_FILE:schema/config.yml}
 webhook.file=${WEBHOOK_FILE:/schema/webhooks.yaml}
 webhook.default.token=${WEBHOOK_DEFAULT_TOKEN:tolkien}
 config.gitlab.ref=${CONFIG_GITLAB_REF:master}
+commit.page.size=100
 
 # engagements
 engagements.repository.id=${ENGAGEMENTS_REPOSITORY_ID:2}

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

@@ -96,7 +96,7 @@ public List<ProjectSearchResults> getProjectByName(String name) {
 
     @Override
     public Project getProjectById(String projectId) {
-        System.out.println("p "+ projectId);
+
         if(projectId == "66") {
             return Project.builder().id(66).build();
         }
@@ -298,13 +298,19 @@ public Response updateDeployKey(Integer projectId, Integer deployKeyId, DeployKe
     }
 
     @Override
-    public List<Commit> getCommitLog(String projectId) {
+    public Response getCommitLog(String projectId, int perPage, int pageNumber) {
+        String content = ResourceLoader.load("commits.yaml");
+        List<Commit> commitList = new JsonMarshaller().fromYaml(content, Commit.class);
+        
         if("top/dog/jello/lemon/iac".equals(projectId)) {
-            String content = ResourceLoader.load("commits.yaml");
-            List<Commit> commitList = new JsonMarshaller().fromYaml(content, Commit.class);
-            return commitList;
+            return Response.ok(commitList).header("X-Total-Pages", 1).build();
         }
-        return null;
+        
+        if("multi/page/iac".equals(projectId)) {
+            return Response.ok(commitList).header("X-Total-Pages", 2).build();
+        }
+        
+        return Response.ok(new ArrayList<Commit>()).header("X-Total-Pages", 0).build();
     }
 
 }

src/test/java/com/redhat/labs/omp/resource/EngagementResourceTest.java

@@ -23,7 +23,7 @@ void testGetAllEngagementsSuccess() {
                 .get("/api/v1/engagements")
             .then()
                 .statusCode(200)
-                .body(is("[{\"archive_date\":\"20210125\",\"customer_contact_email\":\"[email protected]\",\"customer_contact_name\":\"Reg Dunlop\","
+                .body(is("[{\"archive_date\":\"20210125\",\"commits\":[],\"customer_contact_email\":\"[email protected]\",\"customer_contact_name\":\"Reg Dunlop\","
                         + "\"customer_name\":\"customer1\",\"description\":\"Charleston\",\"end_date\":\"20201225\",\"engagement_lead_email\":\"[email protected]\","
                         + "\"engagement_lead_name\":\"Doug Gilmour\",\"location\":\"Raleigh, NC\",\"ocp_cloud_provider_name\":\"GCP\",\"ocp_cloud_provider_region\":\"West\","
                         + "\"ocp_cluster_size\":\"medium\",\"ocp_persistent_storage_size\":\"50GB\",\"ocp_sub_domain\":\"jello\",\"ocp_version\":\"v4.2\",\"project_id\":0,\"project_name\":\"project1\","
@@ -124,7 +124,7 @@ void testGetProjectSuccess() {
                 .get("/api/v1/engagements/customer/jello/lemon")
             .then()
                 .statusCode(200)
-                .body(is("{\"archive_date\":\"20210125\",\"customer_contact_email\":\"[email protected]\",\"customer_contact_name\":\"Reg Dunlop\",\"customer_name\":\"customer1\",\"description\":\"Charleston\",\"end_date\":\"20201225\","
+                .body(is("{\"archive_date\":\"20210125\",\"commits\":[],\"customer_contact_email\":\"[email protected]\",\"customer_contact_name\":\"Reg Dunlop\",\"customer_name\":\"customer1\",\"description\":\"Charleston\",\"end_date\":\"20201225\","
                         + "\"engagement_lead_email\":\"[email protected]\",\"engagement_lead_name\":\"Doug Gilmour\",\"location\":\"Raleigh, NC\",\"ocp_cloud_provider_name\":\"GCP\",\"ocp_cloud_provider_region\":\"West\",\"ocp_cluster_size\":\"medium\","
                         + "\"ocp_persistent_storage_size\":\"50GB\",\"ocp_sub_domain\":\"jello\",\"ocp_version\":\"v4.2\",\"project_id\":0,\"project_name\":\"project1\",\"start_date\":\"20200202\","
                         + "\"status\":{\"messages\":[\"This is message 1\",\"This is message 2\",\"This is message 3\"],\"openshift_api\":\"https://console.s11.core.rht-labs.com/\",\"openshift_web_console\":\"https://console.s11.core.rht-labs.com/\","

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

@@ -12,6 +12,7 @@
 import org.junit.jupiter.api.Test;
 
 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;
 
@@ -101,5 +102,13 @@ class ProjectServiceTest {
 
     @Test void deleteProjectWorks() {
         projectService.deleteProject(45);
+        assertNotNull(projectService);
+    }
+    
+    @Test void getCommitsMultiPage() {
+        List<Commit> commits = projectService.getCommitLog("multi/page/iac");
+        assertNotNull(commits);
+        assertEquals(8, commits.size());
+        
     }
 }