diff --git a/.DS_Store b/.DS_Store index 04a508e6f..92e51b349 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/.coverage b/.coverage new file mode 100644 index 000000000..3d50707ef Binary files /dev/null and b/.coverage differ diff --git a/.flaskenv b/.flaskenv new file mode 100644 index 000000000..865919fdd --- /dev/null +++ b/.flaskenv @@ -0,0 +1,2 @@ +FLASK_APP=app.server +FLASK_ENV=development diff --git a/.gitignore b/.gitignore index 2cba99d87..cefb4c172 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,6 @@ bin include lib .Python -tests/ + .envrc __pycache__ \ No newline at end of file diff --git a/CACHEDIR.TAG b/CACHEDIR.TAG new file mode 100644 index 000000000..837feeff9 --- /dev/null +++ b/CACHEDIR.TAG @@ -0,0 +1,4 @@ +Signature: 8a477f597d28d172789f06886806bc55 +# This file is a cache directory tag created by Python virtualenv. +# For information about cache directory tags, see: +# https://bford.info/cachedir/ \ No newline at end of file diff --git a/Python_Testing b/Python_Testing new file mode 160000 index 000000000..4ca9cd9a7 --- /dev/null +++ b/Python_Testing @@ -0,0 +1 @@ +Subproject commit 4ca9cd9a7c414e7cc5c8d3a8539a9f9b09a0b6f0 diff --git a/app/__init__.py b/app/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/app/booking_manager/__init__.py b/app/booking_manager/__init__.py new file mode 100644 index 000000000..9ec577cc3 --- /dev/null +++ b/app/booking_manager/__init__.py @@ -0,0 +1,6 @@ +# app/booking_manager/__init__.py + +from .booking_service import BookingService +from .club_manager import ClubManager +from .competition_manager import CompetitionManager +from .data_loader import JSONDataLoader diff --git a/app/booking_manager/booking_service.py b/app/booking_manager/booking_service.py new file mode 100644 index 000000000..3c21d53b8 --- /dev/null +++ b/app/booking_manager/booking_service.py @@ -0,0 +1,36 @@ +# app/booking_manager/booking_service.py + +from app.booking_manager.club_manager import ClubManager +from app.booking_manager.competition_manager import CompetitionManager + + +class BookingService: + """ + Ordonne le processus de réservation en utilisant les gestionnaires de clubs et de compétitions. + """ + + def __init__(self, clubs_file: str, competitions_file: str): + self.club_manager = ClubManager(clubs_file) + self.competition_manager = CompetitionManager(competitions_file) + + def purchase_places(self, club_name: str, competition_name: str, places_requested: int) -> bool: + club = self.club_manager.find_by_name(club_name) + competition = self.competition_manager.find_by_name(competition_name) + + if not club or not competition: + return False + if places_requested > 12: + return False + if places_requested > club.points: + return False + if places_requested > competition.number_of_places: + return False + + competition.number_of_places -= places_requested + club.points -= places_requested + + # Sauvegarde des modifications dans les fichiers JSON + self.club_manager.save_clubs() + self.competition_manager.save_competitions() + + return True diff --git a/app/booking_manager/club_manager.py b/app/booking_manager/club_manager.py new file mode 100644 index 000000000..8376dddb1 --- /dev/null +++ b/app/booking_manager/club_manager.py @@ -0,0 +1,55 @@ +# app/booking_manager/club_manager.py + +import json +from typing import List, Optional +from app.models import Club +from .data_loader import JSONDataLoader + + +class ClubManager: + """ + Gère le chargement, la recherche et la sauvegarde des clubs. + """ + + def __init__(self, clubs_file: str): + self.clubs_file = clubs_file # Pour la sauvegarde + loader = JSONDataLoader(clubs_file) + data = loader.load_data() + self.clubs: List[Club] = self._parse_clubs(data) + + def _parse_clubs(self, data: dict) -> List[Club]: + clubs = [] + for c in data.get("clubs", []): + clubs.append( + Club( + name=c["name"], + email=c["email"], + points=int(c["points"]), + id=c.get("id") + ) + ) + return clubs + + def find_by_email(self, email: str) -> Optional[Club]: + return next((club for club in self.clubs if club.email == email), None) + + def find_by_name(self, name: str) -> Optional[Club]: + return next((club for club in self.clubs if club.name == name), None) + + def save_clubs(self, filepath: Optional[str] = None) -> None: + """ + Sauvegarde l'état actuel des clubs dans un fichier JSON. + """ + if filepath is None: + filepath = self.clubs_file + clubs_data = {"clubs": []} + for club in self.clubs: + club_dict = { + "id": club.id, + "name": club.name, + "email": club.email, + "points": str(club.points) + } + clubs_data["clubs"].append(club_dict) + with open(filepath, "w") as f: + json.dump(clubs_data, f, indent=4) diff --git a/app/booking_manager/competition_manager.py b/app/booking_manager/competition_manager.py new file mode 100644 index 000000000..c94579932 --- /dev/null +++ b/app/booking_manager/competition_manager.py @@ -0,0 +1,50 @@ +# app/booking_manager/competition_manager.py + +import json +from typing import List, Optional +from app.models import Competition +from .data_loader import JSONDataLoader + + +class CompetitionManager: + """ + Gère le chargement, la recherche et la sauvegarde des compétitions. + """ + + def __init__(self, competitions_file: str): + self.competitions_file = competitions_file # Pour la sauvegarde + loader = JSONDataLoader(competitions_file) + data = loader.load_data() + self.competitions: List[Competition] = self._parse_competitions(data) + + def _parse_competitions(self, data: dict) -> List[Competition]: + competitions = [] + for c in data.get("competitions", []): + competitions.append( + Competition( + name=c["name"], + date=c["date"], + number_of_places=int(c["numberOfPlaces"]) + ) + ) + return competitions + + def find_by_name(self, name: str) -> Optional[Competition]: + return next((comp for comp in self.competitions if comp.name == name), None) + + def save_competitions(self, filepath: Optional[str] = None) -> None: + """ + Sauvegarde l'état actuel des compétitions dans un fichier JSON. + """ + if filepath is None: + filepath = self.competitions_file + competitions_data = {"competitions": []} + for comp in self.competitions: + comp_dict = { + "name": comp.name, + "date": comp.date, + "numberOfPlaces": str(comp.number_of_places) + } + competitions_data["competitions"].append(comp_dict) + with open(filepath, "w") as f: + json.dump(competitions_data, f, indent=4) diff --git a/app/booking_manager/data_loader.py b/app/booking_manager/data_loader.py new file mode 100644 index 000000000..82da6b023 --- /dev/null +++ b/app/booking_manager/data_loader.py @@ -0,0 +1,21 @@ +# app/booking_manager/data_loader.py + +import json +import os +from typing import Any + + +class JSONDataLoader: + """ + Classe générique pour charger des données depuis un fichier JSON. + """ + + def __init__(self, filepath: str): + self.filepath = filepath + + def load_data(self) -> Any: + if not os.path.exists(self.filepath): + raise FileNotFoundError(f"Fichier introuvable : {self.filepath}") + with open(self.filepath, "r") as f: + data = json.load(f) + return data diff --git a/app/models.py b/app/models.py new file mode 100644 index 000000000..1783b24c5 --- /dev/null +++ b/app/models.py @@ -0,0 +1,15 @@ +# app/models.py + +class Competition: + def __init__(self, name, date, number_of_places): + self.name = name + self.date = date + self.number_of_places = number_of_places + + +class Club: + def __init__(self, name, email, points, id=None): + self.name = name + self.email = email + self.points = points + self.id = id diff --git a/app/server.py b/app/server.py new file mode 100644 index 000000000..14703de59 --- /dev/null +++ b/app/server.py @@ -0,0 +1,114 @@ +# app/server.py + +from flask import Flask, render_template, request, redirect, flash, url_for +from app.booking_manager import BookingService + +app = Flask(__name__, static_folder="../static") +app.secret_key = "secret_key_xyz" + +# Instanciation du service de réservation, avec les JSON par défaut. +# Si vous souhaitez utiliser des fichiers de test différents, +# configurez-les dans le code ou via des variables d'environnement. +booking_service = BookingService( + clubs_file="data/clubs.json", + competitions_file="data/competitions.json" +) + + +@app.route("/") +def index(): + """ + Page d'accueil de l'application. + """ + return render_template("index.html") + + +@app.route("/showSummary", methods=["POST"]) +def show_summary(): + """ + Récupère l'email du club et affiche la page de résumé (welcome.html). + Si le club n'est pas trouvé, renvoie vers la page d'accueil avec un message d'erreur. + """ + email = request.form.get("email", "") + club = booking_service.club_manager.find_by_email(email) + if not club: + flash("Email inconnu ou invalide.") + return redirect(url_for("index")) + + # Affiche la liste des compétitions disponibles + competitions = booking_service.competition_manager.competitions + return render_template("welcome.html", club=club, competitions=competitions) + + +@app.route("/book//") +def book(competition, club): + """ + Affiche la page de réservation (booking.html) pour un club et une compétition donnés. + Si le club ou la compétition n'existe pas, renvoie vers l'index. + """ + found_competition = booking_service.competition_manager.find_by_name( + competition) + found_club = booking_service.club_manager.find_by_name(club) + if not found_competition or not found_club: + flash("Something went wrong - please try again") + return redirect(url_for("index")) + + return render_template("booking.html", club=found_club, competition=found_competition) + + +@app.route("/purchasePlaces", methods=["POST"]) +def purchase_places(): + """ + Tente d'acheter 'places' places pour un club et une compétition. + - Si la réservation réussit, on affiche 'Great-booking complete!' + - Sinon, on affiche 'Impossible de réserver...' + """ + competition_name = request.form.get("competition") + club_name = request.form.get("club") + places_str = request.form.get("places") + + try: + places_requested = int(places_str) + except ValueError: + flash("Le nombre de places est invalide.") + return redirect(url_for("index")) + + # Vérification de l'existence du club et de la compétition + found_competition = booking_service.competition_manager.find_by_name( + competition_name) + found_club = booking_service.club_manager.find_by_name(club_name) + if not found_competition or not found_club: + flash("Something went wrong - please try again") + return redirect(url_for("index")) + + # Appel à la logique métier + success = booking_service.purchase_places( + club_name, competition_name, places_requested) + if success: + flash("Great-booking complete!") + else: + flash("Impossible de réserver ces places (Règle non respectée).") + + # Recharger les données du club et de la compétition (après mise à jour) + updated_club = booking_service.club_manager.find_by_name(club_name) + competitions = booking_service.competition_manager.competitions + + return render_template("welcome.html", club=updated_club, competitions=competitions) + + +@app.route("/clubsPoints") +def clubs_points(): + """ + Affiche la liste des clubs et leurs points disponibles. + Page publique, sans besoin de login. + """ + clubs = booking_service.club_manager.clubs + return render_template("clubs_points.html", clubs=clubs) + + +@app.route("/logout") +def logout(): + """ + Déconnecte le club (retour à l'accueil). + """ + return redirect(url_for("index")) diff --git a/app/templates/base.html b/app/templates/base.html new file mode 100644 index 000000000..b2b0af466 --- /dev/null +++ b/app/templates/base.html @@ -0,0 +1,31 @@ + + + + + + + {% block title %}GUDLFT{% endblock %} + + + + +
+ {% with messages = get_flashed_messages() %} + {% if messages %} +
    + {% for message in messages %} +
  • {{ message }}
    • + {% endfor %} +
