Merge pull request #73 from The-Huginn/issue-68

Retrieve projects from lotteryConfig
jboss-set · Mar 7, 2024 · ef553a8 · ef553a8
2 parents 4c2435b + b74980d
commit ef553a8
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/src/main/java/org/jboss/set/processing/CollectorProducer.java b/src/main/java/org/jboss/set/processing/CollectorProducer.java
@@ -22,11 +22,7 @@ public class CollectorProducer {
 
     public NewIssueCollector newIssueCollectorInstance(JiraEndpoint jiraEndpoint) {
         LotteryConfig lotteryConfig = lotteryConfigProducer.getLotteryConfig();
-        Set<String> availableProjects = lotteryConfig.participants().stream()
-                .map(LotteryConfig.Participant::projects)
-                .map(projects -> projects.stream().map(LotteryConfig.Participant.Project::project).collect(Collectors.toSet()))
-                .flatMap(Collection::stream)
-                .collect(Collectors.toSet());
+        Set<String> availableProjects = getAvailableProjects(lotteryConfig);
         SearchQuery searchQuery = SearchQuery.builder().projects(availableProjects).status(IssueStatus.NEW)
                 .assigneeEmpty()
                 .build();
@@ -36,10 +32,19 @@ public NewIssueCollector newIssueCollectorInstance(JiraEndpoint jiraEndpoint) {
 
     public StaleIssueCollector newStaleIssueCollector(JiraEndpoint jiraEndpoint) {
         LotteryConfig lotteryConfig = lotteryConfigProducer.getLotteryConfig();
-        SearchQuery searchQuery = SearchQuery.builder().projects("WFLY")
+        Set<String> availableProjects = getAvailableProjects(lotteryConfig);
+        SearchQuery searchQuery = SearchQuery.builder().projects(availableProjects)
                 .before(LocalDate.now().minusDays(lotteryConfig.delay().toDays())).assigneeNotEmpty()
                 .status(IssueStatus.CREATED, IssueStatus.ASSIGNED, IssueStatus.POST).build();
         jiraEndpoint.setJql(JqlBuilder.build(searchQuery));
         return new StaleIssueCollector(jiraEndpoint);
     }
+
+    private Set<String> getAvailableProjects(LotteryConfig lotteryConfig) {
+        return lotteryConfig.participants().stream()
+                .map(LotteryConfig.Participant::projects)
+                .map(projects -> projects.stream().map(LotteryConfig.Participant.Project::project).collect(Collectors.toSet()))
+                .flatMap(Collection::stream)
+                .collect(Collectors.toSet());
+    }
 }