add commits to engagement and add separate call

Author: mcanoy

src/main/java/com/redhat/labs/omp/models/Engagement.java

@@ -2,6 +2,8 @@
 
 import java.util.List;
 
+import com.redhat.labs.omp.models.gitlab.Commit;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -37,5 +39,6 @@ public class Engagement {
     private List<EngagementUser> engagementUsers;
 
     private Status status;
+    private List<Commit> commits;
 
 }

src/main/java/com/redhat/labs/omp/models/gitlab/Commit.java

@@ -2,9 +2,36 @@
 
 import javax.json.bind.annotation.JsonbProperty;
 
-public class Commit extends File {
 
-    @JsonbProperty("action")
-    public FileAction action;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class Commit  {
+
+    private String id;
+    @JsonbProperty("short_id")
+    private String shortId;
+    private String title;
+    @JsonbProperty("author_name")
+    private String authorName;
+    @JsonbProperty("author_email")
+    private String authorEmail;
+    @JsonbProperty("committer_name")
+    private String commiterName;
+    @JsonbProperty("committer_email")
+    private String commiterEmail;
+    @JsonbProperty("authored_date")
+    private String authoredDate;
+    @JsonbProperty("committed_date")
+    private String commitDate;
+    private String message;
+    @JsonbProperty("web_url")
+    private String url;
 
 }

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

@@ -25,6 +25,7 @@
 
 import com.redhat.labs.omp.models.Engagement;
 import com.redhat.labs.omp.models.Status;
+import com.redhat.labs.omp.models.gitlab.Commit;
 import com.redhat.labs.omp.models.gitlab.Hook;
 import com.redhat.labs.omp.models.gitlab.Project;
 import com.redhat.labs.omp.service.EngagementService;
@@ -82,6 +83,16 @@ public Response createProjectHook(Hook hook, @PathParam("customer") String custo
         return response;
     }
 
+    @GET
+    @Path("/customer/{customer}/{engagement}/commits")
+    @Counted(name = "get-engagement-commits", description = "Count of get engagement commits")
+    @Timed(name = "performedEngagementCommitsGet", description = "Time to get engagement commits", unit = MetricUnits.MILLISECONDS)
+    public Response getEngagementCommits(@PathParam("customer") String customer, @PathParam("engagement") String engagement) {
+        
+        List<Commit> commitList = engagementService.getCommitLog(customer, engagement);
+        return Response.ok().entity(commitList).build();
+    }
+    
     @GET
     @Path("customer/{customer}/{engagement}/hooks")
     @Counted(name = "get-hook", description = "Count of get-hook requests")

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

@@ -17,6 +17,7 @@
 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;
@@ -175,6 +176,12 @@ File updateFile(@PathParam("id") @Encoded Integer projectId, @PathParam("file_pa
     @Path("/projects/{id}/repository/commits")
     @Produces("application/json")
     Response commitMultipleFiles(@PathParam("id") @Encoded Integer projectId, CommitMultiple commit);
+    
+    @GET
+    @Logged
+    @Path("/projects/{id}/repository/commits")
+    @Produces("application/json")
+    List<Commit> getCommitLog(@PathParam("id") @Encoded String projectId);
 
     // Deploy Keys
 

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

@@ -19,6 +19,7 @@
 import com.redhat.labs.omp.models.Engagement;
 import com.redhat.labs.omp.models.Status;
 import com.redhat.labs.omp.models.gitlab.Action;
+import com.redhat.labs.omp.models.gitlab.Commit;
 import com.redhat.labs.omp.models.gitlab.CommitMultiple;
 import com.redhat.labs.omp.models.gitlab.File;
 import com.redhat.labs.omp.models.gitlab.FileAction;
@@ -118,6 +119,11 @@ public Project createEngagement(Engagement engagement, String author, String aut
 
     }
 
+    public List<Commit> getCommitLog(String customerName, String engagementName) {
+        String projectPath = getPath(customerName, engagementName);
+        return projectService.getCommitLog(projectPath);
+    }
+    
     public List<Hook> getHooks(String customer, String engagment) {
         Optional<Project> project = getProject(customer, engagment);
 
@@ -204,6 +210,9 @@ private Optional<Engagement> getEngagement(Project project, boolean includeStatu
         Optional<File> engagementFile = fileService.getFileAllow404(project.getId(), ENGAGEMENT_FILE);
         if (engagementFile.isPresent()) {
             engagement = json.fromJson(engagementFile.get().getContent(), Engagement.class);
+            
+            List<Commit> commits = projectService.getCommitLog(String.valueOf(engagement.getProjectId()));
+            engagement.setCommits(commits);
         }
 
         if(includeStatus && engagement != null) {

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

@@ -11,6 +11,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.redhat.labs.omp.models.gitlab.Commit;
 import com.redhat.labs.omp.models.gitlab.DeployKey;
 import com.redhat.labs.omp.models.gitlab.Project;
 import com.redhat.labs.omp.models.gitlab.ProjectSearchResults;
@@ -121,5 +122,9 @@ public void enableDeploymentKeyOnProject(Integer projectId, Integer deployKey) {
         gitLabService.enableDeployKey(projectId, deployKey);
         gitLabService.updateDeployKey(projectId, deployKey, DeployKey.builder().title("LodeStar DK").canPush(true).build());
     }
+    
+    public List<Commit> getCommitLog(String projectId) {
+        return gitLabService.getCommitLog(projectId);
+    }
 
 }

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

@@ -1,5 +1,7 @@
 package com.redhat.labs.omp.mocks;
 
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
@@ -11,6 +13,9 @@
 
 import org.eclipse.microprofile.rest.client.inject.RestClient;
 
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.redhat.labs.omp.config.JsonMarshaller;
+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;
@@ -32,7 +37,6 @@ public class MockGitLabService implements GitLabService {
 
     @Override
     public Response getProjects() {
-        // TODO Auto-generated method stub
         return null;
     }
 
@@ -296,4 +300,14 @@ public Response updateDeployKey(Integer projectId, Integer deployKeyId, DeployKe
         return null;
     }
 
+    @Override
+    public List<Commit> getCommitLog(String projectId) {
+        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 null;
+    }
+
 }

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

@@ -130,6 +130,25 @@ void testGetProjectSuccess() {
                         + "\"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/\","
                         + "\"overall_status\":\"green\"},\"technical_lead_email\":\"[email protected]\",\"technical_lead_name\":\"Wendel Clark\"}"));
     }
+    
+    @Test
+    void testGetCommitsSuccess() {
+        given()
+            .when()
+                .contentType(ContentType.JSON)
+                .get("/api/v1/engagements/customer/jello/lemon/commits")
+            .then()
+                .statusCode(200)
+                .body(is("[{\"author_email\":\"[email protected]\",\"author_name\":\"bot\",\"authored_date\":\"2020-06-16T00:12:27.000+00:00\",\"committed_date\":\"2020-06-16T00:12:27.000+00:00\",\"id\":\"551eefc6e367aa2ad3c56bdd7229c7bc525d4f0c\","
+                        + "\"message\":\"Auto-update generated files\",\"short_id\":\"551eefc6\",\"title\":\"Auto-update generated files\",\"web_url\":\"https://gitlab.example.com/store/jello/lemon/iac/-/commit/551eefc6e367aa2ad3c56bdd7229c7bc525d4f0c\"},"
+                        + "{\"author_email\":\"[email protected]\",\"author_name\":\"Mitch Marner\",\"authored_date\":\"2020-06-16T00:12:18.000+00:00\",\"committed_date\":\"2020-06-16T00:12:18.000+00:00\","
+                        + "\"id\":\"5178ffab3566ac591af95c3383d1c5916de4a3a9\",\"message\":\"Update engagement.json\",\"short_id\":\"5178ffab\",\"title\":\"Update engagement.json\","
+                        + "\"web_url\":\"https://gitlab.example.com/store/jello/lemon/iac/-/commit/5178ffab3566ac591af95c3383d1c5916de4a3a9\"},{\"author_email\":\"[email protected]\",\"author_name\":\"John Tavares\","
+                        + "\"authored_date\":\"2020-06-11T16:46:19.000+00:00\",\"committed_date\":\"2020-06-11T16:46:19.000+00:00\",\"id\":\"7865570dc63b1463d9fb4d02bd09ff46d244e694\",\"message\":\"Update status.json\","
+                        + "\"short_id\":\"7865570d\",\"title\":\"Update status.json\",\"web_url\":\"https://gitlab.example.com/store/jello/lemon/iac/-/commit/7865570dc63b1463d9fb4d02bd09ff46d244e694\"},{\"author_email\":\"[email protected]\","
+                        + "\"author_name\":\"Mitch Marner\",\"authored_date\":\"2020-06-04T22:34:10.000+00:00\",\"committed_date\":\"2020-06-04T22:34:10.000+00:00\",\"id\":\"dd0cc0fa7868210e2eb5a030f07cc0221dd6bc9f\","
+                        + "\"message\":\"Bump OCP version (jacob test)\",\"short_id\":\"dd0cc0fa\",\"title\":\"Bump OCP version (test)\",\"web_url\":\"https://gitlab.example.com/store/jello/lemon/iac/-/commit/dd0cc0fa7868210e2eb5a030f07cc0221dd6bc9f\"}]"));
+    }
 
 
 }

src/test/resources/commits.yaml

@@ -0,0 +1,37 @@
+---
+- authorEmail: [email protected]
+  authorName: bot
+  authoredDate: '2020-06-16T00:12:27.000+00:00'
+  commitDate: '2020-06-16T00:12:27.000+00:00'
+  id: 551eefc6e367aa2ad3c56bdd7229c7bc525d4f0c
+  message: 'Auto-update generated files'
+  shortId: 551eefc6
+  title: Auto-update generated files
+  url: https://gitlab.example.com/store/jello/lemon/iac/-/commit/551eefc6e367aa2ad3c56bdd7229c7bc525d4f0c
+- authorEmail: [email protected]
+  authorName: Mitch Marner
+  authoredDate: '2020-06-16T00:12:18.000+00:00'
+  commitDate: '2020-06-16T00:12:18.000+00:00'
+  id: 5178ffab3566ac591af95c3383d1c5916de4a3a9
+  message: Update engagement.json
+  shortId: 5178ffab
+  title: Update engagement.json
+  url: https://gitlab.example.com/store/jello/lemon/iac/-/commit/5178ffab3566ac591af95c3383d1c5916de4a3a9
+- authorEmail: [email protected]
+  authorName: John Tavares
+  authoredDate: '2020-06-11T16:46:19.000+00:00'
+  commitDate: '2020-06-11T16:46:19.000+00:00'
+  id: 7865570dc63b1463d9fb4d02bd09ff46d244e694
+  message: Update status.json
+  shortId: 7865570d
+  title: Update status.json
+  url: https://gitlab.example.com/store/jello/lemon/iac/-/commit/7865570dc63b1463d9fb4d02bd09ff46d244e694
+- authorEmail: [email protected]
+  authorName: Mitch Marner
+  authoredDate: '2020-06-04T22:34:10.000+00:00'
+  commitDate: '2020-06-04T22:34:10.000+00:00'
+  id: dd0cc0fa7868210e2eb5a030f07cc0221dd6bc9f
+  message: Bump OCP version (jacob test)
+  shortId: dd0cc0fa
+  title: Bump OCP version (test)
+  url: https://gitlab.example.com/store/jello/lemon/iac/-/commit/dd0cc0fa7868210e2eb5a030f07cc0221dd6bc9f