Seconde moitie d ARCH-003.
Les memes vingt lignes vivaient dans trois routes -- matches.create_match,
matches.edit_match et team_matches.create_match : formater la date et
l heure, puis parcourir deux listes paralleles pour apparier un joueur avec
la ligne de participation qu une reaction Discord doit pouvoir retrouver.
Trois copies, donc trois occasions de diverger. Elles avaient deja diverge :
create_match lisait les heures des variables qu il venait d analyser, et
affichait 'TBD' des qu une des deux manquait ;
edit_match les relisait depuis la ligne enregistree et substituait
l heure de debut a une heure de fin absente.
Un match avec une heure de debut et pas de fin annoncait donc une heure
dans une route et 'TBD' dans l autre, pour la meme donnee.
app/services/scheduling.py retient la regle la plus soigneuse des deux.
zip_participants() isole l appariement par index, qui n est correct que
tant que les deux listes sont construites en phase -- desormais un seul
endroit a relire au lieu de trois, et une liste plus courte donne None,
converti en reference vers le match lui-meme.
matches.py 711 -> 687 lignes, team_matches.py 347 -> 337.
9 tests sur le service seul, sans base ni requete.
Co-Authored-By: Claude Opus 5 <[email protected]>
338 lines
12 KiB
Python
338 lines
12 KiB
Python
"""Team match management routes for regular season matches.
|
|
|
|
Uses polymorphic isinstance checks instead of role-string comparisons.
|
|
"""
|
|
|
|
from flask import Blueprint, render_template, redirect, url_for, flash, request, jsonify
|
|
from flask_login import login_required, current_user
|
|
from flask_babel import gettext as _
|
|
from app.extensions import db
|
|
from app.models import (
|
|
Admin,
|
|
Manager,
|
|
Coach,
|
|
Player,
|
|
OrgTeam,
|
|
TeamMatch,
|
|
TeamMatchParticipant,
|
|
TeamPlayer,
|
|
)
|
|
from app.permissions import can_manage_org_team, coach_org_teams, visible_org_teams
|
|
from datetime import datetime, timedelta
|
|
from app.services.scheduling import notify_participants, zip_participants
|
|
|
|
team_matches_bp = Blueprint('team_matches', __name__, url_prefix='/team-matches')
|
|
|
|
|
|
def can_manage_team_match(team):
|
|
"""Whether the current user can manage matches for this team.
|
|
|
|
Same rule as administering the team itself, so it is the same call.
|
|
This function used to restate it, and the restatement drifted.
|
|
"""
|
|
return can_manage_org_team(current_user, team)
|
|
|
|
|
|
@team_matches_bp.route('')
|
|
@login_required
|
|
def list_matches():
|
|
"""List all team matches visible to the current user."""
|
|
filter_team_id = request.args.get('team_id', type=int)
|
|
|
|
# A manager administers every team, so the listing shows them all;
|
|
# visible_org_teams() only reports the teams they are attached to.
|
|
if isinstance(current_user, (Admin, Manager)):
|
|
teams = OrgTeam.query.order_by(OrgTeam.name).all()
|
|
matches_query = TeamMatch.query
|
|
elif isinstance(current_user, (Coach, Player)):
|
|
teams = visible_org_teams(current_user)
|
|
team_ids = [t.id for t in teams]
|
|
matches_query = (
|
|
TeamMatch.query.filter(
|
|
TeamMatch.org_team_id.in_(team_ids),
|
|
)
|
|
if team_ids
|
|
else TeamMatch.query.filter(TeamMatch.id == -1)
|
|
)
|
|
else:
|
|
teams = []
|
|
matches_query = TeamMatch.query.filter(TeamMatch.id == -1)
|
|
|
|
if filter_team_id:
|
|
matches_query = matches_query.filter(TeamMatch.org_team_id == filter_team_id)
|
|
|
|
matches = matches_query.order_by(TeamMatch.date.desc()).all()
|
|
|
|
match_data = []
|
|
for tm in matches:
|
|
confirmed, total = tm.get_confirmed_count()
|
|
participants = []
|
|
for p in tm.participants.all():
|
|
participants.append(
|
|
{
|
|
'id': p.id,
|
|
'player': p.player,
|
|
'is_confirmed': p.is_confirmed,
|
|
}
|
|
)
|
|
match_data.append(
|
|
{
|
|
'match': tm,
|
|
'participants': participants,
|
|
'confirmed_count': confirmed,
|
|
'total_count': total,
|
|
}
|
|
)
|
|
|
|
return render_template(
|
|
'pages/team_matches.html', teams=teams, match_data=match_data, now=datetime.utcnow()
|
|
)
|
|
|
|
|
|
@team_matches_bp.route('/<int:team_id>/create', methods=['GET', 'POST'])
|
|
@login_required
|
|
def create_match(team_id):
|
|
"""Create a new regular-season team match."""
|
|
team = OrgTeam.query.get_or_404(team_id)
|
|
if not can_manage_team_match(team):
|
|
flash(_('You do not have permission to schedule matches for this team.'), 'danger')
|
|
return redirect(url_for('team_matches.list_matches'))
|
|
|
|
team_players = TeamPlayer.query.filter_by(org_team_id=team_id).all()
|
|
prefill_date = request.args.get('date', '')
|
|
is_practice = request.args.get('type') == 'practice'
|
|
default_title = 'Practice' if is_practice else f'Team Match — {team.name}'
|
|
|
|
if is_practice and request.method == 'GET':
|
|
|
|
class TryoutProxy:
|
|
def __init__(self, team_obj):
|
|
self.id = 0
|
|
self.title = team_obj.name
|
|
self.date = ''
|
|
self.game = ''
|
|
self.target_org_team = team_obj
|
|
|
|
proxy_tryout = TryoutProxy(team)
|
|
all_players = [tp.player for tp in team_players if tp.player]
|
|
|
|
return render_template(
|
|
'pages/match_form.html',
|
|
tryout=proxy_tryout,
|
|
teams=[],
|
|
all_players=all_players,
|
|
prefill_date=prefill_date,
|
|
is_practice=True,
|
|
team_id=team_id,
|
|
team=team,
|
|
)
|
|
|
|
if request.method == 'POST':
|
|
title = request.form.get('title', default_title)
|
|
opponent = request.form.get('opponent', '').strip() if not is_practice else None
|
|
description = request.form.get('description', '')
|
|
date_str = request.form.get('date')
|
|
start_time_str = request.form.get('start_time')
|
|
end_time_str = request.form.get('end_time')
|
|
location = request.form.get('location', '')
|
|
|
|
if not date_str:
|
|
flash(_('Date is required.'), 'danger')
|
|
return render_template(
|
|
'pages/team_match_form.html',
|
|
team=team,
|
|
team_players=team_players,
|
|
prefill_date=prefill_date,
|
|
)
|
|
|
|
try:
|
|
date_obj = datetime.strptime(date_str, '%Y-%m-%d').date()
|
|
except (ValueError, TypeError):
|
|
flash(_('Invalid date format.'), 'danger')
|
|
return render_template(
|
|
'pages/team_match_form.html',
|
|
team=team,
|
|
team_players=team_players,
|
|
prefill_date=prefill_date,
|
|
is_practice=is_practice,
|
|
)
|
|
|
|
start_time = None
|
|
end_time = None
|
|
if start_time_str:
|
|
try:
|
|
start_time = datetime.strptime(start_time_str, '%H:%M').time()
|
|
if end_time_str:
|
|
end_time = datetime.strptime(end_time_str, '%H:%M').time()
|
|
else:
|
|
start_dt = datetime.combine(date_obj, start_time)
|
|
end_dt = start_dt + timedelta(minutes=30)
|
|
end_time = end_dt.time()
|
|
except ValueError:
|
|
flash(_('Invalid time format.'), 'danger')
|
|
return render_template(
|
|
'pages/team_match_form.html',
|
|
team=team,
|
|
team_players=team_players,
|
|
prefill_date=prefill_date,
|
|
is_practice=is_practice,
|
|
)
|
|
|
|
team_match = TeamMatch(
|
|
org_team_id=team_id,
|
|
title=title,
|
|
description=description or None,
|
|
opponent=opponent or None,
|
|
date=date_obj,
|
|
start_time=start_time,
|
|
end_time=end_time,
|
|
location=location or None,
|
|
created_by=current_user.id,
|
|
)
|
|
db.session.add(team_match)
|
|
db.session.flush()
|
|
|
|
notified_participant_ids = []
|
|
for tp in team_players:
|
|
participant = TeamMatchParticipant(
|
|
team_match_id=team_match.id,
|
|
player_id=tp.player_id,
|
|
)
|
|
db.session.add(participant)
|
|
db.session.flush()
|
|
notified_participant_ids.append(participant.id)
|
|
|
|
db.session.commit()
|
|
|
|
notify_participants(
|
|
title=team_match.title,
|
|
date=date_obj,
|
|
start_time=start_time,
|
|
end_time=end_time,
|
|
participants=zip_participants(
|
|
[tp.player_id for tp in team_players], notified_participant_ids
|
|
),
|
|
fallback_id=team_match.id,
|
|
)
|
|
|
|
flash(_('Team match "%(title)s" scheduled successfully!', title=title), 'success')
|
|
return redirect(url_for('team_matches.list_matches'))
|
|
|
|
return render_template('pages/team_match_form.html', team=team, team_players=team_players)
|
|
|
|
|
|
@team_matches_bp.route('/<int:match_id>/edit', methods=['GET', 'POST'])
|
|
@login_required
|
|
def edit_match(match_id):
|
|
"""Edit an existing team match."""
|
|
team_match = TeamMatch.query.get_or_404(match_id)
|
|
team = team_match.org_team
|
|
|
|
if not can_manage_team_match(team):
|
|
flash(_('You do not have permission to edit this match.'), 'danger')
|
|
return redirect(url_for('team_matches.list_matches'))
|
|
|
|
if request.method == 'POST':
|
|
team_match.title = request.form.get('title', team_match.title)
|
|
team_match.description = request.form.get('description', '') or None
|
|
team_match.opponent = request.form.get('opponent', '').strip() or None
|
|
|
|
date_str = request.form.get('date')
|
|
if date_str:
|
|
try:
|
|
team_match.date = datetime.strptime(date_str, '%Y-%m-%d').date()
|
|
except (ValueError, TypeError):
|
|
flash(_('Invalid date format.'), 'danger')
|
|
return redirect(url_for('team_matches.edit_match', match_id=match_id))
|
|
|
|
# Both used to `except ValueError: pass`, three lines below a date
|
|
# field that flashes and redirects. A mistyped time was therefore
|
|
# accepted by the form, discarded, and the old value kept — with the
|
|
# page reporting success. Same treatment as the date now.
|
|
start_time_str = request.form.get('start_time')
|
|
if start_time_str:
|
|
try:
|
|
team_match.start_time = datetime.strptime(start_time_str, '%H:%M').time()
|
|
except (ValueError, TypeError):
|
|
flash(_('Invalid start time format.'), 'danger')
|
|
return redirect(url_for('team_matches.edit_match', match_id=match_id))
|
|
|
|
end_time_str = request.form.get('end_time')
|
|
if end_time_str:
|
|
try:
|
|
team_match.end_time = datetime.strptime(end_time_str, '%H:%M').time()
|
|
except (ValueError, TypeError):
|
|
flash(_('Invalid end time format.'), 'danger')
|
|
return redirect(url_for('team_matches.edit_match', match_id=match_id))
|
|
|
|
team_match.location = request.form.get('location', '') or None
|
|
status = request.form.get('status')
|
|
if status in ['scheduled', 'completed', 'cancelled']:
|
|
team_match.status = status
|
|
|
|
db.session.commit()
|
|
flash(_('Match updated successfully!'), 'success')
|
|
return redirect(url_for('team_matches.list_matches'))
|
|
|
|
return render_template(
|
|
'pages/team_match_form.html', match=team_match, team=team, team_players=[]
|
|
)
|
|
|
|
|
|
@team_matches_bp.route('/<int:match_id>/delete', methods=['POST'])
|
|
@login_required
|
|
def delete_match(match_id):
|
|
"""Delete a team match."""
|
|
team_match = TeamMatch.query.get_or_404(match_id)
|
|
team = team_match.org_team
|
|
if not can_manage_team_match(team):
|
|
flash(_('You do not have permission to delete this match.'), 'danger')
|
|
return redirect(url_for('team_matches.list_matches'))
|
|
db.session.delete(team_match)
|
|
db.session.commit()
|
|
flash(_('Match deleted successfully.'), 'success')
|
|
return redirect(url_for('team_matches.list_matches'))
|
|
|
|
|
|
@team_matches_bp.route('/api/manageable-teams')
|
|
@login_required
|
|
def api_manageable_teams():
|
|
"""API endpoint returning teams the current user can schedule matches for."""
|
|
if not current_user.can_schedule_matches():
|
|
return jsonify([])
|
|
|
|
if isinstance(current_user, (Admin, Manager)):
|
|
teams = OrgTeam.query.order_by(OrgTeam.name).all()
|
|
elif isinstance(current_user, Coach):
|
|
teams = coach_org_teams(current_user)
|
|
else:
|
|
return jsonify([])
|
|
|
|
return jsonify([{'id': t.id, 'name': t.name} for t in teams])
|
|
|
|
|
|
@team_matches_bp.route('/<int:match_id>/toggle-presence/<int:participant_id>', methods=['POST'])
|
|
@login_required
|
|
def toggle_presence(match_id, participant_id):
|
|
"""Toggle is_confirmed for a team match participant."""
|
|
team_match = TeamMatch.query.get_or_404(match_id)
|
|
team = team_match.org_team
|
|
|
|
participant = TeamMatchParticipant.query.get_or_404(participant_id)
|
|
if participant.team_match_id != match_id:
|
|
return jsonify({'error': 'Participant does not belong to this match'}), 400
|
|
|
|
can_toggle = can_manage_team_match(team) or participant.player_id == current_user.id
|
|
if not can_toggle:
|
|
return jsonify({'error': 'Unauthorized'}), 403
|
|
|
|
participant.is_confirmed = not participant.is_confirmed
|
|
db.session.commit()
|
|
return jsonify(
|
|
{
|
|
'participant_id': participant.id,
|
|
'is_confirmed': participant.is_confirmed,
|
|
'player_name': participant.player.username if participant.player else 'Unknown',
|
|
}
|
|
)
|