+ {% endif %} + {% endwith %} + {% block content %}{% endblock %} +
+ + diff --git a/app/templates/booking.html b/app/templates/booking.html new file mode 100644 index 000000000..be884db6e --- /dev/null +++ b/app/templates/booking.html @@ -0,0 +1,16 @@ + +{% extends "base.html" %} + +{% block title %}Réservation | {{ competition['name'] }}{% endblock %} + +{% block content %} +

{{ competition['name'] }}

+

Places disponibles: {{ competition['number_of_places'] }}

+
+ + + + + +
+{% endblock %} diff --git a/app/templates/clubs_points.html b/app/templates/clubs_points.html new file mode 100644 index 000000000..f7a06436c --- /dev/null +++ b/app/templates/clubs_points.html @@ -0,0 +1,24 @@ + +{% extends "base.html" %} + +{% block title %}Points des Clubs{% endblock %} + +{% block content %} +

Points des Clubs

+ + + + + + + + + {% for club in clubs %} + + + + + {% endfor %} + +
ClubPoints
{{ club['name'] }}{{ club['points'] }}
+{% endblock %} diff --git a/app/templates/index.html b/app/templates/index.html new file mode 100644 index 000000000..4ef54b808 --- /dev/null +++ b/app/templates/index.html @@ -0,0 +1,13 @@ + +{% extends "base.html" %} + +{% block title %}Accueil | GUDLFT{% endblock %} + +{% block content %} +

