Enhance my_team_command: add user registration check, improve team assignment messages, and include last sync time in response

Author: maximilianspitzer

bot.py

@@ -601,11 +601,26 @@ async def my_team_command(interaction: discord.Interaction):
             )
             return
 
+        # Get the user's registered Matcherino username
+        matcherino_username = await db.get_matcherino_username(user_id)
+        if not matcherino_username:
+            await interaction.followup.send(
+                "You haven't registered your Matcherino username yet. Please use `/register <matcherino_username>` to set your username.",
+                ephemeral=True
+            )
+            return
+            
+        # Get user's team information
         team_info = await db.get_user_team(user_id)
 
         if not team_info:
             await interaction.followup.send(
-                "You are not currently assigned to any team. Make sure you've registered with your Matcherino username using the /register command.",
+                f"You are not currently assigned to any team. Your registered Matcherino username is **{matcherino_username}**.\n\n"
+                "Possible reasons:\n"
+                "1. You haven't joined a team on Matcherino yet\n"
+                "2. Your Matcherino username doesn't match what's in the database\n"
+                "3. Teams haven't been synced recently\n\n"
+                "Please verify your username with `/verify-username` or ask an admin to run `/sync-teams`.",
                 ephemeral=True
             )
             return
@@ -621,7 +636,7 @@ async def my_team_command(interaction: discord.Interaction):
         # Add members to the embed
         member_list = ""
         for member in team_info['members']:
-            is_you = " (You)" if str(member.get('discord_id', "")) == str(user_id) else ""
+            is_you = " (You)" if str(member.get('discord_user_id', "")) == str(user_id) else ""
             discord_user = f" (Discord: {member['discord_username']})" if member.get('discord_username') else ""
             member_list += f"• {member['member_name']}{discord_user}{is_you}\n"
 
@@ -631,6 +646,10 @@ async def my_team_command(interaction: discord.Interaction):
             inline=False
         )
 
+        # Add footer with last sync time
+        if 'last_updated' in team_info:
+            embed.set_footer(text=f"Team data last updated: {team_info['last_updated'].strftime('%Y-%m-%d %H:%M:%S UTC')}")
+            
         await interaction.followup.send(embed=embed, ephemeral=True)
 
     except Exception as e:

db.py

@@ -258,6 +258,9 @@ async def update_matcherino_teams(self, teams_data):
                     # Process each team
                     for team in teams_data:
                         team_name = team['name']
