Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed .DS_Store
Binary file not shown.
8 changes: 6 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ bin
include
lib
.Python
tests/
.envrc
__pycache__
__pycache__.DS_Store
env/
__pycache__/
*.pyc
.DS_Store
.pytest_cache/
2 changes: 2 additions & 0 deletions pytest.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[pytest]
testpaths = tests
15 changes: 9 additions & 6 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
click==7.1.2
Flask==1.1.2
itsdangerous==1.1.0
Jinja2==2.11.2
MarkupSafe==1.1.1
Werkzeug==1.0.1
click==8.1.7
Flask==3.0.3
itsdangerous==2.2.0
Jinja2==3.1.4
MarkupSafe==2.1.5
Werkzeug==3.0.4
pytest==8.3.3
pytest-cov==5.0.0
locust==2.31.6
25 changes: 23 additions & 2 deletions server.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,20 @@ def loadCompetitions():
competitions = loadCompetitions()
clubs = loadClubs()

MAX_PLACES_PER_COMPETITION = 12

@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)
matching_clubs = [c for c in clubs if c['email'] == request.form['email']]
if not matching_clubs:
flash("Sorry, that email was not found.")
return redirect(url_for('index'))
club = matching_clubs[0]
return render_template('welcome.html', club=club, competitions=competitions)


@app.route('/book/<competition>/<club>')
Expand All @@ -46,7 +52,22 @@ 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'])

if placesRequired > MAX_PLACES_PER_COMPETITION:
flash("You cannot book more than 12 places per competition.")
return render_template('welcome.html', club=club, competitions=competitions)

if placesRequired > int (competition['numberOfPlaces']):
flash("There are not enough places available in this competition")
return render_template('welcome.html', club=club, competitions=competitions)

if placesRequired > int(club['points']):
flash("You do not have enough points to book that many places.")
return render_template('welcome.html', club=club, competitions=competitions)


competition['numberOfPlaces'] = int(competition['numberOfPlaces'])-placesRequired
club['points'] = int(club['points']) - placesRequired
flash('Great-booking complete!')
return render_template('welcome.html', club=club, competitions=competitions)

Expand Down
9 changes: 9 additions & 0 deletions templates/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,15 @@
<title>GUDLFT Registration</title>
</head>
<body>
{% with messages = get_flashed_messages() %}
{% if messages %}
<ul>
{% for message in messages %}
<li>{{ message }}</li>
{% endfor %}
</ul>
{% endif %}
{% endwith %}
<h1>Welcome to the GUDLFT Registration Portal!</h1>
Please enter your secretary email to continue:
<form action="showSummary" method="post">
Expand Down
Empty file added tests/__init__.py
Empty file.
18 changes: 18 additions & 0 deletions tests/conftest.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import pytest
import copy
import server


@pytest.fixture
def client():
server.app.config['TESTING'] = True
with server.app.test_client() as client:
yield client

@pytest.fixture(autouse=True)
def reset_data():
clubs_sauvegarde = copy.deepcopy(server.clubs)
competition_sauvegarde = copy.deepcopy(server.competitions)
yield
server.clubs[:] = clubs_sauvegarde
server.competitions[:] = competition_sauvegarde
Empty file added tests/functional/__init__.py
Empty file.
Empty file added tests/integration/__init__.py
Empty file.
19 changes: 19 additions & 0 deletions tests/integration/test_login.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
def test_login_with_valid_email_shows_summary(client):
"""Happy path : un email connu doit afficher la page de résumé."""
response = client.post(
"/showSummary",
data={"email": "john@simplylift.co"},
)
assert response.status_code == 200
assert b"john@simplylift.co" in response.data


def test_login_with_unknown_email_does_not_crash(client):
"""Sad path (bug #1) : un email inconnu ne doit pas faire planter l'appli."""
response = client.post(
"/showSummary",
data={"email": "inconnu@test.com"},
follow_redirects=True,
)
assert response.status_code == 200
assert b"Sorry, that email was not found." in response.data
106 changes: 106 additions & 0 deletions tests/integration/test_purchase.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
import server


def test_purchase_deducts_points_from_club(client):
"""Bug #6 : les points utilises doivent etre deduits du solde du club."""
# On choisit un club et une competition connus
club = next(c for c in server.clubs if c['name'] == "Simply Lift")
competition = next(
c for c in server.competitions if c['name'] == "Spring Festival"
)

points_avant = int(club['points'])
places_reservees = 3

client.post(
"/purchasePlaces",
data={
"competition": competition['name'],
"club": club['name'],
"places": str(places_reservees),
},
)

points_apres = int(club['points'])
assert points_apres == points_avant - places_reservees

def test_purchase_more_than_points_is_blocked(client):
"""Bug #2 : un club ne peut pas reserver plus de places qu'il n'a de points."""
club = next(c for c in server.clubs if c['name'] == "Iron Temple") # 4 points
competition = next(
c for c in server.competitions if c['name'] == "Spring Festival"
)

points_avant = int(club['points'])
places_demandees = points_avant + 5 # plus que le solde : impossible

response = client.post(
"/purchasePlaces",
data={
"competition": competition['name'],
"club": club['name'],
"places": str(places_demandees),
},
follow_redirects=True,
)

# Les points ne doivent pas avoir changé (rien n'a ete reserve)
assert int(club['points']) == points_avant
# Un message d'erreur doit apparaitre
assert b"do not have enough points" in response.data

def test_purchase_more_than_12_places_is_blocked(client):
"""Bug #3 : un club ne peut reserver plus de 12 places par competition"""
# On choisit un club et une competition connus
club = next(c for c in server.clubs if c['name'] == "Simply Lift")
competition = next(
c for c in server.competitions if c['name'] == "Spring Festival"
)

points_avant = int(club['points'])
places_demandees = 13 # au dessus de la limite de 12

response = client.post(

"/purchasePlaces",
data={
"competition": competition['name'],
"club": club['name'],
"places": str(places_demandees),
},
follow_redirects=True,
)

# Rien ne doit avoir ete debite
assert int(club["points"]) == points_avant
# Un message erreur doit apparaitre
assert b"cannot book more than 12 places" in response.data

def test_purchase_more_than_available_places_is_blocked(client):
"""Bug #4 : un club ne peut pas reserver plus de places qu'il n'en reste"""
club = next(c for c in server.clubs if c['name'] == "Simply Lift")
competition = next(
c for c in server.competitions if c['name'] == "Spring Festival"
)

# Force une competition presque pleine
competition['numberOfPlaces'] = "5"

points_avant = int(club['points'])
places_demandees = 10 # Sous la limite de 12 mais plus que les 5 restants

response = client.post(
"/purchasePlaces",
data={
"competition": competition['name'],
"club": club['name'],
"places": str(places_demandees),
},
follow_redirects=True,
)

# Rien ne doit avoir change
assert int(club['points']) == points_avant
assert int (competition['numberOfPlaces']) == 5
# Un message d'erreur doit apparaitre
assert b"not enough places available" in response.data
Empty file added tests/unit/__init__.py
Empty file.