Bienvenue sur GUDLFT

+
+ + + +
+{% endblock %} diff --git a/app/templates/welcome.html b/app/templates/welcome.html new file mode 100644 index 000000000..b0e3c68ee --- /dev/null +++ b/app/templates/welcome.html @@ -0,0 +1,21 @@ + +{% extends "base.html" %} + +{% block title %}Résumé | GUDLFT Registration{% endblock %} + +{% block content %} +

Welcome, {{ club['email'] }}

+

Points disponibles: {{ club['points'] }}

+

Compétitions :

+ +{% endblock %} diff --git a/clubs.json b/clubs.json deleted file mode 100644 index 1d7ad1ffe..000000000 --- a/clubs.json +++ /dev/null @@ -1,16 +0,0 @@ -{"clubs":[ - { - "name":"Simply Lift", - "email":"john@simplylift.co", - "points":"13" - }, - { - "name":"Iron Temple", - "email": "admin@irontemple.com", - "points":"4" - }, - { "name":"She Lifts", - "email": "kate@shelifts.co.uk", - "points":"12" - } -]} \ No newline at end of file diff --git a/data/clubs.json b/data/clubs.json new file mode 100644 index 000000000..bd4e54d10 --- /dev/null +++ b/data/clubs.json @@ -0,0 +1,22 @@ +{ + "clubs": [ + { + "id": "1", + "name": "Simply Lift", + "email": "john@simplylift.co", + "points": "12" + }, + { + "id": "2", + "name": "Iron Temple", + "email": "admin@irontemple.com", + "points": "22" + }, + { + "id": "3", + "name": "She Lifts", + "email": "kate@shelifts.co.uk", + "points": "7" + } + ] +} \ No newline at end of file diff --git a/competitions.json b/data/competitions.json similarity index 76% rename from competitions.json rename to data/competitions.json index 039fc61bd..f07b83025 100644 --- a/competitions.json +++ b/data/competitions.json @@ -3,12 +3,12 @@ { "name": "Spring Festival", "date": "2020-03-27 10:00:00", - "numberOfPlaces": "25" + "numberOfPlaces": "8" }, { "name": "Fall Classic", "date": "2020-10-22 13:30:00", - "numberOfPlaces": "13" + "numberOfPlaces": "12" } ] } \ No newline at end of file diff --git a/launch.json b/launch.json new file mode 100644 index 000000000..a0cc0ba8c --- /dev/null +++ b/launch.json @@ -0,0 +1,17 @@ +{ + "name": "Python Debugger: Flask", + "type": "debugpy", + "request": "launch", + "module": "flask", + "env": { + "FLASK_APP": "app/server.py", + "FLASK_DEBUG": "1" + }, + "args": [ + "run", + "--no-debugger", + "--no-reload" + ], + "jinja": true, + "justMyCode": true +} diff --git a/pyvenv.cfg b/pyvenv.cfg new file mode 100644 index 000000000..9c71c33dd --- /dev/null +++ b/pyvenv.cfg @@ -0,0 +1,8 @@ +home = /usr/local/bin +implementation = CPython +version_info = 3.12.2.final.0 +virtualenv = 20.28.0 +include-system-site-packages = false +base-prefix = /Library/Frameworks/Python.framework/Versions/3.12 +base-exec-prefix = /Library/Frameworks/Python.framework/Versions/3.12 +base-executable = /Library/Frameworks/Python.framework/Versions/3.12/bin/python3.12 diff --git a/server.py b/server.py deleted file mode 100644 index 4084baeac..000000000 --- a/server.py +++ /dev/null @@ -1,59 +0,0 @@ -import json -from flask import Flask,render_template,request,redirect,flash,url_for - - -def loadClubs(): - with open('clubs.json') as c: - listOfClubs = json.load(c)['clubs'] - return listOfClubs - - -def loadCompetitions(): - with open('competitions.json') as comps: - listOfCompetitions = json.load(comps)['competitions'] - return listOfCompetitions - - -app = Flask(__name__) -app.secret_key = 'something_special' - -competitions = loadCompetitions() -clubs = loadClubs() - -@app.route('/') -def index(): - return render_template('index.html') - -@app.route('/showSummary',methods=['POST']) -def showSummary(): - club = [club for club in clubs if club['email'] == request.form['email']][0] - return render_template('welcome.html',club=club,competitions=competitions) - - -@app.route('/book//') -def book(competition,club): - foundClub = [c for c in clubs if c['name'] == club][0] - foundCompetition = [c for c in competitions if c['name'] == competition][0] - if foundClub and foundCompetition: - return render_template('booking.html',club=foundClub,competition=foundCompetition) - else: - flash("Something went wrong-please try again") - return render_template('welcome.html', club=club, competitions=competitions) - - -@app.route('/purchasePlaces',methods=['POST']) -def purchasePlaces(): - competition = [c for c in competitions if c['name'] == request.form['competition']][0] - club = [c for c in clubs if c['name'] == request.form['club']][0] - placesRequired = int(request.form['places']) - competition['numberOfPlaces'] = int(competition['numberOfPlaces'])-placesRequired - flash('Great-booking complete!') - return render_template('welcome.html', club=club, competitions=competitions) - - -# TODO: Add route for points display - - -@app.route('/logout') -def logout(): - return redirect(url_for('index')) \ No newline at end of file diff --git a/static/css/style.css b/static/css/style.css new file mode 100644 index 000000000..2a656539d --- /dev/null +++ b/static/css/style.css @@ -0,0 +1,119 @@ +/* static/css/style.css */ + +/* Style global */ +body { + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + background-color: #f8f8f8; + margin: 0; + padding: 0; + color: #333; +} + +/* Barre de navigation */ +nav { + background-color: #333; + color: #fff; + padding: 10px 20px; +} + +nav ul { + list-style: none; + margin: 0; + padding: 0; + display: flex; +} + +nav ul li { + margin-right: 15px; +} + +nav ul li a { + color: #fff; + text-decoration: none; + font-weight: bold; +} + +nav ul li a:hover { + text-decoration: underline; +} + +/* Conteneur principal */ +.container { + width: 90%; + max-width: 1000px; + margin: 20px auto; + background-color: #fff; + padding: 20px; + box-shadow: 0 2px 4px rgba(0,0,0,0.1); + border-radius: 5px; +} + +/* Titres */ +h1, h2, h3 { + color: #444; +} + +/* Formulaires */ +form label { + display: block; + margin-bottom: 5px; + font-weight: bold; +} + +form input[type="email"], +form input[type="number"], +form input[type="text"] { + width: 100%; + max-width: 300px; + padding: 8px; + margin-bottom: 10px; + border: 1px solid #ddd; + border-radius: 4px; +} + +form button { + background-color: #333; + color: #fff; + border: none; + padding: 10px 15px; + border-radius: 4px; + cursor: pointer; +} + +form button:hover { + background-color: #555; +} + +/* Messages flash */ +.flashes { + list-style: none; + padding: 0; + margin: 10px 0; +} + +.flashes li { + background-color: #e74c3c; + color: #fff; + padding: 10px; + border-radius: 4px; + margin-bottom: 5px; +} + +/* Tableaux */ +table { + width: 100%; + border-collapse: collapse; + margin-top: 20px; +} + +table th, +table td { + border: 1px solid #ddd; + padding: 8px; + text-align: left; +} + +table th { + background-color: #333; + color: #fff; +} diff --git a/templates/booking.html b/templates/booking.html deleted file mode 100644 index 06ae1156c..000000000 --- a/templates/booking.html +++ /dev/null @@ -1,17 +0,0 @@ - - - - - Booking for {{competition['name']}} || GUDLFT - - -

