more sorting

Author: mcanoy

src/main/java/com/redhat/labs/lodestar/model/Artifact.java

@@ -173,8 +173,8 @@ public static List<Artifact> pagedArtifactsByRegionAndType(String type, List<Str
      * @param pageSize
      * @return
      */
-    public static List<Artifact> pagedArtifactsByEngagementUuid(String engagementUuid, int page, int pageSize) {
-        return find("engagementUuid", Sort.descending(MODIFIED), engagementUuid).page(page, pageSize).list();
+    public static List<Artifact> pagedArtifactsByEngagementUuid(String engagementUuid, int page, int pageSize, Sort sort) {
+        return find("engagementUuid", sort, engagementUuid).page(page, pageSize).list();
     }
 
     /**

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

@@ -46,7 +46,7 @@ public Response processEngagementArtifacts(@Valid List<Artifact> artifacts, @Pat
             @QueryParam("authorName") Optional<String> authorName) {
 
         service.updateArtifacts(engagementUuid, region, artifacts, authorEmail, authorName);
-        return Response.ok().build();
+        return Response.ok(service.getArtifactsByEngagement(engagementUuid)).build();
 
     }
 

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

@@ -186,11 +186,15 @@ public List<Artifact> getArtifacts(GetListOptions options) {
 
         return engagementUuid.isPresent()
                 ? Artifact.pagedArtifactsByEngagementUuid(engagementUuid.get(), options.getPage(),
-                        options.getPageSize()) //by uuid
+                        options.getPageSize(), options.getQuerySort(Sort.descending("modified"))) //by uuid
                 : Artifact.pagedArtifacts(options.getPage(), options.getPageSize(), options.getQuerySort(Sort.descending("modified").and("engagementUuid"))); //all
 
     }
 
+    public List<Artifact> getArtifactsByEngagement(String engagementUuid) {
+        return Artifact.pagedArtifactsByEngagementUuid(engagementUuid, 0, 1000, Sort.descending("modified"));
+    }
+
     public List<ArtifactCount> getArtifactTypeSummary(List<String> regions) {
         return Artifact.countArtifactsForEachRegionAndType(regions);
     }

src/test/java/com/redhat/labs/model/ArtifactTest.java

@@ -48,7 +48,7 @@ void testPagedArtifacts() {
 
 	@Test
 	void testPagedArtifactsByEngagementUuid() {
-		assertEquals(1, Artifact.pagedArtifactsByEngagementUuid("1111", 0, 1).size());
+		assertEquals(1, Artifact.pagedArtifactsByEngagementUuid("1111", 0, 1, Sort.by("uuid")).size());
 	}
 
 	@Test

src/test/java/com/redhat/labs/service/ArtifactServiceTest.java

@@ -86,7 +86,7 @@ void testModifyByEngagementIdUpdateInGit() {
         assertNotNull(updated);
         assertEquals(2, updated.size());
 
-        updated.stream().forEach(a -> {
+        updated.forEach(a -> {
             if (a.getType().equals("Demo")) {
                 assertEquals("Updated", a.getDescription());
             } else if (a.getType().equals("typeOne")) {
@@ -180,9 +180,7 @@ void testGetArtifactsByTypeException() {
         options.setType("Demo");
         options.setEngagementUuid("1111");
 
-        WebApplicationException ex = assertThrows(WebApplicationException.class, () -> {
-            artifactService.getArtifacts(options);
-        });
+        WebApplicationException ex = assertThrows(WebApplicationException.class, () -> artifactService.getArtifacts(options));
 
         assertEquals(400, ex.getResponse().getStatus());
 
@@ -287,7 +285,6 @@ void testCountArtifactsByEngagement() {
         // when
         ArtifactCount count = artifactService.countArtifacts(options);
 
-        // then
         // then
         assertNotNull(count);
         assertEquals(2, count.getCount());