update by uuid. get project by uuid call change

mcanoy · mcanoy · commit 11a29894eaeb · 2021-07-12T22:05:24.000-07:00
diff --git a/src/main/java/com/redhat/labs/lodestar/model/Engagement.java b/src/main/java/com/redhat/labs/lodestar/model/Engagement.java
@@ -1,11 +1,15 @@
 package com.redhat.labs.lodestar.model;
 
+import javax.json.bind.annotation.JsonbProperty;
+
 import lombok.Data;
 
 @Data
 public class Engagement {
 
     private String uuid;
+    
+    @JsonbProperty("project_id")
     private long projectId;
 
 }
diff --git a/src/main/java/com/redhat/labs/lodestar/resource/ArtifactResource.java b/src/main/java/com/redhat/labs/lodestar/resource/ArtifactResource.java
@@ -10,6 +10,7 @@
 import javax.ws.rs.GET;
 import javax.ws.rs.PUT;
 import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
@@ -35,6 +36,7 @@ public class ArtifactResource {
     @Inject
     ArtifactService service;
 
+    //may need to remove this and only accept by engagement uuid
     @PUT
     @APIResponses(value = {
             @APIResponse(responseCode = "200", description = "The list of artifacts  has been processed."),
@@ -48,6 +50,21 @@ public Response processArtifacts(@Valid List<Artifact> artifacts,
         return Response.ok().build();
 
     }
+    
+    @PUT
+    @APIResponses(value = {
+            @APIResponse(responseCode = "200", description = "The list of artifacts  has been processed."),
+            @APIResponse(responseCode = "400", description = "Invalid list of artifacts provided.") })
+    @Operation(summary = "Artifacts have been processed and persisted for engagement.")
+    @Path("/engagement/uuid/{engagementUuid}")
+    public Response processEngagementArtifacts(List<Artifact> artifacts, @PathParam(value="engagementUuid") String engagementUuid,
+            @QueryParam("authorEmail") Optional<String> authorEmail,
+            @QueryParam("authorName") Optional<String> authorName) {
+
+        service.updateArtifacts(engagementUuid, artifacts, authorEmail, authorName);
+        return Response.ok().build();
+
+    }
 
     @GET
     @APIResponses(value = {
diff --git a/src/main/java/com/redhat/labs/lodestar/rest/client/EngagementApiRestClient.java b/src/main/java/com/redhat/labs/lodestar/rest/client/EngagementApiRestClient.java
@@ -6,6 +6,7 @@
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
 
 import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
@@ -19,7 +20,7 @@ public interface EngagementApiRestClient {
 
     @GET
     @Path("/api/v1/engagements/projects/{uuid}")
-    Engagement getEngagementProjectByUuid(@PathParam("uuid") String engagementUuid);
+    Engagement getEngagementProjectByUuid(@PathParam("uuid") String engagementUuid, @QueryParam("mini") boolean mini);
 
     @GET
     @Path("/api/v1/engagements/projects")
diff --git a/src/main/java/com/redhat/labs/lodestar/service/ArtifactService.java b/src/main/java/com/redhat/labs/lodestar/service/ArtifactService.java
@@ -151,6 +151,17 @@ public void process(List<Artifact> artifacts, Optional<String> authorEmail, Opti
         });
 
     }
+    
+    public void updateArtifacts(String engagementUuid, List<Artifact> artifacts, Optional<String> authorEmail, Optional<String> authorName) {
+        
+        for(Artifact artifact : artifacts) {
+            if(artifact.getEngagementUuid() == null) {
+                artifact.setEngagementUuid(engagementUuid);
+            }
+        }
+        
+        process(artifacts, authorEmail, authorName);
+    }
 
     /**
      * Returns a {@link List} of {@link Artifact}s matching the specified
@@ -217,6 +228,7 @@ public ArtifactCount countArtifacts(GetOptions options) {
      * @return
      */
     Map<String, List<Artifact>> processArtifacts(List<Artifact> artifacts) {
+
         return artifacts.stream().map(a -> {
             if (null == a.getUuid()) {
                 a.setUuid(UUID.randomUUID().toString());
@@ -369,7 +381,7 @@ void updateArtifactsFile(String engagementUuid, List<Artifact> artifacts, Option
             Optional<String> authorName, Optional<String> commitMessage) {
 
         // find project by engagement
-        Engagement project = engagementRestClient.getEngagementProjectByUuid(engagementUuid);
+        Engagement project = engagementRestClient.getEngagementProjectByUuid(engagementUuid, true);
 
         // create json content
         String content = jsonb.toJson(artifacts);
diff --git a/src/test/java/com/redhat/labs/mock/ExternalApiWireMock.java b/src/test/java/com/redhat/labs/mock/ExternalApiWireMock.java
@@ -31,12 +31,12 @@ public Map<String, String> start() {
 
         body = ResourceLoader.load("engagement-project-1.json");
 
-        stubFor(get(urlEqualTo("/api/v1/engagements/projects/1111"))
+        stubFor(get(urlEqualTo("/api/v1/engagements/projects/1111?mini=true"))
                 .willReturn(aResponse().withHeader("Content-Type", "application/json").withBody(body)));
 
         body = ResourceLoader.load("engagement-project-2.json");
 
-        stubFor(get(urlEqualTo("/api/v1/engagements/projects/2222"))
+        stubFor(get(urlEqualTo("/api/v1/engagements/projects/2222?mini=true"))
                 .willReturn(aResponse().withHeader("Content-Type", "application/json").withBody(body)));
 
 //        stubFor(get(urlEqualTo("/api/v1/engagements/projects/2222"))
@@ -49,7 +49,12 @@ public Map<String, String> start() {
         stubFor(get(urlEqualTo("/api/v4/projects/1/repository/files/artifacts.json?ref=master"))
                 .willReturn(aResponse().withHeader("Content-Type", "application/json").withBody(body)));
 
-        stubFor(get(urlEqualTo("/api/v4/projects/2/repository/files/artifacts.json?ref=master"))
+        body = ResourceLoader.load("project-91-artifacts-file.json");
+        
+        stubFor(get(urlEqualTo("/api/v4/projects/91/repository/files/artifacts.json?ref=master"))
+                .willReturn(aResponse().withHeader("Content-Type", "application/json").withBody(body)));
+        
+        stubFor(get(urlEqualTo("/api/v4/projects/92/repository/files/artifacts.json?ref=master"))
                 .willReturn(aResponse().withStatus(404)));
 
         // update existing artifacts.json
diff --git a/src/test/java/com/redhat/labs/resource/ArtifactResourceTest.java b/src/test/java/com/redhat/labs/resource/ArtifactResourceTest.java
@@ -50,6 +50,13 @@ void testCountArtifactsAll() {
 		given().when().get("/api/artifacts/count").then().statusCode(200).body("count", equalTo(2));
 
 	}
+	
+	@Test
+	void testRefresh() {
+	    given().when().put("/api/artifacts/refresh").then().statusCode(202);
+	    
+	    assertEquals(2, service.getArtifacts(new GetListOptions()).size());
+	}
 
 	@Test
 	void testCountArtifactsByEngagement() {
@@ -158,6 +165,41 @@ void testModifyArtifactsMissingEngagementUuid() {
 		given().contentType(ContentType.JSON).body(requestBody).put("/api/artifacts").then().statusCode(400);
 
 	}
+	
+	@Test
+    void testModifyArtifactsByEngagementUuid() {
+	    
+	 // get existing artifact
+        GetListOptions options = new GetListOptions();
+        options.setEngagementUuid("1111");
+        List<Artifact> artifacts = service.getArtifacts(options);
+        assertNotNull(artifacts);
+        assertFalse(artifacts.isEmpty());
+        Artifact modified = artifacts.get(0);
+        modified.setDescription("UPDATED");
+
+        // new artifacts
+        Artifact a1 = mockArtifact("1111");
+        Artifact a2 = mockArtifact("2222");
+
+        String requestBody = jsonb.toJson(Arrays.asList(a1, a2, modified));
+
+        given().contentType(ContentType.JSON).body(requestBody).put("/api/artifacts/engagement/uuid/1111").then().statusCode(200);
+        
+        JsonPath path = given().queryParam("engagementUuid", "1111").when().get("/api/artifacts").then().statusCode(200).extract().jsonPath();
+        
+        assertEquals(2, path.getList(".").size());
+
+        String a0Type = path.getString("[0].type");
+        String a0Desc = path.getString("[0].description");
+
+        String a1Type = path.getString("[1].type");
+        String a1Desc = path.getString("[1].description");
+
+        boolean newTypeFound = "newType".equals(a0Type) || "newType".equals(a1Type);
+        boolean descFound = "UPDATED".equals(a0Desc) || "UPDATED".equals(a1Desc);
+        assertTrue(newTypeFound && descFound);
+	}
 
 	@Test
 	void testModifyArtifactsCreateUpdateDelete() {
diff --git a/src/test/resources/engagement-projects.json b/src/test/resources/engagement-projects.json
@@ -2,5 +2,17 @@
 	{
 		"uuid": "1111",
 		"project_id": "1"
-	}
+	},
+	{
+        "uuid": null,
+        "project_id": "90"
+    },
+    {
+        "uuid": "9191",
+        "project_id": "91"
+    },
+    {
+        "uuid": "9292",
+        "project_id": "92"
+    }
 ]
diff --git a/src/test/resources/project-91-artifacts-file.json b/src/test/resources/project-91-artifacts-file.json
@@ -0,0 +1,5 @@
+{
+    "content": null,
+    "encoding": "base64",
+    "file_path": "artifacts.json"
+}