{{competition['name']}}

- Places available: {{competition['numberOfPlaces']}} -
- - - - -
- - \ No newline at end of file diff --git a/templates/index.html b/templates/index.html deleted file mode 100644 index 926526b7d..000000000 --- a/templates/index.html +++ /dev/null @@ -1,16 +0,0 @@ - - - - - GUDLFT Registration - - -

Welcome to the GUDLFT Registration Portal!

- Please enter your secretary email to continue: -
- - - -
- - \ No newline at end of file diff --git a/templates/welcome.html b/templates/welcome.html deleted file mode 100644 index ff6b261a2..000000000 --- a/templates/welcome.html +++ /dev/null @@ -1,36 +0,0 @@ - - - - - Summary | GUDLFT Registration - - -

Welcome, {{club['email']}}

Logout - - {% with messages = get_flashed_messages()%} - {% if messages %} -
    - {% for message in messages %} -
  • {{message}}
    • - {% endfor %} -
- {% endif%} - Points available: {{club['points']}} -

Competitions:

-
    - {% for comp in competitions%} -
  • - {{comp['name']}}
    - Date: {{comp['date']}}
    - Number of Places: {{comp['numberOfPlaces']}} - {%if comp['numberOfPlaces']|int >0%} - Book Places - {%endif%} -
    • -
    - {% endfor %} -
