added ok and nok on points

test Ok on soup
works better with init
2025-07-03 11:41:17 +02:00 · 2025-07-02 17:27:06 +02:00 · 2025-07-02 15:07:28 +02:00 · 2025-07-02 15:06:46 +02:00 · 2025-07-02 11:36:51 +02:00 · 2025-06-30 10:32:46 +02:00
7 changed files with 101 additions and 10 deletions
--- a/server.py
+++ b/server.py
@ -26,9 +26,11 @@ def index():

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

@app.route('/book/<competition>/<club>')
 def book(competition,club):
@ -46,14 +48,21 @@ 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!')
+    points = int(club['points'])
+    if placesRequired <= points:
+        competition['numberOfPlaces'] = int(competition['numberOfPlaces']) - placesRequired
+        if competition['numberOfPlaces'] < 0:
+            competition['numberOfPlaces'] = 0
+        flash("Great-booking complete!")
+    else:
+        flash("You don't have enough points")
    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'))
+    return redirect(url_for('index'))
--- a/templates/index.html
+++ b/templates/index.html
@ -6,6 +6,16 @@
 </head>
 <body>
    <h1>Welcome to the GUDLFT Registration Portal!</h1>
+        {% with messages = get_flashed_messages()%}
+        {% if messages %}
+                <ul>
+                {% for message in messages %}
+                        <li>{{message}}</li>
+               	{% endfor %}
+               	</ul>
+        	{% endif%}
+    	{% endwith %}
+
    Please enter your secretary email to continue:
    <form action="showSummary" method="post">
        <label for="email">Email:</label>
@ -13,4 +23,4 @@
        <button type="submit">Enter</button>
    </form>
 </body>
-</html>
+</html>
--- a/templates/welcome.html
+++ b/templates/welcome.html
@ -5,7 +5,7 @@
    <title>Summary | GUDLFT Registration</title>
 </head>
 <body>
-        <h2>Welcome, {{club['email']}} </h2><a href="{{url_for('logout')}}">Logout</a>
+        <h2>Welcome, {{club['email']}}</h2><a href="{{url_for('logout')}}">Logout</a>

    {% with messages = get_flashed_messages()%}
    {% if messages %}
@ -15,7 +15,7 @@
        {% endfor %}
       </ul>
    {% endif%}
-    Points available: {{club['points']}}
+    <b id="points">Points available: </b><span>{{club['points']}}</span>
    <h3>Competitions:</h3>
    <ul>
        {% for comp in competitions%}
@ -33,4 +33,4 @@
    {%endwith%}

 </body>
-</html>
+</html>
--- a/tests/init.py
+++ b/tests/init.py
--- a/tests/conftest.py
+++ b/tests/conftest.py
@ -0,0 +1,28 @@
+import pytest
+from server import app
+from bs4 import BeautifulSoup
+
+
+EMAIL1 = "admin@irontemple.com"
+EMAIL2 = "john@simplylift.co"
+@pytest.fixture
+def club1():
+    data = {"competition": "Spring Festival", "club": "Iron Temple"}
+    return data
+
+@pytest.fixture
+def club2():
+    data = {"competition": "Fall Classic", "club": "Iron Temple"}
+    return data
+
+@pytest.fixture
+def client():
+    with app.test_client() as client:
+        yield client
+
+@pytest.fixture
+def connect(client):
+    response = client.post('/showSummary', data={"email": EMAIL1})
+    soup = BeautifulSoup(response.data, 'html.parser')
+    return soup
+
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@ -0,0 +1,25 @@
+from flask import session
+from bs4 import BeautifulSoup
+
+
+def test_should_status_code_ok(client):
+    response = client.get('/')
+    assert response.status_code == 200
+
+
+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")]
+
+
+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
+
+
--- a/tests/test_purchase.py
+++ b/tests/test_purchase.py
@ -0,0 +1,19 @@
+from bs4 import BeautifulSoup
+from flask import session
+
+
+class TestPoints:
+    
+    def test_should_nok_when_too_much_points(self, client, connect, club1):
+        points = int(connect.span.text)
+        club1.update({"places": points+1})
+        response = client.post('/purchasePlaces', data=club1)
+        soup = BeautifulSoup(response.data, "html.parser")
+        assert "You don't have enough points" == soup.li.text
+
+    def test_should_ok_when_enough_points(self, client, connect, club1):
+        points = int(connect.span.text)
+        data = club1.update({"places": points-1})
+        response = client.post('/purchasePlaces', data=club1)
+        soup = BeautifulSoup(response.data, "html.parser")
+        assert "Great-booking complete!" == soup.li.text
Author	SHA1	Message	Date
yann	0370de60e0	added ok and nok on points	2025-07-03 11:41:17 +02:00
yann	813b7849fe	test Ok on soup	2025-07-02 17:27:06 +02:00
yann	9705789809	works better with init	2025-07-02 15:07:28 +02:00
yann	b34382c46c	first try to get session cookie	2025-07-02 15:06:46 +02:00
yann	90cae5ffc9	first try with fixture for login	2025-07-02 11:36:51 +02:00
yann	d3e9eda937	let this fix for issue6	2025-06-30 10:32:46 +02:00
yann	b70f80f3cb	added checking and substracting points	2025-06-20 15:12:59 +02:00
Yann	2317006de9	Merge pull request 'fixed list, handled wrong email case, adjusted template' (#1 ) from issue#1 into main Reviewed-on: #1	2025-06-20 12:34:47 +00:00
yann	a50d1946ce	fixed list, handled wrong email case, adjusted template	2025-06-20 12:13:50 +02:00