modification des envoie de massage par bot discord

routes/matches.py

@@ -8,6 +8,7 @@ from flask_login import login_required, current_user
 from extensions import db
 from models import User, Tryout, Match, MatchParticipant, Team, TeamMember, OrgTeam, TryoutRegistration, PlayerDisponibility
 from datetime import datetime, time, timedelta
+from discord_bot import send_schedule_notification
 
 matches_bp = Blueprint('matches', __name__, url_prefix='/matches')
 
@@ -346,12 +347,20 @@ def create_match(tryout_id):
         db.session.add(match)
         db.session.flush()  # Get match.id before commit
         
+        # Collect player IDs for Discord notifications
+        notified_player_ids = []
+        
         # Handle team vs team matches
         if match_type == 'team_vs_team':
             team1_id = request.form.get('team1_id')
             team2_id = request.form.get('team2_id')
             match.team1_id = int(team1_id) if team1_id else None
             match.team2_id = int(team2_id) if team2_id else None
+            # Get players from both teams
+            if match.team1_id:
+                notified_player_ids.extend([m.player_id for m in TeamMember.query.filter_by(team_id=match.team1_id).all()])
+            if match.team2_id:
+                notified_player_ids.extend([m.player_id for m in TeamMember.query.filter_by(team_id=match.team2_id).all()])
         
         # Handle player vs player matches
         elif match_type == 'player_vs_player':
@@ -359,21 +368,60 @@ def create_match(tryout_id):
             team2_player_ids = request.form.get('team2_player_ids', '')
             team1_ids = [int(p) for p in team1_player_ids.split(',') if p] if team1_player_ids else []
             team2_ids = [int(p) for p in team2_player_ids.split(',') if p] if team2_player_ids else []
+            notified_participant_ids = []
             for pid in team1_ids:
                 participant = MatchParticipant(match_id=match.id, player_id=pid, team_side=1)
                 db.session.add(participant)
+                db.session.flush()
+                notified_participant_ids.append(participant.id)
             for pid in team2_ids:
                 participant = MatchParticipant(match_id=match.id, player_id=pid, team_side=2)
                 db.session.add(participant)
+                db.session.flush()
+                notified_participant_ids.append(participant.id)
+            notified_player_ids = team1_ids + team2_ids
         
         # Handle player scrim matches
         elif match_type == 'player_scrim':
             player_ids = request.form.getlist('player_ids')
+            notified_participant_ids = []
             for pid in player_ids:
                 participant = MatchParticipant(match_id=match.id, player_id=int(pid))
                 db.session.add(participant)
+                db.session.flush()
+                notified_participant_ids.append(participant.id)
+            notified_player_ids = [int(p) for p in player_ids]
         
         db.session.commit()
+        
+        # Send Discord notifications to players (one per participant for proper attendance tracking)
+        event_date_str = date_obj.strftime('%Y-%m-%d')
+        event_time_str = f"{start_time.strftime('%I:%M %p')} - {end_time.strftime('%I:%M %p')}" if start_time and end_time else 'TBD'
+        
+        # For team_vs_team, notify all players but use match.id (no individual confirmation)
+        # For player_vs_player/player_scrim, notify each player individually with participant ID
+        if match_type == 'team_vs_team':
+            for player_id in notified_player_ids:
+                send_schedule_notification(
+                    user_id=player_id,
+                    event_type='match',
+                    event_title=match.title,
+                    event_date=event_date_str,
+                    event_time=event_time_str,
+                    reference_id=match.id
+                )
+        else:
+            for i, player_id in enumerate(notified_player_ids):
+                reference_id = notified_participant_ids[i] if i < len(notified_participant_ids) else match.id
+                send_schedule_notification(
+                    user_id=player_id,
+                    event_type='match',
+                    event_title=match.title,
+                    event_date=event_date_str,
+                    event_time=event_time_str,
+                    reference_id=reference_id
+                )
+        
         flash('Match scheduled successfully!', 'success')
         return redirect(url_for('tryouts.view_tryout', tryout_id=tryout_id))
     