- {%endwith%} - - - \ No newline at end of file diff --git a/tests/__init__.py b/tests/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/tests/functional/test_functional.py b/tests/functional/test_functional.py new file mode 100644 index 000000000..e69de29bb diff --git a/tests/integration/__init__.py b/tests/integration/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/tests/integration/test_integration.py b/tests/integration/test_integration.py new file mode 100644 index 000000000..605d7b96a --- /dev/null +++ b/tests/integration/test_integration.py @@ -0,0 +1,68 @@ +# tests/integration/test_integration.py + +import unittest +import os +import json +from app.server import app + + +class TestServerRoutes(unittest.TestCase): + """ + Test d'intégration pour vérifier qu'une réservation de 3 places + aboutit à un message de succès ('Great-booking complete!'). + """ + + def setUp(self): + """ + Prépare l'application Flask en mode TEST et un client de test. + Si nécessaire, réinitialisez ici vos fichiers JSON + (par ex. copy test_clubs.json et test_competitions.json). + """ + app.config['TESTING'] = True + self.client = app.test_client() + + # Exemple (optionnel) : si vous avez un paramètre pour surcharger + # l'emplacement des fichiers clubs/competitions en mode test, + # vous pouvez le faire ici (non détaillé). + + def test_purchase_places_route(self): + """ + Envoie un POST à '/purchasePlaces' pour réserver 3 places + pour 'Iron Temple' dans 'Spring Festival'. Vérifie qu'on obtient + un code 200 et un message de succès ('Great-booking complete!'). + """ + data = { + "club": "Iron Temple", + "competition": "Spring Festival", + "places": "3" + } + # On suit la redirection pour voir le contenu final + response = self.client.post( + "/purchasePlaces", + data=data, + follow_redirects=True + ) + + # Vérifie qu'on obtient un code 200 + self.assertEqual( + response.status_code, + 200, + "La requête /purchasePlaces doit retourner un code 200 (OK)." + ) + + # Vérifie qu'on obtient bien le message de succès + # (ex. "Great-booking complete!") + lowercase_data = response.data.lower() + self.assertIn( + b"great-booking complete!", + lowercase_data, + "Doit contenir un message de réservation réussie ('Great-booking complete!')." + ) + + # Vous pouvez ajouter d'autres checks ici, par ex. vérifier que + # le nombre de places du club et/ou le nombre de points restants + # s'affichent correctement dans la page renvoyée. + + +if __name__ == "__main__": + unittest.main() diff --git a/tests/unit/__init__.py b/tests/unit/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/tests/unit/test_booking_manager_competition_full.py b/tests/unit/test_booking_manager_competition_full.py new file mode 100644 index 000000000..de99f2210 --- /dev/null +++ b/tests/unit/test_booking_manager_competition_full.py @@ -0,0 +1,24 @@ +# tests/unit/test_booking_manager_competition_full.py + +import unittest +from app.booking_manager.booking_service import BookingService + + +class TestBookingManagerCompetitionFull(unittest.TestCase): + def setUp(self): + self.service = BookingService( + clubs_file="data/clubs.json", competitions_file="data/competitions.json") + + def test_purchase_places_competition_full(self): + competition = self.service.competition_manager.find_by_name( + "Spring Festival") + if competition: + competition.number_of_places = 2 # Forcer une compétition avec peu de places + success = self.service.purchase_places( + "Iron Temple", "Spring Festival", 3) + self.assertFalse( + success, "L'achat de 3 places doit échouer si la compétition n'a que 2 places disponibles.") + + +if __name__ == '__main__': + unittest.main() diff --git a/tests/unit/test_booking_manager_inexistant.py b/tests/unit/test_booking_manager_inexistant.py new file mode 100644 index 000000000..ecd69d779 --- /dev/null +++ b/tests/unit/test_booking_manager_inexistant.py @@ -0,0 +1,26 @@ +# tests/unit/test_booking_manager_inexistant.py + +import unittest +from app.booking_manager.booking_service import BookingService + + +class TestBookingManagerInexistant(unittest.TestCase): + def setUp(self): + self.service = BookingService( + clubs_file="data/clubs.json", competitions_file="data/competitions.json") + + def test_purchase_places_club_not_found(self): + success = self.service.purchase_places( + "NonExistentClub", "Spring Festival", 3) + self.assertFalse( + success, "L'achat doit échouer si le club n'existe pas.") + + def test_purchase_places_competition_not_found(self): + success = self.service.purchase_places( + "Iron Temple", "NonExistentCompetition", 3) + self.assertFalse( + success, "L'achat doit échouer si la compétition n'existe pas.") + + +if __name__ == '__main__': + unittest.main() diff --git a/tests/unit/test_booking_manager_insufficient_points.py b/tests/unit/test_booking_manager_insufficient_points.py new file mode 100644 index 000000000..d4354a24b --- /dev/null +++ b/tests/unit/test_booking_manager_insufficient_points.py @@ -0,0 +1,23 @@ +# tests/unit/test_booking_manager_insufficient_points.py + +import unittest +from app.booking_manager.booking_service import BookingService + + +class TestBookingManagerInsufficientPoints(unittest.TestCase): + def setUp(self): + self.service = BookingService( + clubs_file="data/clubs.json", competitions_file="data/competitions.json") + + def test_purchase_places_insufficient_points(self): + club = self.service.club_manager.find_by_name("Iron Temple") + if club: + club.points = 2 # Forcer un club avec peu de points + success = self.service.purchase_places( + "Iron Temple", "Spring Festival", 3) + self.assertFalse( + success, "L'achat de 3 places doit échouer si le club n'a que 2 points.") + + +if __name__ == '__main__': + unittest.main() diff --git a/tests/unit/test_booking_service_persistence.py b/tests/unit/test_booking_service_persistence.py new file mode 100644 index 000000000..128d3327e --- /dev/null +++ b/tests/unit/test_booking_service_persistence.py @@ -0,0 +1,128 @@ +# tests/unit/test_booking_service_persistence.py + +import unittest +import os +import json +from app.booking_manager.booking_service import BookingService + + +class TestBookingServicePersistence(unittest.TestCase): + """ + Teste la persistance des données lors de l'achat de places via BookingService. + """ + + def setUp(self): + """ + Prépare deux fichiers JSON de test (pour clubs et compétitions) + afin de ne pas affecter les fichiers de production. + """ + self.test_clubs_file = "data/test_clubs.json" + self.test_competitions_file = "data/test_competitions.json" + + clubs_data = { + "clubs": [ + { + "id": "1", + "name": "Simply Lift", + "email": "john@simplylift.co", + "points": "13" + }, + { + "id": "2", + "name": "Iron Temple", + "email": "admin@irontemple.com", + "points": "4" + }, + { + "id": "3", + "name": "She Lifts", + "email": "kate@shelifts.co.uk", + "points": "12" + } + ] + } + + competitions_data = { + "competitions": [ + { + "name": "Spring Festival", + "date": "2020-03-27 10:00:00", + "numberOfPlaces": "25" + }, + { + "name": "Fall Classic", + "date": "2020-10-22 13:30:00", + "numberOfPlaces": "13" + } + ] + } + + # Écrit les données JSON dans des fichiers temporaires + with open(self.test_clubs_file, "w") as f: + json.dump(clubs_data, f, indent=4) + with open(self.test_competitions_file, "w") as f: + json.dump(competitions_data, f, indent=4) + + # Instancie BookingService avec ces fichiers de test + self.service = BookingService( + clubs_file=self.test_clubs_file, + competitions_file=self.test_competitions_file + ) + + def tearDown(self): + """ + Supprime les fichiers temporaires pour ne pas polluer l'environnement. + """ + if os.path.exists(self.test_clubs_file): + os.remove(self.test_clubs_file) + if os.path.exists(self.test_competitions_file): + os.remove(self.test_competitions_file) + + def test_booking_service_persistence(self): + """ + Vérifie qu'après une réservation de 3 places pour "Iron Temple" dans "Spring Festival" : + - Le nombre de points du club est mis à jour (4 - 3 = 1). + - Le nombre de places dans la compétition est mis à jour (25 - 3 = 22). + - Les modifications sont bien persistées dans les fichiers JSON. + """ + success = self.service.purchase_places( + "Iron Temple", "Spring Festival", 3) + self.assertTrue(success, "La réservation devrait réussir.") + + # Vérification du fichier JSON des clubs + with open(self.test_clubs_file, "r") as f: + clubs_data = json.load(f) + + iron_club = next( + (club for club in clubs_data["clubs"] + if club["name"] == "Iron Temple"), + None + ) + self.assertIsNotNone( + iron_club, "Les données du club 'Iron Temple' doivent être présentes.") + self.assertEqual( + iron_club["points"], "1", + "Les points doivent être mis à jour (4 - 3 = 1)." + ) + + # Vérification du fichier JSON des compétitions + with open(self.test_competitions_file, "r") as f: + competitions_data = json.load(f) + + spring_comp = next( + (comp for comp in competitions_data["competitions"] + if comp["name"] == "Spring Festival"), + None + ) + self.assertIsNotNone( + spring_comp, + "Les données de 'Spring Festival' doivent être présentes." + ) + self.assertEqual( + spring_comp["numberOfPlaces"], "22", + "Les places doivent être mises à jour (25 - 3 = 22)." + ) + + +if __name__ == '__main__': + unittest.main() diff --git a/tests/unit/test_club_manager_save.py b/tests/unit/test_club_manager_save.py new file mode 100644 index 000000000..8755f3f48 --- /dev/null +++ b/tests/unit/test_club_manager_save.py @@ -0,0 +1,53 @@ +# tests/unit/test_club_manager_save.py + +import unittest +import os +import json +from app.booking_manager.club_manager import ClubManager + + +class TestClubManagerSave(unittest.TestCase): + def setUp(self): + # Créez un fichier temporaire de clubs pour les tests + self.test_file = "data/test_clubs.json" + clubs_data = { + "clubs": [ + {"id": "1", "name": "Simply Lift", + "email": "john@simplylift.co", "points": "13"}, + {"id": "2", "name": "Iron Temple", + "email": "admin@irontemple.com", "points": "4"}, + {"id": "3", "name": "She Lifts", + "email": "kate@shelifts.co.uk", "points": "12"} + ] + } + with open(self.test_file, "w") as f: + json.dump(clubs_data, f, indent=4) + self.manager = ClubManager(clubs_file=self.test_file) + + def tearDown(self): + # Supprimez le fichier temporaire après le test + if os.path.exists(self.test_file): + os.remove(self.test_file) + + def test_save_clubs_updates_json(self): + # Modifier les points pour un club + club = self.manager.find_by_name("Iron Temple") + self.assertIsNotNone(club, "Le club 'Iron Temple' doit exister.") + club.points = 2 # On simule une réduction de points + + # Sauvegarder l'état actuel + self.manager.save_clubs() + + # Relire le fichier pour vérifier la mise à jour + with open(self.test_file, "r") as f: + data = json.load(f) + iron_data = next( + (c for c in data["clubs"] if c["name"] == "Iron Temple"), None) + self.assertIsNotNone( + iron_data, "Les données pour 'Iron Temple' doivent être présentes dans le fichier JSON.") + self.assertEqual( + iron_data["points"], "2", "Les points du club doivent être mis à jour dans le fichier JSON.") + + +if __name__ == '__main__': + unittest.main() diff --git a/tests/unit/test_points_display.py b/tests/unit/test_points_display.py new file mode 100644 index 000000000..cf731bb04 --- /dev/null +++ b/tests/unit/test_points_display.py @@ -0,0 +1,28 @@ +# tests/unit/test_points_display.py + +import unittest +from app.server import app + + +class TestPointsDisplay(unittest.TestCase): + def setUp(self): + app.config['TESTING'] = True + self.client = app.test_client() + + def test_points_display_on_index(self): + """Vérifie que la page d'accueil contient un indice sur l'affichage des points.""" + response = self.client.get("/") + self.assertEqual(response.status_code, 200) + # Par exemple, vérifier que le lien vers "Points Clubs" est présent + self.assertIn(b"Points Clubs", response.data) + + def test_points_display_on_welcome(self): + """Vérifie que la page welcome affiche les points après connexion.""" + response = self.client.post( + "/showSummary", data={"email": "admin@irontemple.com"}, follow_redirects=True) + self.assertEqual(response.status_code, 200) + self.assertIn(b"Points disponibles", response.data) + + +if __name__ == '__main__': + unittest.main() diff --git a/tests/unit/test_server.py b/tests/unit/test_server.py new file mode 100644 index 000000000..a32d405b6 --- /dev/null +++ b/tests/unit/test_server.py @@ -0,0 +1,38 @@ +import unittest +from app.server import app + + +class TestWelcomePage(unittest.TestCase): + + def setUp(self): + """ + Prépare l'application Flask en mode TEST. + """ + app.config['TESTING'] = True + self.client = app.test_client() + + def test_show_summary_no_undefined_error_for_unknown_email(self): + """ + Vérifie que l'application redirige (302) pour un email inconnu + et ne produit pas d'erreur Jinja une fois la redirection suivie. + """ + response = self.client.post( + '/showSummary', data={'email': 'email_inconnu@example.com'}) + + # On s'attend à un code 302 (redirection) + self.assertEqual(response.status_code, 302, + "La route doit rediriger pour un email inconnu.") + + # Optionnel : suivre la redirection pour valider le contenu final + response_followed = self.client.post( + '/showSummary', + data={'email': 'email_inconnu@example.com'}, + follow_redirects=True + ) + # Après la redirection, on devrait avoir un code 200 (page affichée) + self.assertEqual(response_followed.status_code, 200, + "Après redirection, on doit avoir un code 200.") + + # Vérifie qu'on ne voit pas 'UndefinedError' dans la page + self.assertNotIn(b'UndefinedError', response_followed.data, + "Aucune erreur Jinja ne doit être présente dans la page finale.") diff --git a/tests/unit/test_static_files.py b/tests/unit/test_static_files.py new file mode 100644 index 000000000..553b15a2c --- /dev/null +++ b/tests/unit/test_static_files.py @@ -0,0 +1,23 @@ +# tests/unit/test_static_files.py + +import unittest +from app.server import app + + +class TestStaticFiles(unittest.TestCase): + def setUp(self): + app.config['TESTING'] = True + self.client = app.test_client() + + def test_css_loaded(self): + response = self.client.get('/static/css/style.css') + self.assertEqual(response.status_code, 200, + "Le CSS devrait être accessible et retourner un code 200.") + self.assertTrue(len(response.data) > 0, + "Le fichier CSS ne doit pas être vide.") + self.assertIn(b"body", response.data, + "Le CSS doit contenir la règle 'body'.") + + +if __name__ == '__main__': + unittest.main() diff --git a/tests/unit/test_welcome_page.py b/tests/unit/test_welcome_page.py new file mode 100644 index 000000000..70abc8b95 --- /dev/null +++ b/tests/unit/test_welcome_page.py @@ -0,0 +1,26 @@ +# tests/unit/test_welcome_page.py + +import unittest +from app.server import app + + +class TestWelcomePage(unittest.TestCase): + def setUp(self): + app.config['TESTING'] = True + self.client = app.test_client() + + def test_show_summary_unknown_email_redirects(self): + response = self.client.post( + '/showSummary', data={'email': 'unknown@example.com'}) + self.assertEqual(response.status_code, 302, + "Doit rediriger pour un email inconnu.") + response_followed = self.client.post( + '/showSummary', data={'email': 'unknown@example.com'}, follow_redirects=True) + self.assertEqual(response_followed.status_code, 200, + "Après redirection, le code doit être 200.") + self.assertNotIn(b"UndefinedError", response_followed.data, + "Aucune erreur Jinja ne doit apparaître.") + + +if __name__ == '__main__': + unittest.main()