use paged results from gitlab to consolidate

mcanoy · mcanoy · commit 41d4c07ae0ca · 2020-06-26T17:11:52.000-07:00
diff --git a/src/main/java/com/redhat/labs/omp/models/PagedResults.java b/src/main/java/com/redhat/labs/omp/models/PagedResults.java
@@ -0,0 +1,54 @@
+package com.redhat.labs.omp.models;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.ws.rs.core.GenericType;
+import javax.ws.rs.core.Response;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * A simple class holding a results from a number of paged queries to gitlab
+ * @author mcanoy
+ *
+ * @param <T>
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class PagedResults<T> {
+    public static final Logger LOGGER = LoggerFactory.getLogger(PagedResults.class);
+            
+    @Builder.Default private int number = 0;
+    @Builder.Default private int total = 1;
+    @Builder.Default private List<T> results = new ArrayList<>();
+    
+    
+    public boolean hasMore() {
+        return total > number;
+    }
+    
+    public void update(Response response, GenericType<List<T>> type) {
+        
+        if(number == 0) {
+            String totalPageString = response.getHeaderString("X-Total-Pages");
+            total = Integer.valueOf(totalPageString);
+            LOGGER.trace("TOTAL PAGES {}", total);
+        }
+        List<T> p = response.readEntity(type);
+        results.addAll(p);
+        number++;
+    }
+    
+    public int size() {
+        return results.size();
+    }
+}
diff --git a/src/main/java/com/redhat/labs/omp/models/gitlab/Project.java b/src/main/java/com/redhat/labs/omp/models/gitlab/Project.java
@@ -131,6 +131,9 @@ public class Project {
     private Integer groupWithProjectTemplatesId;
     @JsonbProperty("packages_enabled")
     private Boolean packagesEnabled;
+    @JsonbProperty("path_with_namespace")
+    private String pathWithNamespace;
+    
 
     @JsonbTransient
     private boolean first;
diff --git a/src/main/java/com/redhat/labs/omp/rest/client/GitLabService.java b/src/main/java/com/redhat/labs/omp/rest/client/GitLabService.java
@@ -36,7 +36,7 @@ public interface GitLabService {
     // reference: https://docs.gitlab.com/ee/api/groups.html#list-a-groups-projects
     @GET
     @Path("/groups/{id}/projects")
-    List<Project> getProjectsbyGroup(@PathParam("id") @Encoded Integer groupId, @QueryParam("include_subgroups") @Encoded Boolean includeSubgroups);
+    Response getProjectsbyGroup(@PathParam("id") @Encoded Integer groupId, @QueryParam("include_subgroups") @Encoded Boolean includeSubgroups, @QueryParam("per_page") int perPage, @QueryParam("page") int page);
 
     //reference: https://docs.gitlab.com/ee/api/groups.html#list-a-groups-subgroups
     @GET
diff --git a/src/main/java/com/redhat/labs/omp/service/EngagementService.java b/src/main/java/com/redhat/labs/omp/service/EngagementService.java
@@ -161,7 +161,7 @@ public Status getProjectStatus(String customerName, String engagementName) {
     public Optional<Project> getProject(String customerName, String engagementName) {
         String fullPath = this.getPath(customerName, engagementName);
         
-        LOGGER.debug("Full path {}", fullPath.toString());
+        LOGGER.debug("Full path {}", fullPath);
         return projectService.getProjectByIdOrPath(fullPath);
     }
     
@@ -242,9 +242,7 @@ private File createEngagmentFile(Engagement engagement) {
         engagement.setStatus(null);
 
         String fileContent = json.toJson(engagement);
-        File file = File.builder().content(fileContent).filePath(ENGAGEMENT_FILE).build();
-
-        return file;
+        return File.builder().content(fileContent).filePath(ENGAGEMENT_FILE).build();
     }
 
     private Project createProjectStucture(Engagement engagement) {
@@ -319,8 +317,10 @@ private CommitMultiple createCommitMultiple(List<File> filesToCommit, Integer pr
         // convert each file to action - parallelStream was bringing inconsistent
         // results
         filesToCommit.stream().forEach(file -> actions.add(createAction(file, isNew)));
+        
+        String commitMessage = isNew ? commitMessage("Engagement created") : commitMessage("Engagement updated");
 
-        return CommitMultiple.builder().id(projectId).branch(branch).commitMessage(commitMessage()).actions(actions)
+        return CommitMultiple.builder().id(projectId).branch(branch).commitMessage(commitMessage).actions(actions)
                 .authorName(authorName).authorEmail(authorEmail).build();
 
     }
@@ -338,10 +338,9 @@ private String stripPrefix(String in) {
         }
         return in;
     }
-
-    private String commitMessage() {
-        String COMMIT_MSG = "%s engagement update by git-api %s ";
-        return String.format(COMMIT_MSG, getEmoji(), getEmoji());
+    
+    private String commitMessage(String message) {
+        return String.format("%s %s %s", message, getEmoji(), getEmoji());
     }
 
     private String getEmoji() {
diff --git a/src/main/java/com/redhat/labs/omp/service/ProjectService.java b/src/main/java/com/redhat/labs/omp/service/ProjectService.java
@@ -1,6 +1,5 @@
 package com.redhat.labs.omp.service;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
@@ -14,6 +13,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.redhat.labs.omp.models.PagedResults;
 import com.redhat.labs.omp.models.gitlab.Commit;
 import com.redhat.labs.omp.models.gitlab.DeployKey;
 import com.redhat.labs.omp.models.gitlab.Project;
@@ -60,16 +60,21 @@ public Optional<Project> getProjectByName(Integer namespaceId, String name) {
     public List<ProjectSearchResults> getAllProjectsByName(String name) {
         return gitLabService.getProjectByName(name);
     }
-
+    
     public List<Project> getProjectsByGroup(int groupId, Boolean includeSubgroups) {
-        List<Project> projects = gitLabService.getProjectsbyGroup(groupId, includeSubgroups);
-
+        
+        PagedResults<Project> page = new PagedResults<>();
+        while(page.hasMore()) {
+            Response response = gitLabService.getProjectsbyGroup(groupId, includeSubgroups, commitPageSize, page.getNumber());
+            page.update(response, new GenericType<List<Project>>() {});
+        }
+        
         if(LOGGER.isDebugEnabled()) {
-            LOGGER.trace("project count group id({}) {}", groupId, projects.size());
-            projects.stream().forEach(project -> LOGGER.debug("Group {} Project {}", groupId, project.getName()));
+            LOGGER.debug("project count group id ({}) {}", groupId, page.size());
+            page.getResults().stream().forEach(project -> LOGGER.debug("Project {}", project.getPathWithNamespace()));
         }
-
-        return projects;
+        
+        return page.getResults();
     }
 
     public Optional<Project> getProjectById(Integer projectId) {
@@ -130,27 +135,16 @@ public void enableDeploymentKeyOnProject(Integer projectId, Integer deployKey) {
     }
     
     public List<Commit> getCommitLog(String projectId) {
-        List<Commit> totalCommits = new ArrayList<>();
-        int totalPages = 1;
-        int page = 0;
+        PagedResults<Commit> page = new PagedResults<>();
         
-        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);
-            }
-            
+        while(page.hasMore()) {
+            Response response = gitLabService.getCommitLog(projectId, commitPageSize, page.getNumber());
+            page.update(response, new GenericType<List<Commit>>() {});
         }
         
-        LOGGER.debug("total commits for project {} {}", projectId, totalCommits.size());
+        LOGGER.debug("total commits for project {} {}", projectId, page.size());
           
-        return totalCommits;
+        return page.getResults();
     }
 
 }
diff --git a/src/test/java/com/redhat/labs/omp/mocks/MockGitLabService.java b/src/test/java/com/redhat/labs/omp/mocks/MockGitLabService.java
@@ -68,6 +68,10 @@ public List<Group> getGroupByName(String name) {
         } else if ("customer".equalsIgnoreCase(name) || "customer A".equalsIgnoreCase(name)) {
             groupList.add(Group.builder().id(11).name("customer A").path("customer-a").parentId(2).build());
             groupList.add(Group.builder().id(12).name("customer").path("customer").parentId(10).build());
+        } else if ("updated".equals(name)) {
+            groupList.add(Group.builder().id(3).name("updated").path("updated").parentId(2).build());
+        } else if ("updated2".equals(name)) {
+            groupList.add(Group.builder().id(5).name("updated2").path("updated").parentId(3).build());
         }
 
         return groupList;
@@ -88,6 +92,9 @@ public List<ProjectSearchResults> getProjectByName(String name) {
             ProjectSearchResults project = ProjectSearchResults.builder().id(45).name("iac").description("bla").path("iac")
                     .namespace(Namespace.builder().id(45).build()).build();
             results.add(project);
+            project = ProjectSearchResults.builder().id(5).name("iac").description("bla5").path("iac")
+                    .namespace(Namespace.builder().id(5).build()).build();
+            results.add(project);
         }
 
         return results;
@@ -188,7 +195,7 @@ public File getFile(String projectId, String filePath, String ref) {
             return File.builder().filePath(filePath).content(content).build();
         }
         
-        if("status.json".equals(filePath)) {
+        if("status.json".equals(filePath) && ! projectId.equals("top/dog/nope/nada/iac")) {
             String content = ResourceLoader.load("status.json");
             content = new String(EncodingUtils.base64Encode(content.getBytes()), StandardCharsets.UTF_8);
             return File.builder().filePath(filePath).content(content).build();
@@ -236,10 +243,10 @@ public Response enableDeployKey(Integer projectId, Integer deployKey) {
     }
 
     @Override
-    public List<Project> getProjectsbyGroup(Integer groupId, Boolean includeSubgroups) {
+    public Response getProjectsbyGroup(Integer groupId, Boolean includeSubgroups, int page, int pageSize) {
         List<Project> projects = new ArrayList<>();
         projects.add(Project.builder().id(groupId * 10).name("Project " + (groupId*10)).build());
-        return projects;
+        return Response.ok(projects).header("X-Total-Pages", 1).build();
     }
 
     @Override
diff --git a/src/test/java/com/redhat/labs/omp/service/EngagementServiceTest.java b/src/test/java/com/redhat/labs/omp/service/EngagementServiceTest.java
@@ -1,9 +1,11 @@
 package com.redhat.labs.omp.service;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 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;
 
@@ -13,7 +15,9 @@
 
 import com.redhat.labs.exception.UnexpectedGitLabResponseException;
 import com.redhat.labs.omp.models.Engagement;
+import com.redhat.labs.omp.models.Status;
 import com.redhat.labs.omp.models.gitlab.Hook;
+import com.redhat.labs.omp.models.gitlab.Project;
 
 import io.quarkus.test.junit.QuarkusTest;
 
@@ -23,6 +27,14 @@ class EngagementServiceTest {
     @Inject
     EngagementService engagementService;
     
+    @Test void testCreateEngagementUpdateProject() {
+        
+        Engagement e = Engagement.builder().customerName("updated").projectName("updated2").build();
+        Project project = engagementService.createEngagement(e, "Test Banana", "test@test.com");
+        assertFalse(project.isFirst());
+            
+    }
+    
     @Test void testCreateEngagementGroupFail() {
         
         Engagement e = Engagement.builder().customerName("customer").projectName("project").build();
@@ -56,4 +68,9 @@ class EngagementServiceTest {
         assertEquals(0, hooks.size());
         
     }
+    
+    @Test void tesetNoStatus() {
+        Status status = engagementService.getProjectStatus("nope", "nada");
+        assertNull(status);
+    }
 }
diff --git a/src/test/java/com/redhat/labs/omp/service/ProjectServiceTest.java b/src/test/java/com/redhat/labs/omp/service/ProjectServiceTest.java
@@ -81,7 +81,7 @@ class ProjectServiceTest {
     @Test void getProjectAllByName() {
         List<ProjectSearchResults> found = projectService.getAllProjectsByName("iac");
         assertNotNull(found);
-        assertEquals(1, found.size());
+        assertEquals(2, found.size());
         
     }
     

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ class ProjectServiceTest {`
`81`	`81`	`@Test void getProjectAllByName() {`
`82`	`82`	`List<ProjectSearchResults> found = projectService.getAllProjectsByName("iac");`
`83`	`83`	`assertNotNull(found);`
`84`		`- assertEquals(1, found.size());`
	`84`	`+ assertEquals(2, found.size());`
`85`	`85`
`86`	`86`	`}`
`87`	`87`