Merge pull request #4 from mcanoy/by-artifact

By artifact

Author: mcanoy

.github/workflows/ci-cd.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   build:
-    if: github.repository == 'rht-labs/lodestar-atifacts'
+    if: github.repository == 'rht-labs/lodestar-artifacts'
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2

deployment/values-dev.yaml

@@ -14,10 +14,10 @@ git:
   ref: master
 
 db:
-  mongodbServiceName: lodestar-backend-mongodb
+  mongodbServiceName: lodestar-artifacts-mongodb
   mongodbUser: mongouser
   mongodbPassword: mongopassword
-  mongodbDatabase: engagements
+  mongodbDatabase: artifacts
   mongodbAdminPassword: mongoadminpassword
 
 api:

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

@@ -75,6 +75,17 @@ public static ArtifactCount countAllArtifacts() {
     public static ArtifactCount countArtifactsByEngagementUuid(String engagementUuid) {
         return ArtifactCount.builder().count(count(ENGAGEMENT_UUID, engagementUuid)).build();
     }
+    
+    /**
+     * Returns an {@link ArtifactCount} containing the count for the number of
+     * {@link Artifact} matching the typegit.
+     * 
+     * @param engagementUuid
+     * @return
+     */
+    public static ArtifactCount countArtifactsByType(String type) {
+        return ArtifactCount.builder().count(count("type", type)).build();
+    }
 
     /**
      * Returns {@link List} of {@link Artifact}s sorted descending on modified
@@ -87,6 +98,18 @@ public static ArtifactCount countArtifactsByEngagementUuid(String engagementUuid
     public static List<Artifact> pagedArtifacts(int page, int pageSize) {
         return findAll(Sort.descending(MODIFIED)).page(page, pageSize).list();
     }
+    
+    /**
+     * Returns {@link List} of {@link Artifact}s sorted descending on modified
+     * timestamp using the page specified where type is specified.
+     * 
+     * @param page
+     * @param pageSize
+     * @return
+     */
+    public static List<Artifact> pagedArtifactsByType(String type, int page, int pageSize) {
+        return find("type", Sort.descending(MODIFIED), type).page(page, pageSize).list();
+    }
 
     /**
      * Returns a {@link List} of {@link Artifact}s for the given engagement uuid,

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

@@ -18,9 +18,17 @@ public class GetOptions {
     @Parameter(name = "engagementUuid", required = false, description = "return only artifacts for the given engagement uuid")
     @QueryParam("engagementUuid")
     private String engagementUuid;
+    
+    @Parameter(name = "type", required = false, description = "return only artifacts for the given type. Do not use with engagementUuid")
+    @QueryParam("type")
+    private String type;
 
     public Optional<String> getEngagementUuid() {
         return Optional.ofNullable(engagementUuid);
     }
+    
+    public Optional<String> getType() {
+        return Optional.ofNullable(type);
+    }
 
 }

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

@@ -2,10 +2,7 @@
 
 import java.time.LocalDateTime;
 import java.time.ZoneId;
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -81,21 +78,7 @@ public void purge() {
      * and inserts into the database.
      */
     public void refresh() {
-
-        engagementRestClient.getAllEngagementProjects().stream().map(Engagement::getProjectId)
-                .map(this::getArtifactsFromGitlabByProjectId).flatMap(Collection::stream)
-                .forEach(a -> {
-
-                    // set uuid if missing
-                    if (null == a.getUuid()) {
-                        a.setUuid(UUID.randomUUID().toString());
-                    }
-
-                    // persist the artifact
-                    createOrUpdateArtifact(a);
-
-                });
-
+        engagementRestClient.getAllEngagementProjects().parallelStream().forEach(this::reloadFromGitlabByEngagement);
     }
 
     /**
@@ -106,22 +89,38 @@ public void refresh() {
      * @param projectId
      * @return
      */
-    List<Artifact> getArtifactsFromGitlabByProjectId(long projectId) {
+    void reloadFromGitlabByEngagement(Engagement engagement) {
+        if(engagement.getUuid() == null) {
+            LOGGER.error("Engagement found with no uuid. Check description of project {}", engagement.getProjectId());
+            return;
+        }
+        
         try {
-            File file = gitlabRestClient.getFile(projectId, artifactsFile, defaultBranch);
+            File file = gitlabRestClient.getFile(engagement.getProjectId(), artifactsFile, defaultBranch);
             if(null == file.getContent() || file.getContent().isBlank()) {
-                LOGGER.error("NO FILE DATA FROM GITLAB FOR PROJECT {}. THIS SHALL NOT STAND", projectId);
-                return Collections.emptyList();
+                LOGGER.error("IMPOSSIBLE. NO FILE DATA FROM GITLAB FOR PROJECT {}. THIS SHALL NOT STAND", engagement.getProjectId());
+                return;
             }
 
             file.decodeFileAttributes();
-            return Arrays.asList(jsonb.fromJson(file.getContent(), Artifact[].class));
+            List<Artifact> artifacts = Arrays.asList(jsonb.fromJson(file.getContent(), Artifact[].class));
+            
+            artifacts.forEach(a -> {
+                a.setEngagementUuid(engagement.getUuid());
+             // set uuid if missing
+                if (null == a.getUuid()) {
+                    a.setUuid(UUID.randomUUID().toString());
+                }
+                
+             // persist the artifact
+                createOrUpdateArtifact(a);
+            });
 
         } catch(WebApplicationException wae) {
             if(wae.getResponse().getStatus() != 404) {
                 throw wae;
             }
-            return Collections.emptyList();
+            LOGGER.error("NO FILE DATA FROM GITLAB FOR PROJECT {}. THIS SHALL NOT STAND", engagement.getProjectId());
         }
     }
 
@@ -161,6 +160,10 @@ public void process(List<Artifact> artifacts, Optional<String> authorEmail, Opti
      * @return
      */
     public List<Artifact> getArtifacts(GetListOptions options) {
+        
+        if(options.getType().isPresent()) {
+            return getArtifactsByType(options);
+        }
 
         Optional<String> engagementUuid = options.getEngagementUuid();
 
@@ -170,6 +173,16 @@ public List<Artifact> getArtifacts(GetListOptions options) {
                 : Artifact.pagedArtifacts(options.getPage(), options.getPageSize());
 
     }
+    
+    public List<Artifact> getArtifactsByType(GetListOptions options) {
+
+        if(options.getEngagementUuid().isPresent()) {
+            throw new WebApplicationException("Type and engagement together is not supported", 400);
+        }
+
+        return Artifact.pagedArtifactsByType(options.getType().get(), options.getPage(), options.getPageSize());
+
+    }
 
     /**
      * Returns a {@link ArtifactCount} with the count of {@link Artifact}s matching
@@ -182,8 +195,17 @@ public ArtifactCount countArtifacts(GetOptions options) {
 
         Optional<String> engagementUuid = options.getEngagementUuid();
 
-        return engagementUuid.isPresent() ? Artifact.countArtifactsByEngagementUuid(engagementUuid.get())
-                : Artifact.countAllArtifacts();
+        ArtifactCount count;
+
+        if(options.getType().isPresent()) {
+            count = Artifact.countArtifactsByType(options.getType().get());
+        } else if(engagementUuid.isPresent()) {
+            count = Artifact.countArtifactsByEngagementUuid(engagementUuid.get());
+        } else {
+            count = Artifact.countAllArtifacts();
+        }
+
+        return count;
 
     }
 

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

@@ -2,6 +2,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -10,6 +11,7 @@
 
 import javax.inject.Inject;
 import javax.json.bind.Jsonb;
+import javax.ws.rs.WebApplicationException;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -125,6 +127,38 @@ void testGetArtifactsByEngagement() {
         assertEquals(2, artifacts.size());
 
     }
+    
+    @Test
+    void testGetArtifactsByType() {
+
+        // given
+        GetListOptions options = new GetListOptions();
+        options.setType("Demo");
+
+        // when
+        List<Artifact> artifacts = artifactService.getArtifacts(options);
+
+        // then
+        assertNotNull(artifacts);
+        assertEquals(1, artifacts.size());
+
+    }
+    
+    @Test
+    void testGetArtifactsByTypeException() {
+
+        // given
+        GetListOptions options = new GetListOptions();
+        options.setType("Demo");
+        options.setEngagementUuid("1111");
+        
+        WebApplicationException ex = assertThrows(WebApplicationException.class, () -> {
+            artifactService.getArtifacts(options);
+        });
+
+        assertEquals(400, ex.getResponse().getStatus());
+
+    }
 
     @Test
     void testGetArtifactsPaging() {
@@ -167,12 +201,27 @@ void testCountArtifactsNoOptions() {
         assertEquals(2, count.getCount());
 
     }
+    
+    @Test
+    void testCountArtifactsByType() {
+
+        // given
+        GetOptions options = new GetOptions(null, "Demo");
+
+        // when
+        ArtifactCount count = artifactService.countArtifacts(options);
+
+        // then
+        assertNotNull(count);
+        assertEquals(1, count.getCount());
+
+    }
 
     @Test
     void testCountArtifactsByEngagement() {
 
         // given
-        GetOptions options = new GetOptions("1111");
+        GetOptions options = new GetOptions("1111", null);
 
         // when
         ArtifactCount count = artifactService.countArtifacts(options);