remodulation du projet en POO et changement de l'organisation des fichiers

app/models/match_model/__init__.py

@@ -0,0 +1,6 @@
+"""Match models — BaseMatch and its concrete subclasses."""
+from app.models.match_model.base import BaseMatch
+from app.models.match_model.match import Match
+from app.models.match_model.team_match import TeamMatch
+
+__all__ = ['BaseMatch', 'Match', 'TeamMatch']

app/models/match_model/base.py

@@ -0,0 +1,18 @@
+"""Abstract base class for match models (Match + TeamMatch)."""
+from app.extensions import db
+from datetime import datetime
+
+
+class BaseMatch(db.Model):
+    """Shared schema for tryout-scoped matches and regular-season team matches."""
+    __abstract__ = True
+
+    title = db.Column(db.String(200), nullable=False)
+    description = db.Column(db.Text, nullable=True)
+    date = db.Column(db.Date, nullable=False)
+    start_time = db.Column(db.Time, nullable=True)
+    end_time = db.Column(db.Time, nullable=True)
+    location = db.Column(db.String(200), nullable=True)
+    status = db.Column(db.String(20), default='scheduled')
+    created_by = db.Column(db.Integer, db.ForeignKey('users.id'), nullable=False)
+    created_at = db.Column(db.DateTime, default=datetime.utcnow)

app/models/match_model/match.py

@@ -0,0 +1,22 @@
+"""Match / scrimmage within a tryout."""
+from app.extensions import db
+from app.models.match_model.base import BaseMatch
+
+
+class Match(BaseMatch):
+    """Match / scrimmage within a tryout."""
+    __tablename__ = 'matches'
+    id = db.Column(db.Integer, primary_key=True)
+    tryout_id = db.Column(db.Integer, db.ForeignKey('tryouts.id'), nullable=False)
+    match_type = db.Column(db.String(20), nullable=False)
+    team1_id = db.Column(db.Integer, db.ForeignKey('teams.id'), nullable=True)
+    team2_id = db.Column(db.Integer, db.ForeignKey('teams.id'), nullable=True)
+
+    creator = db.relationship('User', backref='created_matches')
+    tryout = db.relationship('Tryout', backref='matches')
+    team1 = db.relationship('Team', foreign_keys=[team1_id], backref='matches_as_team1')
+    team2 = db.relationship('Team', foreign_keys=[team2_id], backref='matches_as_team2')
+    participants = db.relationship('MatchParticipant', backref='match', lazy='dynamic')
+
+    def get_participating_players(self):
+        return [p.player_id for p in self.participants.all()]

app/models/match_model/team_match.py

@@ -0,0 +1,22 @@
+"""Regular-season match for an organisation team (not tied to a tryout)."""
+from app.extensions import db
+from app.models.match_model.base import BaseMatch
+
+
+class TeamMatch(BaseMatch):
+    """Regular-season match for an organisation team (not tied to a tryout)."""
+    __tablename__ = 'team_matches'
+    id = db.Column(db.Integer, primary_key=True)
+    org_team_id = db.Column(db.Integer, db.ForeignKey('org_teams.id'), nullable=False)
+    opponent = db.Column(db.String(200), nullable=True)
+
+    org_team = db.relationship('OrgTeam', backref='team_matches')
+    creator = db.relationship('User', backref='created_team_matches')
+    participants = db.relationship(
+        'TeamMatchParticipant', backref='team_match', lazy='dynamic',
+        cascade='all, delete-orphan')
+
+    def get_confirmed_count(self):
+        all_p = self.participants.all()
+        confirmed = sum(1 for p in all_p if p.is_confirmed)
+        return confirmed, len(all_p)