@@ -439,40 +487,91 @@ def edit_match(match_id):
                 end_dt = start_dt + timedelta(minutes=30)
                 match.end_time = end_dt.time()
         except ValueError:
-            pass
+            match.start_time = None
         
         match.location = location
         if status in ['scheduled', 'completed', 'cancelled']:
             match.status = status
         
+        # Collect player IDs for Discord notifications
+        notified_player_ids = []
+        
         # Handle team vs team matches
         if match.match_type == 'team_vs_team':
             team1_id = request.form.get('team1_id')
             team2_id = request.form.get('team2_id')
             match.team1_id = int(team1_id) if team1_id else None
             match.team2_id = int(team2_id) if team2_id else None
+            # Get players from both teams
+            if match.team1_id:
+                notified_player_ids.extend([m.player_id for m in TeamMember.query.filter_by(team_id=match.team1_id).all()])
+            if match.team2_id:
+                notified_player_ids.extend([m.player_id for m in TeamMember.query.filter_by(team_id=match.team2_id).all()])
         
         # Handle player vs player matches - update participants
         elif match.match_type == 'player_vs_player':
             MatchParticipant.query.filter_by(match_id=match.id).delete()
             team1_player_ids = request.form.getlist('team1_player_ids')
             team2_player_ids = request.form.getlist('team2_player_ids')
+            notified_participant_ids = []
             for pid in team1_player_ids:
                 participant = MatchParticipant(match_id=match.id, player_id=int(pid), team_side=1)
                 db.session.add(participant)
+                db.session.flush()
+                notified_participant_ids.append(participant.id)
             for pid in team2_player_ids:
                 participant = MatchParticipant(match_id=match.id, player_id=int(pid), team_side=2)
                 db.session.add(participant)
+                db.session.flush()
+                notified_participant_ids.append(participant.id)
+            notified_player_ids = [int(p) for p in team1_player_ids] + [int(p) for p in team2_player_ids]
         
         # Handle player scrim matches - update participants
         elif match.match_type == 'player_scrim':
             MatchParticipant.query.filter_by(match_id=match.id).delete()
             player_ids = request.form.getlist('player_ids')
+            notified_participant_ids = []
             for pid in player_ids:
                 participant = MatchParticipant(match_id=match.id, player_id=int(pid))
                 db.session.add(participant)
+                db.session.flush()
+                notified_participant_ids.append(participant.id)
+            notified_player_ids = [int(p) for p in player_ids]
         
         db.session.commit()
+        
+        # Send Discord notifications to players
+        if match.match_type in ['player_vs_player', 'player_scrim']:
+            end_time_val = match.end_time if match.end_time else match.start_time if match.start_time else None
+            if match.start_time and end_time_val:
+                event_time_str = f"{match.start_time.strftime('%I:%M %p')} - {end_time_val.strftime('%I:%M %p')}"
+            else:
+                event_time_str = 'TBD'
+            event_date_str = match.date.strftime('%Y-%m-%d')
+            for i, player_id in enumerate(notified_player_ids):
+                reference_id = notified_participant_ids[i] if i < len(notified_participant_ids) else match.id
+                send_schedule_notification(
+                    user_id=player_id,
+                    event_type='match',
+                    event_title=match.title,
+                    event_date=event_date_str,
+                    event_time=event_time_str,
+                    reference_id=reference_id
+                )
+        elif match.match_type == 'team_vs_team':
+            event_date_str = match.date.strftime('%Y-%m-%d')
+            end_time_val = match.end_time if match.end_time else match.start_time if match.start_time else None
+            event_time_str = f"{match.start_time.strftime('%I:%M %p')} - {end_time_val.strftime('%I:%M %p')}" if match.start_time and end_time_val else 'TBD'
+            for player_id in notified_player_ids:
+                send_schedule_notification(
+                    user_id=player_id,
+                    event_type='match',
+                    event_title=match.title,
+                    event_date=event_date_str,
+                    event_time=event_time_str,
+                    reference_id=match.id
+                )
+        
         flash('Match updated successfully!', 'success')
         return redirect(url_for('tryouts.view_tryout', tryout_id=tryout.id))