+                        team_id_from_api = team.get('team_id')  # Use API-provided team ID
+                        
+                        logger.info(f"Processing team: {team_name} (ID from API: {team_id_from_api})")
 
                         # Insert or update team
                         team_id = await conn.fetchval(
@@ -279,15 +282,13 @@ async def update_matcherino_teams(self, teams_data):
 
                         # Insert team members
                         if team.get('members'):
+                            matched_count = 0
                             for member_name in team['members']:
-                                # Try to find matching Discord user
-                                discord_user_id = await conn.fetchval(
-                                    """
-                                    SELECT user_id FROM registrations 
-                                    WHERE matcherino_username = $1
-                                    """,
-                                    member_name
-                                )
+                                # Try to find matching Discord user with various matching strategies
+                                discord_user_id = await self._find_discord_user_for_member(conn, member_name)
+                                
+                                if discord_user_id:
+                                    matched_count += 1
 
                                 # Insert team member with Discord user ID if found
                                 await conn.execute(
@@ -298,12 +299,39 @@ async def update_matcherino_teams(self, teams_data):
                                     """,
                                     team_id, member_name, discord_user_id
                                 )
+                            
+                            logger.info(f"Team {team_name}: matched {matched_count}/{len(team['members'])} members to Discord users")
 
             logger.info(f"Successfully updated {len(teams_data)} teams in database")
         except Exception as e:
             logger.error(f"Error updating Matcherino teams in database: {e}")
             raise
 
+    async def _find_discord_user_for_member(self, conn, member_name):
+        """
+        Helper method to find a Discord user ID for a Matcherino member name using
+        exact matching only.
+        
+        Args:
+            conn: Database connection
+            member_name: The member name from the Matcherino API
+            
+        Returns:
+            int: Discord user ID if found, None otherwise
+        """
+        # Only use exact match on matcherino_username
+        discord_user_id = await conn.fetchval(
+            "SELECT user_id FROM registrations WHERE matcherino_username = $1",
+            member_name
+        )
+        
+        if discord_user_id:
+            return discord_user_id
+        
+        # No match found
+        logger.info(f"No Discord user match found for Matcherino member: {member_name}")
+        return None
+
     async def get_matcherino_teams(self, active_only=True):
         """
         Get all teams from the database with their members.
@@ -394,7 +422,7 @@ async def get_user_team(self, user_id):
                 # Get team for this user
                 team = await conn.fetchrow(
                     """
-                    SELECT t.*, tm.member_name
+                    SELECT t.team_id, t.team_name, t.last_updated
                     FROM matcherino_teams t
                     JOIN team_members tm ON t.team_id = tm.team_id
                     WHERE tm.discord_user_id = $1 AND t.is_active = TRUE
@@ -405,21 +433,27 @@ async def get_user_team(self, user_id):
                 if not team:
                     return None
 
-                # Get all teammates
-                teammates = await conn.fetch(
+                # Get all members of the team, including the user
+                members = await conn.fetch(
                     """
                     SELECT tm.member_name, tm.discord_user_id, r.username AS discord_username
                     FROM team_members tm
                     LEFT JOIN registrations r ON tm.discord_user_id = r.user_id
-                    WHERE tm.team_id = $1 AND tm.discord_user_id != $2
-                    ORDER BY tm.member_name
+                    WHERE tm.team_id = $1
+                    ORDER BY 
+                        CASE WHEN tm.discord_user_id = $2 THEN 0 ELSE 1 END,
+                        tm.member_name
                     """,
                     team['team_id'], user_id
                 )
 
                 # Convert to dictionary
-                result = dict(team)
-                result['teammates'] = [dict(teammate) for teammate in teammates]
+                result = {
+                    'team_id': team['team_id'],
+                    'team_name': team['team_name'],
+                    'last_updated': team['last_updated'],
+                    'members': [dict(member) for member in members]
+                }
 
                 return result
         except Exception as e:

matcherino_scraper.py

@@ -141,6 +141,9 @@ async def get_teams_data(self, tournament_id: Optional[str] = None) -> List[Dict
                     # Get team name, with fallback
                     team_name = team.get('name', 'Unknown Team')
 
+                    # Get the correct team ID (use id field directly from the team object)
+                    team_id = team.get('id')
+                    
                     # Extract team members - checking both 'members' and possibly nested 'team.members'
                     members = []
 
@@ -149,6 +152,14 @@ async def get_teams_data(self, tournament_id: Optional[str] = None) -> List[Dict
                         for member in team['members']:
                             if 'displayName' in member:
                                 display_name = member['displayName'].strip()
+                                # Get the correct bountyTeamId from the member if present
+                                bounty_team_id = member.get('bountyTeamId', None)
+                                
+                                # If bountyTeamId is present on the member, use it to verify team matching
+                                if bounty_team_id is not None and bounty_team_id != team_id:
+                                    # If bountyTeamId doesn't match team.id, log it but still include the member
+                                    logger.info(f"Member {display_name} has bountyTeamId {bounty_team_id} that doesn't match team.id {team_id}")
+                                
                                 members.append({
                                     'name': display_name,
                                     'user_id': member.get('userId', ''),
@@ -179,8 +190,8 @@ async def get_teams_data(self, tournament_id: Optional[str] = None) -> List[Dict
                         'name': team_name,
                         'members': member_names,
                         'members_data': members,  # Full member data
-                        'team_id': team.get('id') or (team.get('team', {}) or {}).get('id', None),
-                        'bounty_team_id': team.get('bountyTeamId', None),
+                        'team_id': team_id,  # Use the direct team ID
+                        'bounty_team_id': team.get('id'),  # Store the ID in a separate field as well
                         'created_at': team.get('createdAt', None),
                         'raw_data': team  # Include the raw data for debugging/future use
                     })