For hooks. Get by project id instead of customer name and project naame

Author: mcanoy

src/main/java/com/redhat/labs/lodestar/model/pagination/PagedCategoryResults.java

@@ -107,7 +107,7 @@ public Response removeEngagement(@HeaderParam(value = "x-notification-token") St
 
         if(hook.wasProjectDeleted()) {
             LOGGER.debug("Remove engagement customer {} proj {}", hook.getCustomerName(), hook.getEngagementName());
-            Engagement engagement = engagementService.getByCustomerAndProjectName( hook.getCustomerName(), hook.getEngagementName());
+            Engagement engagement = engagementService.getByProjectId(hook.getProjectId());
 
             engagementService.deleteEngagement(engagement.getUuid());
             return Response.status(204).build();

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

@@ -36,6 +36,10 @@ public interface EngagementApiClient {
     @Path("{uuid}")
     Response getEngagementHead(@PathParam("uuid") String uuid);
 
+    @GET
+    @Path("project/{id}")
+    Engagement getEngagementByProject(@PathParam("id") int projectId);
+
     @GET
     @Path("customer/{customer}/engagement/{engagement}")
     Engagement getEngagement(@PathParam("customer") String customer, @PathParam("engagement") String engagementName);

src/main/java/com/redhat/labs/lodestar/rest/client/EngagementApiClient.java

@@ -264,7 +264,7 @@ public Response getBySubdomain(String engagementUuid, String subdomain) {
     public void updateStatusAndCommits(Hook hook) {
         LOGGER.debug("Hook for {} {}", hook.getCustomerName(), hook.getEngagementName());
 
-        Engagement engagement = getByCustomerAndProjectName(hook.getCustomerName(), hook.getEngagementName());
+        Engagement engagement = engagementApiClient.getEngagementByProject(hook.getProjectId());
 
         // send update status event
         if (hook.didFileChange(statusFile)) {
@@ -294,8 +294,7 @@ public void updateStatusAndCommits(Hook hook) {
 
 
     /**
-     * Needed for webhooks that don't present uuids
-     * 
+     *
      * @param customerName customer name
      * @param engagementName project name
      * @return engagement an engagement
@@ -304,6 +303,10 @@ public Engagement getByCustomerAndProjectName(String customerName, String engage
         return  engagementApiClient.getEngagement(customerName, engagementName);
     }
 
+    public Engagement getByProjectId(int projectId) {
+        return  engagementApiClient.getEngagementByProject(projectId);
+    }
+
     public Map<EngagementState, Integer> getEngagementCountByStatus(Instant currentTime) {
         return engagementApiClient.getEngagementCounts();
     }

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

@@ -17,7 +17,6 @@
 import com.google.common.collect.Lists;
 import com.redhat.labs.lodestar.model.filter.ListFilterOptions;
 import com.redhat.labs.lodestar.model.filter.SortOrder;
-import com.redhat.labs.lodestar.model.pagination.PagedCategoryResults;
 import com.redhat.labs.lodestar.model.pagination.PagedEngagementResults;
 import com.redhat.labs.lodestar.model.pagination.PagedStringResults;
 import com.redhat.labs.lodestar.utils.IntegrationTestHelper;

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

@@ -66,9 +66,9 @@ void setUp() {
         String uuid1 = "uuid1";
         Engagement engagement = Engagement.builder().uuid(uuid1).customerName(customer).projectName(exists).build();
 
-        Mockito.when(engagementApiClient.getEngagement(customer, exists)).thenReturn(engagement);
+        Mockito.when(engagementApiClient.getEngagementByProject(8675309)).thenReturn(engagement);
         Mockito.when(engagementApiClient.getEngagement(uuid1)).thenReturn(engagement);
-        Mockito.when(engagementApiClient.getEngagement(customer, "doesnotexist")).thenThrow(
+        Mockito.when(engagementApiClient.getEngagementByProject(999)).thenThrow(
                 new WebApplicationException(404)
         );
 
@@ -95,7 +95,7 @@ void testStatusValid() {
         .then()
             .statusCode(200);
 
-        Mockito.verify(engagementApiClient).getEngagement("jello", "exists");
+        Mockito.verify(engagementApiClient).getEngagementByProject(8675309);
         Mockito.verify(engagementApiClient).getEngagement("uuid1");
         Mockito.verify(engagementStatusApiClient).updateEngagementStatus("uuid1");
         Mockito.verify(engagementStatusApiClient).getEngagementStatus("uuid1");
@@ -116,7 +116,7 @@ void testStatusActivityUpdate() {
         .then()
             .statusCode(200);
 
-        Mockito.verify(engagementApiClient).getEngagement("jello", "exists");
+        Mockito.verify(engagementApiClient).getEngagementByProject(8675309);
         Mockito.verify(activityApiClient).postHook(Mockito.any(Hook.class), Mockito.eq("ttttt"));
 
 //        verify(exactly(1), getRequestedFor(urlEqualTo("/api/activity/uuid/uuid1")));
@@ -147,7 +147,7 @@ void testDeletedHook() {
         .then()
             .statusCode(204);
 
-        Mockito.verify(engagementApiClient).getEngagement("jello", "exists");
+        Mockito.verify(engagementApiClient).getEngagementByProject(8675309);
         Mockito.verify(engagementApiClient).deleteEngagement("uuid1");
     }
 

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

@@ -1,6 +1,7 @@
 {
     "object_kind": "push",
     "event_name": "project_deleted",
+    "project_id": 8675309,
     "project": {
         "path_with_namespace": "butter/chomp/sandbox/jello/exists/iac",
         "name_with_namespace": "butter / chomp / sandbox / jello / exists / iac"

src/test/resources/StatusDeleted.json

@@ -1,6 +1,7 @@
 {
     "object_kind": "push",
     "event_name": "project_deleted",
+    "project_id": "999",
     "project": {
         "path_with_namespace": "butter/chomp/sandbox/jello/doesnotexist/iac",
         "name_with_namespace": "butter / chomp / sandbox / jello / doesnotexist / iac"

src/test/resources/StatusDeletedNoEngagement.json

@@ -1,6 +1,7 @@
 {
     "object_kind": "push",
     "event_name": "push",
+    "project_id": 8675309,
     "project": {
         "path_with_namespace": "butter/chomp/sandbox/jello/exists/iac",
         "name_with_namespace": "butter / chomp / sandbox / jello / exists / iac"

src/test/resources/StatusReqValid.json

@@ -1,6 +1,7 @@
 {
     "object_kind": "push",
     "event_name": "push",
+    "project_id": 8675309,
     "project": {
         "path_with_namespace": "butter/chomp/sandbox/jello/exists/iac",
         "name_with_namespace": "butter / chomp / sandbox / jello / exists / iac"