regler probleme avec la creation d'equipe et 1 manager par tryout changer pour plusieurs
CI - Security, Lint & Tests / validate (push) Failing after 58s
CI - Security, Lint & Tests / validate (push) Failing after 58s
This commit is contained in:
@@ -37,3 +37,13 @@ tryout_coaches = db.Table(
|
||||
'coach_id', db.Integer, db.ForeignKey('users.id', ondelete='CASCADE'), primary_key=True
|
||||
),
|
||||
)
|
||||
|
||||
tryout_managers = db.Table(
|
||||
'tryout_managers',
|
||||
db.Column(
|
||||
'tryout_id', db.Integer, db.ForeignKey('tryouts.id', ondelete='CASCADE'), primary_key=True
|
||||
),
|
||||
db.Column(
|
||||
'manager_id', db.Integer, db.ForeignKey('users.id', ondelete='CASCADE'), primary_key=True
|
||||
),
|
||||
)
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
"""Tryout event for player evaluations and team formation."""
|
||||
|
||||
from app.extensions import db
|
||||
from app.models._associations import tryout_coaches
|
||||
from app.models._associations import tryout_coaches, tryout_managers
|
||||
from app.time_utils import utc_now_naive
|
||||
|
||||
|
||||
@@ -20,16 +20,17 @@ class Tryout(db.Model):
|
||||
max_players = db.Column(db.Integer, nullable=True)
|
||||
created_by = db.Column(db.Integer, db.ForeignKey('users.id'), nullable=False)
|
||||
target_org_team_id = db.Column(db.Integer, db.ForeignKey('org_teams.id'), nullable=True)
|
||||
manager_id = db.Column(db.Integer, db.ForeignKey('users.id'), nullable=True)
|
||||
manager_id = db.Column(db.Integer, db.ForeignKey('users.id'), nullable=True) # deprecated, kept for migration
|
||||
coach_id = db.Column(
|
||||
db.Integer, db.ForeignKey('users.id'), nullable=True
|
||||
) # deprecated, kept for migration
|
||||
created_at = db.Column(db.DateTime, default=utc_now_naive)
|
||||
|
||||
creator = db.relationship('User', foreign_keys=[created_by], backref='created_tryouts')
|
||||
manager = db.relationship('User', foreign_keys=[manager_id], backref='managed_tryouts')
|
||||
manager = db.relationship('User', foreign_keys=[manager_id], backref='managed_tryouts') # deprecated
|
||||
coach = db.relationship('User', foreign_keys=[coach_id], backref='_deprecated_coached_tryouts')
|
||||
coaches = db.relationship('User', secondary=tryout_coaches, backref='coached_tryouts')
|
||||
managers = db.relationship('User', secondary=tryout_managers, backref='managed_tryouts_m2m')
|
||||
registrations = db.relationship('TryoutRegistration', backref='tryout', lazy='dynamic')
|
||||
evaluations = db.relationship('Evaluation', backref='tryout', lazy='dynamic')
|
||||
teams = db.relationship('Team', backref='tryout', lazy='dynamic')
|
||||
@@ -47,3 +48,17 @@ class Tryout(db.Model):
|
||||
if self.end_date is not None:
|
||||
return self.end_date < today
|
||||
return self.date < today
|
||||
|
||||
def get_managers(self):
|
||||
"""Managers attached to this tryout, both legacy and many-to-many."""
|
||||
manager_list = list(self.managers)
|
||||
if not manager_list and self.manager:
|
||||
return [self.manager]
|
||||
return manager_list
|
||||
|
||||
def get_coaches(self):
|
||||
"""Coaches attached to this tryout, both legacy and many-to-many."""
|
||||
coach_list = list(self.coaches)
|
||||
if not coach_list and self.coach:
|
||||
return [self.coach]
|
||||
return coach_list
|
||||
|
||||
@@ -21,7 +21,11 @@ class Manager(User):
|
||||
return True
|
||||
|
||||
def can_manage_this_tryout(self, tryout):
|
||||
return tryout.created_by == self.id or tryout.manager_id == self.id
|
||||
return (
|
||||
tryout.created_by == self.id
|
||||
or tryout.manager_id == self.id
|
||||
or any(m.id == self.id for m in tryout.managers)
|
||||
)
|
||||
|
||||
def can_manage_this_org_team(self, org_team):
|
||||
return True
|
||||
@@ -32,7 +36,13 @@ class Manager(User):
|
||||
from app.models.tryout.tryout import Tryout
|
||||
|
||||
return (
|
||||
Tryout.query.filter(or_(Tryout.created_by == self.id, Tryout.manager_id == self.id))
|
||||
Tryout.query.filter(
|
||||
or_(
|
||||
Tryout.created_by == self.id,
|
||||
Tryout.manager_id == self.id,
|
||||
Tryout.managers.any(id=self.id),
|
||||
)
|
||||
)
|
||||
.order_by(Tryout.date)
|
||||
.all()
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user