Adding role sync and better team display

Author: Paul Philion

netbot/cog_scn.py

@@ -308,12 +308,11 @@ async def teams(self, ctx:discord.ApplicationContext, teamname:str=None):
                 await ctx.respond(f"Unknown team name: {teamname}\nTeams: {all_teams}") # error
         else:
             # all teams
-            #teams = self.redmine.user_mgr.cache.get_teams()
-            teams = "\n- ".join([team.name for team in ctx.guild.roles])
-            #buff = ""
-            #for team in teams:
-            #    buff += self.formatter.format_team(team)
-            await ctx.respond("Available teams:\n-" + teams)
+            #teams = "\n- ".join([team.name for team in ctx.guild.roles])
+            buff = ""
+            for team in ctx.guild.roles:
+                buff += self.formatter.format_team(ctx, team)
+            await ctx.respond(buff)
 
 
     #@scn.command()

netbot/formatting.py

@@ -521,7 +521,6 @@ def help_embed(self, _: discord.ApplicationContext) -> discord.Embed:
 
         return embed
 
-    ## FIXME move to DiscordFormatter
 
     async def print_team(self, ctx, team):
         msg = f"> **{team.name}**\n"
@@ -536,7 +535,7 @@ async def print_team(self, ctx, team):
 
     def format_team(self, ctx: discord.ApplicationContext, team: discord.Role) -> str:
         # single line format: teamname: member1, member2
-        skip_teams = ["blocked", "users"]
+        skip_teams = ["blocked", "users", "@everyone", ctx.me.name]
 
         if team and team.name not in skip_teams:
             team_channel = ctx.bot.channel_for_team(team.name)
@@ -551,6 +550,6 @@ def format_team(self, ctx: discord.ApplicationContext, team: discord.Role) -> st
             else:
                 team_name = "**" + team.name + "**"
 
-            return f"{team_name}: {', '.join([user.name for user in team.members])}\n"
+            return f"{team_name}: {', '.join([user.display_name for user in team.members])}\n"
         else:
             return ""

netbot/netbot.py

@@ -102,19 +102,46 @@ def run_bot(self):
         super().run(os.getenv('DISCORD_TOKEN'))
 
 
-    def cache_roles(self):
+    # def cache_roles(self):
+    #     # Noting: "guild" maps to discord server, and the API is designed to run on many "Discord servers" concurrently
+    #     for guild in self.guilds:
+    #         for member in guild.members:
+    #             for role in member.roles:
+    #                 user = self.redmine.user_mgr.find_discord_user(member.name)
+    #                 #log.debug(f"<<< {role.name} {user.name}")
+    #                 if user:
+    #                     self.teams.add_user(role.name, user.name, user.id)
+    #                 else:
+    #                     log.warning(f"Unknown user: {member.name} for team: {role.name}")
+
+    #     log.debug(f"Loaded teams: {self.teams}")
+
+    def sync_team(self, role:discord.Role, team:Team):
+        team_ids = set()
+        for member in role.members:
+            user = self.redmine.user_mgr.find_discord_user(member.name)
+            log.debug(f"adding {user.name} to {team.name}")
+            self.redmine.user_mgr.join_team(user, team.name)
+            team_ids.add(user.id)
+        # noting: "in_team_ids" is the set of valid redmine IDs that should be in the associated team
+        for user in team.users:
+            if user.id not in team_ids:
+                # user missing from ids, must have been removed
+                log.debug(f"removing {user.name} from {team.name}")
+                self.redmine.user_mgr.leave_team(user, team.name)
+
+
+    def sync_roles(self):
         # Noting: "guild" maps to discord server, and the API is designed to run on many "Discord servers" concurrently
         for guild in self.guilds:
-            for member in guild.members:
-                for role in member.roles:
-                    user = self.redmine.user_mgr.find_discord_user(member.name)
-                    #log.debug(f"<<< {role.name} {user.name}")
-                    if user:
-                        self.teams.add_user(role.name, user.name, user.id)
-                    else:
-                        log.warning(f"Unknown user: {member.name} for team: {role.name}")
-
-        log.debug(f"Loaded teams: {self.teams}")
+            for role in guild.roles:
+                team = self.redmine.user_mgr.get_team_by_name(role.name)
+                if not team:
+                    log.warning(f"No team for {role.name}. Create it, please!") # FIXME create the team!
+                    # create_team -> POST to /groups.json?name=teamname
+                else:
+                    self.sync_team(role, team)
+    # TODO: On team sync, update loacl team cache
 
 
     def get_all_teams(self, include_users: bool = True) -> dict[str, Team]:
@@ -123,7 +150,7 @@ def get_all_teams(self, include_users: bool = True) -> dict[str, Team]:
 
     def reindex(self):
         log.debug("NetBot.reindex")
-        self.cache_roles()
+        self.sync_roles()
 
 
     async def on_ready(self):

redmine/users.py

@@ -463,11 +463,8 @@ def leave_team(self, user: User, teamname:str):
             return
 
         # DELETE to /groups/{team-id}/users/{user_id}.json
-        r = self.session.delete(f"/groups/{team.id}/users/{user.id}.json") # encapsulation
-
-        # check status
-        if not r:
-            log.warning(f"Error removing {user.login} from {teamname}")
+        self.session.delete(f"/groups/{team.id}/users/{user.id}.json") # encapsulation
+        # raises an exception if there's a problem
 
 
     # python method sync?