Merge branch 'malowe/main/message-fix' into 'main'

Fix support for GH project org and ignored repos

See merge request !137

src/main/java/org/eclipsefoundation/git/eca/api/models/Project.java

@@ -23,8 +23,7 @@ import com.google.auto.value.AutoValue;
 import com.google.auto.value.extension.memoized.Memoized;
 
 /**
- * Represents a project in the Eclipse API, along with the users and repos that
- * exist within the context of the project.
+ * Represents a project in the Eclipse API, along with the users and repos that exist within the context of the project.
  * 
  * @author Martin Lowe
  *
@@ -53,6 +52,8 @@ public abstract class Project {
 
     public abstract GitlabProject getGitlab();
 
+    public abstract GithubProject getGithub();
+
     @Nullable
     @Memoized
     public String getSpecWorkingGroup() {
@@ -71,8 +72,12 @@ public abstract class Project {
 
     public static Builder builder() {
         // adds empty lists as default values
-        return new AutoValue_Project.Builder().setRepos(new ArrayList<>()).setCommitters(new ArrayList<>())
-                .setGithubRepos(new ArrayList<>()).setGitlabRepos(new ArrayList<>()).setGerritRepos(new ArrayList<>());
+        return new AutoValue_Project.Builder()
+                .setRepos(new ArrayList<>())
+                .setCommitters(new ArrayList<>())
+                .setGithubRepos(new ArrayList<>())
+                .setGitlabRepos(new ArrayList<>())
+                .setGerritRepos(new ArrayList<>());
     }
 
     @AutoValue.Builder
@@ -98,6 +103,8 @@ public abstract class Project {
 
         public abstract Builder setGitlab(GitlabProject gitlab);
 
+        public abstract Builder setGithub(GithubProject github);
+
         public abstract Project build();
     }
 
@@ -145,6 +152,28 @@ public abstract class Project {
         }
     }
 
+    @AutoValue
+    @JsonDeserialize(builder = AutoValue_Project_GithubProject.Builder.class)
+    public abstract static class GithubProject {
+        public abstract String getOrg();
+
+        public abstract List<String> getIgnoredRepos();
+
+        public static Builder builder() {
+            return new AutoValue_Project_GithubProject.Builder();
+        }
+
+        @AutoValue.Builder
+        @JsonPOJOBuilder(withPrefix = "set")
+        public abstract static class Builder {
+            public abstract Builder setOrg(String org);
+
+            public abstract Builder setIgnoredRepos(List<String> ignoredRepos);
+
+            public abstract GithubProject build();
+        }
+    }
+
     /**
      * Does not use autovalue as the value should be mutable.
      * 

src/main/java/org/eclipsefoundation/git/eca/service/impl/PaginationProjectsService.java

@@ -23,6 +23,7 @@ import javax.annotation.PostConstruct;
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
 
+import org.apache.commons.lang3.StringUtils;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.eclipse.microprofile.context.ManagedExecutor;
 import org.eclipse.microprofile.rest.client.inject.RestClient;
@@ -166,11 +167,11 @@ public class PaginationProjectsService implements ProjectsService {
         }
         LOGGER.debug("Checking projects for repos that end with: {}", repoUrl);
 
+        String projectNamespace = URI.create(repoUrl).getPath().substring(1).toLowerCase();
         // filter the projects based on the repo URL. At least one repo in project must
         // match the repo URL to be valid
         switch (provider) {
             case GITLAB:
-                String projectNamespace = URI.create(repoUrl).getPath().substring(1).toLowerCase();
                 return availableProjects
                         .stream()
                         .filter(p -> projectNamespace.startsWith(p.getGitlab().getProjectGroup() + "/")
@@ -179,7 +180,9 @@ public class PaginationProjectsService implements ProjectsService {
             case GITHUB:
                 return availableProjects
                         .stream()
-                        .filter(p -> p.getGithubRepos().stream().anyMatch(re -> re.getUrl() != null && re.getUrl().endsWith(repoUrl)))
+                        .filter(p -> p.getGithubRepos().stream().anyMatch(re -> re.getUrl() != null && re.getUrl().endsWith(repoUrl))
+                                || (StringUtils.isNotBlank(p.getGithub().getOrg()) && projectNamespace.startsWith(p.getGithub().getOrg())
+                                        && p.getGithub().getIgnoredRepos().stream().noneMatch(repoUrl::endsWith)))
                         .collect(Collectors.toList());
             case GERRIT:
                 return availableProjects

src/test/java/org/eclipsefoundation/git/eca/test/api/MockProjectsAPI.java

@@ -28,6 +28,7 @@ import org.eclipsefoundation.git.eca.api.ProjectsAPI;
 import org.eclipsefoundation.git.eca.api.models.InterestGroupData;
 import org.eclipsefoundation.git.eca.api.models.Project;
 import org.eclipsefoundation.git.eca.api.models.InterestGroupData.Descriptor;
+import org.eclipsefoundation.git.eca.api.models.Project.GithubProject;
 import org.eclipsefoundation.git.eca.api.models.Project.GitlabProject;
 import org.eclipsefoundation.git.eca.api.models.Project.Repo;
 import org.eclipsefoundation.git.eca.api.models.Project.User;
@@ -52,8 +53,6 @@ public class MockProjectsAPI implements ProjectsAPI {
         r2.setUrl("http://www.github.com/eclipsefdn/test");
         Repo r3 = new Repo();
         r3.setUrl("http://www.github.com/eclipsefdn/prototype.git");
-        Repo r4 = new Repo();
-        r4.setUrl("http://www.github.com/eclipsefdn/tck-proto");
         Repo r5 = new Repo();
         r5.setUrl("/gitroot/sample/gerrit.project.git");
         Repo r6 = new Repo();
@@ -78,6 +77,7 @@ public class MockProjectsAPI implements ProjectsAPI {
                 .setCommitters(Arrays.asList(u1, u2))
                 .setProjectLeads(Collections.emptyList())
                 .setGitlab(GitlabProject.builder().setIgnoredSubGroups(Collections.emptyList()).setProjectGroup("").build())
+                .setGithub(GithubProject.builder().setIgnoredRepos(Collections.emptyList()).setOrg("").build())
                 .build();
         src.add(p1);
 
@@ -93,6 +93,7 @@ public class MockProjectsAPI implements ProjectsAPI {
                 .setProjectLeads(Collections.emptyList())
                 .setGitlab(
                         GitlabProject.builder().setIgnoredSubGroups(Collections.emptyList()).setProjectGroup("eclipse/dash-second").build())
+                .setGithub(GithubProject.builder().setIgnoredRepos(Collections.emptyList()).setOrg("").build())
                 .build();
         src.add(p2);
 
@@ -103,13 +104,18 @@ public class MockProjectsAPI implements ProjectsAPI {
                 .setName("Spec project")
                 .setProjectId("spec.proj")
                 .setSpecProjectWorkingGroup(map)
-                .setGithubRepos(Arrays.asList(r4))
+                .setGithubRepos(Collections.emptyList())
                 .setGitlabRepos(Arrays.asList(r7))
                 .setGitlab(GitlabProject
                         .builder()
                         .setIgnoredSubGroups(Arrays.asList("eclipse/dash/mirror"))
                         .setProjectGroup("eclipse/dash")
                         .build())
+                .setGithub(GithubProject
+                        .builder()
+                        .setIgnoredRepos(Arrays.asList("eclipsefdn-tck/tck-ignored"))
+                        .setOrg("eclipsefdn-tck")
+                        .build())
                 .setCommitters(Arrays.asList(u1, u2))
                 .setProjectLeads(Collections.emptyList())
                 .build();