5 Commits

Author SHA1 Message Date
691392988f more than 12 test ok 2025-07-03 15:25:21 +02:00
524c4ca028 test on 12, but error and fails 2025-07-03 15:08:11 +02:00
f323cd8310 let this fix for issue6 2025-06-30 10:35:17 +02:00
e6d4d05917 use session to memorize places/competition 2025-06-23 12:44:59 +02:00
5102e366e8 Merge pull request 'added checking and substracting points' (#2) from issue2 into main
Reviewed-on: #2
2025-06-20 13:18:14 +00:00
7 changed files with 41 additions and 15 deletions

BIN
.DS_Store vendored

Binary file not shown.

View File

@@ -1,5 +1,5 @@
import json
from flask import Flask,render_template,request,redirect,flash,url_for
from flask import Flask,render_template,request,redirect,flash,url_for,session
def loadClubs():
@@ -48,17 +48,26 @@ 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 competition['name'] in session:
places = {competition['name']: session[competition['name']] + placesRequired}
else:
places = {competition['name']: placesRequired}
points = int(club['points'])
if placesRequired <= 12:
if places[competition['name']] <= 12:
if placesRequired <= points:
competition['numberOfPlaces'] = int(competition['numberOfPlaces']) - placesRequired
if competition['numberOfPlaces'] < 0:
competition['numberOfPlaces'] = 0
flash("Great-booking complete!")
if not competition['name'] in session:
session[competition['name']] = placesRequired
flash('Great-booking complete!')
else:
flash("You don't have enough points")
return render_template('welcome.html', club=club, competitions=competitions)
else:
flash(f"You already booked 12 places for {competition['name']}")
else:
flash("You can't book more than 12 places")
return render_template('welcome.html', club=club,
competitions=competitions)
# TODO: Add route for points display
@@ -66,3 +75,6 @@ def purchasePlaces():
@app.route('/logout')
def logout():
return redirect(url_for('index'))
if (__name__ == "__main__"):
app.run(debug=True)

View File

@@ -5,6 +5,8 @@ from bs4 import BeautifulSoup
EMAIL1 = "admin@irontemple.com"
EMAIL2 = "john@simplylift.co"
@pytest.fixture
def club1():
data = {"competition": "Spring Festival", "club": "Iron Temple"}

View File

@@ -10,6 +10,7 @@ def test_should_status_code_ok(client):
def test_should_display_sorry_with_unknown_email(client):
email = "test@test.com"
response = client.post('/showSummary', data={"email": email})
print(session)
assert "_flashes" in session
assert session["_flashes"] == [("message", "Sorry, that email wasn't found")]
@@ -17,7 +18,9 @@ def test_should_display_sorry_with_unknown_email(client):
def test_shoul_display_page_on_known_email(client):
email = "admin@irontemple.com"
response = client.post('/showSummary', data={"email": email})
print(session)
soup = BeautifulSoup(response.data, 'html.parser')
assert soup.h2.text == "Welcome, "+email

View File

@@ -13,7 +13,16 @@ class TestPoints:
def test_should_ok_when_enough_points(self, client, connect, club1):
points = int(connect.span.text)
data = club1.update({"places": points-1})
club1.update({"places": points-1})
response = client.post('/purchasePlaces', data=club1)
soup = BeautifulSoup(response.data, "html.parser")
assert "Great-booking complete!" == soup.li.text
class TestPlaces:
def test_should_refuse_more_than_12(self, client, club1):
club1.update({"places": 13})
response = client.post('/purchasePlaces', data=club1)
soup = BeautifulSoup(response.data, "html.parser")
assert "You can't book more than 12 places" == soup.li.text