add ability to get engagement uuid / project id pairs without pulling enagement.json

Author: mcanoy

src/main/java/com/redhat/labs/lodestar/models/EngagementProject.java

@@ -0,0 +1,31 @@
+package com.redhat.labs.lodestar.models;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+/**
+ * A class to return an uuid - project id pair
+ *
+ */
+public class EngagementProject {
+    private static final String descriptionPrefixFormat = "engagement UUID: ";
+    
+    private long projectId;
+    private String uuid;
+
+    public static class EngagementProjectBuilder {
+        public EngagementProjectBuilder uuid(String uuid) {
+            if(uuid != null && uuid.startsWith(descriptionPrefixFormat)) {
+                this.uuid = uuid.substring(descriptionPrefixFormat.length());
+            }
+            return this;
+        }
+    }
+}
+

src/main/java/com/redhat/labs/lodestar/resource/EngagementResource.java

@@ -28,6 +28,7 @@
 import org.slf4j.LoggerFactory;
 
 import com.redhat.labs.lodestar.models.Engagement;
+import com.redhat.labs.lodestar.models.EngagementProject;
 import com.redhat.labs.lodestar.models.Status;
 import com.redhat.labs.lodestar.models.gitlab.Commit;
 import com.redhat.labs.lodestar.models.gitlab.Hook;
@@ -182,7 +183,7 @@ public Response deleteAllHooks() {
     }
 
     @GET
-    @Path("project/{uuid}")
+    @Path("projects/{uuid}")
     @Counted(name = "project-by-uuid", description = "Count of project-by-uuid requests")
     @Timed(name = "performedProjectByUuidGet", description = "Time to get project", unit = MetricUnits.MILLISECONDS)
     @Tag(name = "Projects", description = "Project retrieval")
@@ -195,5 +196,16 @@ public Response getProjectByUuid(@PathParam("uuid") String uuid) {
 
         return Response.ok(p.get()).build();
     }
+    
+    @GET
+    @Path("projects")
+    @Counted(name = "engagment-uuid-project-id", description = "Count of engagment-uuid-project-id requests")
+    @Timed(name = "performedEngagementUuidProjectPairsGet", description = "Time to get all projects engagement uuid", unit = MetricUnits.MILLISECONDS)
+    @Tag(name = "Projects", description = "Project retrieval")
+    public Response getEngagementUuidProjectPairs() {
+        List<EngagementProject> projects = engagementService.getEngagementProjectIdList();
+        
+        return Response.ok(projects).build();
+    }
 
 }

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

@@ -22,6 +22,7 @@
 import com.redhat.labs.lodestar.config.JsonMarshaller;
 import com.redhat.labs.lodestar.exception.UnexpectedGitLabResponseException;
 import com.redhat.labs.lodestar.models.Engagement;
+import com.redhat.labs.lodestar.models.EngagementProject;
 import com.redhat.labs.lodestar.models.EngagementUser;
 import com.redhat.labs.lodestar.models.Status;
 import com.redhat.labs.lodestar.models.events.DeleteEngagementEvent;
@@ -224,6 +225,14 @@ public Optional<Project> getProject(String customerName, String engagementName)
     public Optional<Project> getProjectByUuid(String engagementUuid) {
         return projectService.getProjectByEngagementUuid(engagementRepositoryId, engagementUuid);
     }
