Merge pull request #44 from dwasinge/master

Username and Email From Query Params Used for Commit Details

Author: mcanoy

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

@@ -3,11 +3,13 @@
 import java.util.List;
 
 import javax.inject.Inject;
+import javax.validation.constraints.NotBlank;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
@@ -37,9 +39,10 @@ public class EngagementResource {
     @POST
     @Counted(name = "engagement", description = "How many engagements request have been requested")
     @Timed(name = "performedCreates", description = "How much time it takes to create an engagement", unit = MetricUnits.MILLISECONDS)
-    public Response createEngagement(Engagement engagement, @Context UriInfo uriInfo) {
+    public Response createEngagement(Engagement engagement, @Context UriInfo uriInfo,
+            @NotBlank @QueryParam("username") String author, @NotBlank @QueryParam("userEmail") String authorEmail) {
 
-        Project project = engagementService.createEngagement(engagement);
+        Project project = engagementService.createEngagement(engagement, author, authorEmail);
 
         UriBuilder builder = uriInfo.getAbsolutePathBuilder();
         builder.path(Integer.toString(project.getId()));

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

@@ -7,9 +7,6 @@
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
-import javax.json.bind.JsonbBuilder;
-import javax.json.bind.JsonbConfig;
-import javax.json.bind.config.PropertyNamingStrategy;
 
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.slf4j.Logger;
@@ -58,7 +55,7 @@ public class EngagementService {
     JsonMarshaller json;
 
     // create an engagement
-    public Project createEngagement(Engagement engagement) {
+    public Project createEngagement(Engagement engagement, String author, String authorEmail) {
 
         // create project structure
         Project project = createProjectStucture(engagement);
@@ -68,15 +65,15 @@ public Project createEngagement(Engagement engagement) {
         List<File> templateFiles = new ArrayList<>();
         templateFiles.add(createEngagmentFile(engagement));
 
-        if(LOGGER.isDebugEnabled()) {
+        if (LOGGER.isDebugEnabled()) {
             templateFiles.stream().forEach(file -> LOGGER.debug("File path :: " + file.getFilePath()));
         }
 
         // create actions for multiple commit
-        CommitMultiple commit = createCommitMultiple(templateFiles, project.getId(), DEFAULT_BRANCH,
-                engagement.getEngagementLeadName(), engagement.getEngagementLeadEmail(), project.isFirst());
+        CommitMultiple commit = createCommitMultiple(templateFiles, project.getId(), DEFAULT_BRANCH, author,
+                authorEmail, project.isFirst());
 
-        if(LOGGER.isDebugEnabled()) {
+        if (LOGGER.isDebugEnabled()) {
             commit.getActions().stream().forEach(file -> LOGGER.debug("Action File path :: " + file.getFilePath()));
         }
 
@@ -90,14 +87,11 @@ public Project createEngagement(Engagement engagement) {
     }
 
     /**
-     * Gets all engagements from the base group
-     * Structure is
-     * BaseGroup
-     *   - customer group
-     *     - engagement group
-     *       - project (repo)
-     *         - engagement file
-     *  This is search for all projects named 'iac' that our bot has access to. Then looking for the config data
+     * Gets all engagements from the base group Structure is BaseGroup - customer
+     * group - engagement group - project (repo) - engagement file This is search
+     * for all projects named 'iac' that our bot has access to. Then looking for the
+     * config data
+     * 
      * @return A list or engagements
      */
     public List<Engagement> getAllEngagements() {
@@ -106,10 +100,10 @@ public List<Engagement> getAllEngagements() {
 
         List<Engagement> engagementFiles = new ArrayList<>();
 
-        for(ProjectSearchResults project : projects) {
+        for (ProjectSearchResults project : projects) {
             LOGGER.debug("project id {}", project.getId());
             Optional<File> engagementFile = fileService.getFileAllow404(project.getId(), "engagement.json");
-            if(engagementFile.isPresent()) {
+            if (engagementFile.isPresent()) {
                 engagementFiles.add(json.fromJson(engagementFile.get().getContent(), Engagement.class));
             }
         }
@@ -137,8 +131,8 @@ private Project createProjectStucture(Engagement engagement) {
                         .parentId(customerGroup.getId()).build());
 
         // create project under project name group
-        Project project = getOrCreateProject(projectGroup.getId(), ENGAGEMENT_PROJECT_NAME,
-                Project.builder().name(ENGAGEMENT_PROJECT_NAME).visibility("private").namespaceId(projectGroup.getId()).build());
+        Project project = getOrCreateProject(projectGroup.getId(), ENGAGEMENT_PROJECT_NAME, Project.builder()
+                .name(ENGAGEMENT_PROJECT_NAME).visibility("private").namespaceId(projectGroup.getId()).build());
 
         // enable deployment key on project
         projectService.enableDeploymentKeyOnProject(project.getId(), deployKey);
@@ -191,7 +185,8 @@ private CommitMultiple createCommitMultiple(List<File> filesToCommit, Integer pr
 
         List<Action> actions = new ArrayList<>();
 
-        // convert each file to action - parallelStream was bringing inconsistent results
+        // convert each file to action - parallelStream was bringing inconsistent
+        // results
         filesToCommit.stream().forEach(file -> actions.add(createAction(file, isNew)));
 
         return CommitMultiple.builder().id(projectId).branch(branch).commitMessage(commitMessage()).actions(actions)
@@ -215,15 +210,16 @@ private String stripPrefix(String in) {
 
     private String commitMessage() {
         String COMMIT_MSG = "%s engagement update by git-api %s ";
-        return String.format(COMMIT_MSG, getEmoji(),getEmoji());
+        return String.format(COMMIT_MSG, getEmoji(), getEmoji());
     }
 
     private String getEmoji() {
         String bear = "\ud83d\udc3b";
 
         int bearCodePoint = bear.codePointAt(bear.offsetByCodePoints(0, 0));
         int mysteryAnimalCodePoint = bearCodePoint + new Random().nextInt(144);
-        char mysteryEmoji[] = {Character.highSurrogate(mysteryAnimalCodePoint), Character.lowSurrogate(mysteryAnimalCodePoint)};
+        char mysteryEmoji[] = { Character.highSurrogate(mysteryAnimalCodePoint),
+                Character.lowSurrogate(mysteryAnimalCodePoint) };
 
         return String.valueOf(mysteryEmoji);
     }

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

@@ -1,7 +1,6 @@
 package com.redhat.labs.omp;
 
 import static io.restassured.RestAssured.given;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.junit.jupiter.api.Test;
 
@@ -12,23 +11,14 @@
 
 @QuarkusTest
 public class ProjectsResourceIT {
-    @Test
-    public void testListAllProjects() {
-        String projectList = given()
-                .when().get("/api/projects")
-                .then()
-                .statusCode(200).extract().asString();
-
-        assertTrue(projectList.contains("https://gitlab.consulting.redhat.com/api/v4/projects/10816/events"));
-    }
 
     @Test
     public void testDeleteProject() throws InterruptedException {
         given()
                 .when()
-                .pathParam("project_id", "test/project")
-                .delete("/api/projects/{project_id}")
-                .then().statusCode(200);
+                .pathParam("project_id", 1234)
+                .delete("/api/v1/projects/{project_id}")
+                .then().statusCode(204);
     }
 
     @Test
@@ -37,7 +27,7 @@ public void testCreateProject() throws InterruptedException {
                 .when()
                 .contentType(ContentType.JSON)
                 .body(ResourceLoader.load("deleteProject-001-request.json"))
-                .post("/api/projects")
-                .then().statusCode(200);
+                .post("/api/v1/projects")
+                .then().statusCode(201);
     }
 }

src/test/java/com/redhat/labs/omp/ProjectsResourceIT.java

@@ -36,6 +36,8 @@ public void testCreateEngagementSuccess() {
         given()
             .when()
                 .contentType(ContentType.JSON)
+                .queryParam("username", "jdoe")
+                .queryParam("userEmail", "[email protected]")
                 .body(ResourceLoader.load("engagement.json"))
                 .post("/api/v1/engagements")
             .then()

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

@@ -43,7 +43,7 @@ public void testGetFile500() {
 
     @Test
     public void deleteFile() {
-        Optional<File> deletedFile = fileService.deleteFile(7, "/engagement.json");
+        Optional<File> deletedFile = fileService.deleteFile(7, "engagement.json");
         Assert.assertTrue(deletedFile.isPresent());
     }