Merge pull request #56 from dwasinge/getallengagements

Use Get All Projects By Group for Engagements
rht-labs · May 14, 2020 · bc44528 · bc44528
2 parents 5b3e3d6 + a6fb5f8
commit bc44528
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
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
@@ -34,7 +34,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);
+    List<Project> getProjectsbyGroup(@PathParam("id") @Encoded Integer groupId, @QueryParam("include_subgroups") @Encoded Boolean includeSubgroups);
 
     //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
@@ -94,11 +94,11 @@ public Project createEngagement(Engagement engagement, String author, String aut
      */
     public List<Engagement> getAllEngagements() {
 
-        List<ProjectSearchResults> projects = projectService.getAllProjectsByNane("iac");
+        List<Project> projects = projectService.getProjectsByGroup(engagementRepositoryId, true);
 
         List<Engagement> engagementFiles = new ArrayList<>();
 
-        for (ProjectSearchResults project : projects) {
+        for (Project project : projects) {
             LOGGER.debug("project id {}", project.getId());
             Optional<File> engagementFile = fileService.getFileAllow404(project.getId(), "engagement.json");
             if (engagementFile.isPresent()) {

diff --git a/src/main/java/com/redhat/labs/omp/service/ProjectService.java b/src/main/java/com/redhat/labs/omp/service/ProjectService.java
@@ -50,8 +50,8 @@ public List<ProjectSearchResults> getAllProjectsByNane(String name) {
         return gitLabService.getProjectByName(name);
     }
 
-    public List<Project> getProjects(int groupId) {
-        List<Project> projects = gitLabService.getProjectsbyGroup(groupId);
+    public List<Project> getProjectsByGroup(int groupId, Boolean includeSubgroups) {
+        List<Project> projects = gitLabService.getProjectsbyGroup(groupId, includeSubgroups);
 
         if(LOGGER.isDebugEnabled()) {
             LOGGER.trace("project count group id({}) {}", groupId, projects.size());

diff --git a/src/test/java/com/redhat/labs/omp/mocks/MockGitLabService.java b/src/test/java/com/redhat/labs/omp/mocks/MockGitLabService.java
@@ -212,7 +212,7 @@ public Response enableDeployKey(Integer projectId, Integer deployKey) {
     }
 
     @Override
-    public List<Project> getProjectsbyGroup(Integer groupId) {
+    public List<Project> getProjectsbyGroup(Integer groupId, Boolean includeSubgroups) {
         List<Project> projects = new ArrayList<>();
         projects.add(Project.builder().id(groupId * 10).name("Project " + (groupId*10)).build());
         return projects;

diff --git a/src/test/java/com/redhat/labs/omp/service/ProjectServiceTest.java b/src/test/java/com/redhat/labs/omp/service/ProjectServiceTest.java
@@ -38,7 +38,7 @@ public void createInValidProject() {
 
     @Test 
     public void getProjectsByGroup() {
-        List<Project> projects = projectService.getProjects(10);
+        List<Project> projects = projectService.getProjectsByGroup(10, true);
 
         Assertions.assertEquals(1, projects.size());
     }