+    
+    public List<EngagementProject> getEngagementProjectIdList() {
+        List<Project> projects = projectService.getProjectsByGroup(engagementRepositoryId, true);
+        List<EngagementProject> eprojects = new ArrayList<>();
+        projects.forEach(p -> eprojects.add(EngagementProject.builder().uuid(p.getDescription()).projectId(p.getId()).build()));
+        
+        return eprojects;
+    }
 
     /**
      * Gets all engagements from the base group Structure is BaseGroup - customer

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

@@ -1,11 +1,11 @@
 package com.redhat.labs.lodestar.resource;
 
 import static io.restassured.RestAssured.given;
-import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.hasItem;
+import static org.hamcrest.CoreMatchers.is;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
@@ -48,7 +48,7 @@ void testGetAllEngagementsSuccess() {
         // get engagements by group
         List<Project> projects = new ArrayList<>();
         projects.add(Project.builder().id(20).name("iac").build());
-        MockUtils.setGetProjectsByGroupMock(gitLabService, 20, projects, false);
+        MockUtils.setGetProjectsByGroupMock(gitLabService, projects);
 
         // get status file
         MockUtils.setProjectTreeNodeList(gitLabService, "status.json");
@@ -227,7 +227,7 @@ void testCreateProjectHookFailNoProject() {
     @Test
     void testDeleteHooksNoProjects() {
 
-        MockUtils.setGetProjectsByGroupMock(gitLabService, 2, Lists.newArrayList(), false);
+        MockUtils.setGetProjectsByGroupMock(gitLabService);
 
         given().when().contentType(ContentType.JSON).delete("/api/v1/engagements/hooks").then().statusCode(200);
 
@@ -236,7 +236,7 @@ void testDeleteHooksNoProjects() {
     @Test
     void testDeleteHooksHasProjectNoHooks() {
 
-        MockUtils.setGetProjectsByGroupMock(gitLabService, 2, Lists.newArrayList(), true);
+        MockUtils.setGetProjectsByGroupMock(gitLabService);
         MockUtils.setGetProjectHookMock(gitLabService, 4444);
 
         given().when().contentType(ContentType.JSON).delete("/api/v1/engagements/hooks").then().statusCode(200);
@@ -246,7 +246,7 @@ void testDeleteHooksHasProjectNoHooks() {
     @Test
     void testDeleteHooksHasProjectAndHooks() {
 
-        MockUtils.setGetProjectsByGroupMock(gitLabService, 2, Lists.newArrayList(), true);
+        MockUtils.setGetProjectsByGroupMock(gitLabService);
 
         given().when().contentType(ContentType.JSON).delete("/api/v1/engagements/hooks").then().statusCode(200);
 
@@ -392,7 +392,7 @@ void testDeleteEngagement() throws InterruptedException {
         MockUtils.setGetSubgroupsMock(gitLabService, Optional.empty(), false);
         MockUtils.setGetGroupByIdOrPathMock(gitLabService, "customer1", "project1");
 
-        MockUtils.setGetProjectsByGroupMock(gitLabService, project.getId(), Arrays.asList(), false);
+        MockUtils.setGetProjectsByGroupMock(gitLabService);
         MockUtils.setDeleteGroupById(gitLabService);
         MockUtils.setDeleteProjectById(gitLabService);
 
@@ -550,9 +550,19 @@ void testGetEngagementsPaged() {
     void testGetProjectByUuid() {
 
         MockUtils.setFindProjectByEngagementId(gitLabService, 2, "abcd", Project.builder().id(1).build());
-        given().when().get("/api/v1/engagements/project/abcd").then().statusCode(200).body("id", equalTo(1));
+        given().when().get("/api/v1/engagements/projects/abcd").then().statusCode(200).body("id", equalTo(1));
+        
+        given().when().get("/api/v1/engagements/projects/eeee").then().statusCode(404);
+    }
+    
+    @Test
+    void testGetEngagementUuidProjectId() {
+        List<Project> projects = new ArrayList<>();
+        projects.add(Project.builder().id(99).name("iac").description("engagement UUID: 99uuid").build());
+        MockUtils.setGetProjectsByGroupMock(gitLabService, projects);
 
-        given().when().get("/api/v1/engagements/project/eeee").then().statusCode(404);
+        given().when().get("/api/v1/engagements/projects").then().statusCode(200).body("size()", is(1)).body("project_id", hasItem(99))
+            .body("uuid", hasItem("99uuid"));
     }
 
 }

src/test/java/com/redhat/labs/lodestar/utils/MockUtils.java

@@ -68,11 +68,13 @@ public static ProjectTreeNode mockProjectTreeNode(String name) {
     }
 
     // get projects by group
-    public static void setGetProjectsByGroupMock(GitLabService gitLabService, Integer projectId, List<Project> projects,
-            boolean hasProject) {
+    public static void setGetProjectsByGroupMock(GitLabService gitLabService) {
+        setGetProjectsByGroupMock(gitLabService, Lists.newArrayList());
+    }
+    
+    public static void setGetProjectsByGroupMock(GitLabService gitLabService, List<Project> projects) {
         ResponseBuilder r = Response.ok(projects).header("X-Total-Pages", 1);
-        if (hasProject) {
-            r.entity(Lists.newArrayList(mockIacProject()));
+        if (!projects.isEmpty()) {
             BDDMockito.given(gitLabService.getProjectsbyGroup(2, true, 100, 1)).willReturn(r.build());
         } else {
             BDDMockito.given(gitLabService.getProjectsbyGroup(Mockito.anyInt(), Mockito.anyBoolean(), Mockito.eq(100),