🐛 empty team member lists

commonhaus · Jul 22, 2024 · c7bb8b8 · c7bb8b8
1 parent b0e04e8
commit c7bb8b8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/bot-github-core/src/main/java/org/commonhaus/automation/github/context/QueryContext.java b/bot-github-core/src/main/java/org/commonhaus/automation/github/context/QueryContext.java
@@ -689,7 +689,7 @@ public DataLabel createLabel(String labelName, String color) {
 
     public boolean isTeamMember(GHUser user, String teamFullName) {
         Set<GHUser> members = teamMembers(teamFullName);
-        Log.debugf("%s members: %s", teamFullName, members.stream().map(GHUser::getLogin).toList());
+        Log.debugf("%s members: %s", teamFullName, members == null ? "[]" : members.stream().map(GHUser::getLogin).toList());
         return members != null && members.contains(user);
     }
 
@@ -721,7 +721,7 @@ public Set<GHUser> teamMembers(String teamFullName) {
         if (members == null) {
             members = execGitHubSync((gh, dryRun) -> {
                 GHTeam ghTeam = org.getTeamByName(relativeName);
-                return ghTeam == null ? Set.of() : ghTeam.getMembers();
+                return ghTeam == null ? null : ghTeam.getMembers();
             });
             if (hasErrors() || members == null) {
                 clearNotFound();

diff --git a/bot-github-core/src/main/java/org/commonhaus/automation/github/context/TeamList.java b/bot-github-core/src/main/java/org/commonhaus/automation/github/context/TeamList.java
@@ -27,7 +27,9 @@ public TeamList(String name, Set<DataActor> members) {
     }
 
     public TeamList removeExcludedMembers(Predicate<DataActor> predicate) {
-        members.removeIf(predicate::test);
+        if (!members.isEmpty()) {
+            members.removeIf(predicate::test);
+        }
         return this;
     }