more than 12 test ok

Reviewed-on: #2

Pipfile

@@ -10,9 +10,6 @@ itsdangerous = "==1.1.0"
 jinja2 = "==2.11.2"
 markupsafe = "==1.1.1"
 werkzeug = "==1.0.1"
-pytest = "*"
-pytest-flask = "*"
-bs4 = "*"
 
 [dev-packages]
 

Pipfile.lock

@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "4d7a66df30afcd7f894d943098d49a686eaad5e68b7b19762f763bcb22c05499"
+            "sha256": "55e68c2c6e7fb3f1685b9dfe66180ae537a367985700c08a86ccd664d56ccad7"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -17,22 +17,6 @@
         ]
     },
     "default": {
-        "beautifulsoup4": {
-            "hashes": [
-                "sha256:9bbbb14bfde9d79f38b8cd5f8c7c85f4b8f2523190ebed90e950a8dea4cb1c4b",
-                "sha256:dbb3c4e1ceae6aefebdaf2423247260cd062430a410e38c66f2baa50a8437195"
-            ],
-            "markers": "python_full_version >= '3.7.0'",
-            "version": "==4.13.4"
-        },
-        "bs4": {
-            "hashes": [
-                "sha256:a48685c58f50fe127722417bae83fe6badf500d54b55f7e39ffe43b798653925",
-                "sha256:abf8742c0805ef7f662dce4b51cca104cffe52b835238afc169142ab9b3fbccc"
-            ],
-            "index": "pypi",
-            "version": "==0.0.2"
-        },
         "click": {
             "hashes": [
                 "sha256:d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a",
@@ -51,14 +35,6 @@
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
             "version": "==1.1.2"
         },
-        "iniconfig": {
-            "hashes": [
-                "sha256:3abbd2e30b36733fee78f9c7f7308f2d0050e88f0087fd25c2645f63c773e1c7",
-                "sha256:9deba5723312380e77435581c6bf4935c94cbfab9b1ed33ef8d238ea168eb760"
-            ],
-            "markers": "python_version >= '3.8'",
-            "version": "==2.1.0"
-        },
         "itsdangerous": {
             "hashes": [
                 "sha256:321b033d07f2a4136d3ec762eac9f16a10ccd60f53c0c91af90217ace7ba1f19",
@@ -136,64 +112,6 @@
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
             "version": "==1.1.1"
         },
-        "packaging": {
-            "hashes": [
-                "sha256:29572ef2b1f17581046b3a2227d5c611fb25ec70ca1ba8554b24b0e69331a484",
-                "sha256:d443872c98d677bf60f6a1f2f8c1cb748e8fe762d2bf9d3148b5599295b0fc4f"
-            ],
-            "markers": "python_version >= '3.8'",
-            "version": "==25.0"
-        },
-        "pluggy": {
-            "hashes": [
-                "sha256:7dcc130b76258d33b90f61b658791dede3486c3e6bfb003ee5c9bfb396dd22f3",
-                "sha256:e920276dd6813095e9377c0bc5566d94c932c33b27a3e3945d8389c374dd4746"
-            ],
-            "markers": "python_version >= '3.9'",
-            "version": "==1.6.0"
-        },
-        "pygments": {
-            "hashes": [
-                "sha256:636cb2477cec7f8952536970bc533bc43743542f70392ae026374600add5b887",
-                "sha256:86540386c03d588bb81d44bc3928634ff26449851e99741617ecb9037ee5ec0b"
-            ],
-            "markers": "python_version >= '3.8'",
-            "version": "==2.19.2"
-        },
-        "pytest": {
-            "hashes": [
-                "sha256:539c70ba6fcead8e78eebbf1115e8b589e7565830d7d006a8723f19ac8a0afb7",
-                "sha256:7c67fd69174877359ed9371ec3af8a3d2b04741818c51e5e99cc1742251fa93c"
-            ],
-            "index": "pypi",
-            "markers": "python_version >= '3.9'",
-            "version": "==8.4.1"
-        },
-        "pytest-flask": {
-            "hashes": [
-                "sha256:58be1c97b21ba3c4d47e0a7691eb41007748506c36bf51004f78df10691fa95e",
-                "sha256:c0e36e6b0fddc3b91c4362661db83fa694d1feb91fa505475be6732b5bc8c253"
-            ],
-            "index": "pypi",
-            "markers": "python_version >= '3.7'",
-            "version": "==1.3.0"
-        },
-        "soupsieve": {
-            "hashes": [
-                "sha256:6e60cc5c1ffaf1cebcc12e8188320b72071e922c2e897f737cadce79ad5d30c4",
-                "sha256:ad282f9b6926286d2ead4750552c8a6142bc4c783fd66b0293547c8fe6ae126a"
-            ],
-            "markers": "python_version >= '3.8'",
-            "version": "==2.7"
-        },
-        "typing-extensions": {
-            "hashes": [
-                "sha256:8676b788e32f02ab42d9e7c61324048ae4c6d844a399eebace3d4979d75ceef4",
-                "sha256:a1514509136dd0b477638fc68d6a91497af5076466ad0fa6c338e44e359944af"
-            ],
-            "markers": "python_version >= '3.9'",
-            "version": "==4.14.0"
-        },
         "werkzeug": {
             "hashes": [
                 "sha256:2de2a5db0baeae7b2d2664949077c2ac63fbd16d98da0ff71837f7d1dea3fd43",

clubs.json

@@ -13,4 +13,4 @@
         "email": "kate@shelifts.co.uk",
         "points":"12"
     }
-]}
+]}

server.py

@@ -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():
@@ -26,15 +26,11 @@ def index():
 
 @app.route('/showSummary',methods=['POST'])
 def showSummary():
-    try:
+    club = [club for club in clubs if club['email'] == request.form['email']]
-        club = [club for club in clubs if club['email'] == request.form['email']][0]
+    if club:
-    # if club:
+        return render_template('welcome.html', club=club[0], competitions=competitions)
-        return render_template('welcome.html', club=club, competitions=competitions)
+    flash("Sorry, that email wasn't found")
-    # flash("Sorry, that email wasn't found")
+    return redirect(url_for('index'))
-    # return redirect(url_for('index'))
-    except IndexError:
-        flash("Sorry, that email wasn't found")
-        return redirect(url_for('index'))
 
 @app.route('/book/<competition>/<club>')
 def book(competition,club):
@@ -52,10 +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'])
-    competition['numberOfPlaces'] = int(competition['numberOfPlaces'])-placesRequired
+    if competition['name'] in session:
-    flash('Great-booking complete!')
+        places = {competition['name']: session[competition['name']] + placesRequired}
-    return render_template('welcome.html', club=club, competitions=competitions)
+    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 not competition['name'] in session:
+                    session[competition['name']] = placesRequired
+                flash('Great-booking complete!')
+            else:
+                flash("You don't have enough points")
+        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
 
@@ -63,3 +75,6 @@ def purchasePlaces():
 @app.route('/logout')
 def logout():
     return redirect(url_for('index'))
+
+if (__name__ == "__main__"):
+    app.run(debug=True)

templates/welcome.html

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

tests/conftest.py

@@ -1,7 +1,30 @@
 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
+

tests/test_connection.py

@@ -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,6 +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
 
+
+

tests/test_purchase.py

@@ -0,0 +1,28 @@
+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)
+        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