Chore/flake8 error fix (#11)

* feat(board.html): add template for points display board

* feat(server): add route for points display board

* feat(board.html): complete template

* test(test_points_board): start testing happy path

* feat(board.html): add condition if no clubs in json

* test(test_points_board): add sad path to test

* test(units/): add test_unlimited_points.py

* fix(server): add condition to limit purchase

* fix(booking.html): add display of flash message

* test(units/): test_unlimited_points.py passed

* test(units/): change docstrings in test_unlimited_points.py

* test(units/): done test_unlimited_points.py

* fix(issue): [OpenClassrooms-Student-Center#2]

* test(units/): add test_points_not_update.py

with TDD approch added test and failed

* fix(server): add substraction points after book places

* test(units/): run test_points_not_update.py and passed

* fix(issue): [OpenClassrooms-Student-Center#6]

* test(units/): add test_book_under_12.py

with TDD method: started with failed test

* fix(server): add condition if book more 12 places

* test(units/): complete test_book_under_12.py and run tests passed

* fix(issue): [OpenClassrooms-Student-Center#4]

* test(functional/): add & complete test_route.py

* fix(404.html): add 404 handler and template

* fix(500.html): add 500 handler and template

* test(functional/): add & complete test_load_json.py

* test(integration/): add & complete test of app

* fix(server): issue book more than places available

* test(integration/): cleanup test_app

* test(coverage/): make changes to have 100% test coverage

* test(requirements.txt): install Locust

* test(performance/): configure locust

* test(performance/): add README

* refactor(app): flake8 html report 100% clean

* refactor(app): remove unused fixtures

Author: Rossignol-h

server.py

@@ -1,16 +1,18 @@
 import json
 import datetime
-from flask import Flask,render_template,request,redirect,flash,url_for, abort
+from flask import Flask, render_template, request, redirect, flash, url_for
 
 
 # ============================================ FLASK APP INITIALIZATION
 
 app = Flask(__name__)
 app.secret_key = 'something_special'
 
+
 def page_not_found(e):
     return render_template('404.html'), 404
 
+
 app.register_error_handler(404, page_not_found)
 
 
@@ -20,7 +22,7 @@ def page_not_found(e):
 PATH_JSON_CLUBS = 'clubs.json'
 PATH_JSON_COMPETITIONS = 'competitions.json'
 
-# ============================================ LOAD JSON DATA 
+# ============================================ LOAD JSON DATA
 
 
 def loadClubs():
@@ -30,7 +32,7 @@ def loadClubs():
                 listOfClubs = json.load(c)['clubs']
                 if listOfClubs and len(listOfClubs) > 0:
                     return listOfClubs
-                else :
+                else:
                     raise Exception("This file is empty, or key not found")
 
     except Exception as error:
@@ -42,14 +44,16 @@ def loadCompetitions():
         if PATH_JSON_COMPETITIONS:
             with open(PATH_JSON_COMPETITIONS) as c:
                 listOfCompetitions = json.load(c)['competitions']
+                listOfCompetitions.sort(key=lambda x: x["date"], reverse=True)
                 if listOfCompetitions and len(listOfCompetitions) > 0:
                     return listOfCompetitions
-                else :
+                else:
                     raise Exception("This file is empty, or key not found")
 
     except Exception as error:
         return str(error)
 
+
 competitions = loadCompetitions()
 clubs = loadClubs()
 now = datetime.datetime.now()
@@ -86,7 +90,7 @@ def show_summary():
     """
     try:
         club = [club for club in clubs if club['email'] == request.form['email']][0]
-        
+
         if club:
             return render_template('welcome.html', club=club, competitions=competitions, current_date=current_date)
 
@@ -99,7 +103,7 @@ def show_summary():
 
 
 @app.route('/book/<competition>/<club>')
-def book(competition,club):
+def book(competition, club):
     """
     Displays :
         Competition's name and places available
@@ -108,7 +112,7 @@ def book(competition,club):
     try:
         foundClub = [c for c in clubs if c['name'] == club][0]
         foundCompetition = [c for c in competitions if c['name'] == competition][0]
-        return render_template('booking.html',club=foundClub,competition=foundCompetition)
+        return render_template('booking.html', club=foundClub, competition=foundCompetition)
 
     except IndexError:
         flash("Sorry, this club or competition wasn't found !!")
@@ -123,7 +127,7 @@ def book(competition,club):
 }
 
 
-@app.route('/purchasePlaces',methods=['POST'])
+@app.route('/purchasePlaces', methods=['POST'])
 @app.errorhandler(400)
 def purchase_places():
     """
@@ -146,13 +150,13 @@ def purchase_places():
     elif placesRequired > club_points:
         flash("Sorry, your club doesn't have enough points !")
         return render_template('booking.html', club=club, competition=competition, current_date=current_date), 400
-    
-    elif placesRequired > MAX_PLACES :
+
+    elif placesRequired > MAX_PLACES:
         flash(f"Sorry, you can't book more than {MAX_PLACES} places !")
         return render_template('booking.html', club=club, competition=competition, current_date=current_date), 400
-    
-    elif placesRequired + current_cart > MAX_PLACES :
-        flash(f"""Sorry, you have already booked places, for this competition 
+
+    elif placesRequired + current_cart > MAX_PLACES:
+        flash(f"""Sorry, you have already booked places, for this competition
         and now you have exceeded the limit of {MAX_PLACES} places !""")
         return render_template('booking.html', club=club, competition=competition, current_date=current_date), 400
 
@@ -163,13 +167,16 @@ def purchase_places():
     else:
         competition['numberOfPlaces'] = int(competition['numberOfPlaces'])-placesRequired
 
-        club['points'] = int(club['points'])- placesRequired
+        club['points'] = int(club['points']) - placesRequired
 
         cart[competition["name"]][club["name"]] += placesRequired
 
         flash(f"Great you have booked {placesRequired} places! for {competition['name']}")
 
-        return render_template('welcome.html', club=club, competitions=competitions, current_date=current_date, add_to_cart=cart[competition["name"]][club["name"]])
+        return render_template('welcome.html',
+                               club=club, competitions=competitions,
+                               current_date=current_date,
+                               add_to_cart=cart[competition["name"]][club["name"]])
 
 # ================================================= ROUTE FOR BOARD DISPLAY
 

tests/conftest.py

@@ -1,8 +1,7 @@
 import pytest
-# from server import app
 import server
 
-# ============================================= FIXTURES
+# ============================================= FIXTURES CLIENT TESTING
 
 
 @pytest.fixture
@@ -11,6 +10,9 @@ def client():
         yield client
 
 
+# ================================================== FIXTURE FOR CLUBS TESTING
+
+
 @pytest.fixture
 def clubs_fixture():
     return [
@@ -32,35 +34,7 @@ def clubs_fixture():
     ]
 
 
-@pytest.fixture
-def empty_clubs_fixture():
-    return {
-    "competitions": [
-    ],
-    "clubs": [
-    ]
-}
-
-
-@pytest.fixture
-def unknown_club():
-    return [
-        {
-            "name": "Fake club",
-            "email": "sam@email.co",
-            "points": "12"
-        },
-        {
-            "name": "Unknown Club",
-            "email": "jim@gmail.com",
-            "points": "9"
-        },
-        {
-            "name": "invisible Club",
-            "email": "sarah@yahoo.co.uk",
-            "points": "16"
-        }
-    ]
+# ================================================== FIXTURE FOR COMPETITIONS TESTING
 
 
 @pytest.fixture
@@ -88,20 +62,30 @@ def competitions_fixture():
         }
     ]
 
+
+# ================================================== FIXTURE TO AVOID BOOKING MORE THAN 12 PLACES
+
+
 @pytest.fixture
 def cart_fixture(competitions_fixture, clubs_fixture):
     return {
-    competition["name"]: {club["name"]: 0 for club in clubs_fixture}
-    for competition in competitions_fixture
-}
+        competition["name"]: {club["name"]: 0 for club in clubs_fixture}
+        for competition in competitions_fixture
+    }
+
+
+# ================================================== FIXTURE TO AVOID REPETITIONS OF CALLING FIXTURE IN PARAMETERS
 
 
 @pytest.fixture
 def fixture(mocker, clubs_fixture, competitions_fixture, cart_fixture):
     return [mocker, clubs_fixture, competitions_fixture, cart_fixture]
 
 
-def get(fixture, case , places=0):
+# ================================================== FIXTURE TO AVOID REPETITIONS IN FUNCTIONS TESTING
+
+
+def get(fixture, case, places=0):
     fixture[0].patch.object(server, 'clubs', fixture[1])
     fixture[0].patch.object(server, 'competitions', fixture[2])
     fixture[0].patch.object(server, 'cart', fixture[3])
@@ -117,11 +101,11 @@ def get(fixture, case , places=0):
     elif case == "wrong_email":
         return {"email": "unknown_email@gmail.com"}
 
-    elif case == "club_competition":
+    elif case == "valid_club_competition":
         data_book = {'competition': valid_competition, 'club': valid_club}
         return data_book
 
-    elif case == "club_unknown-competition":
+    elif case == "club_unknown_competition":
         return {'competition': "Black Race", 'club': valid_club}
 
     elif case == "club_competition_places":
@@ -144,22 +128,27 @@ def get(fixture, case , places=0):
         return data_purchase_places
 
     elif case == "board":
-        return  fixture[1]
-    
+        return fixture[1]
+
     elif case == "empty_board":
         return fixture[0].patch.object(server, 'clubs', '')
 
 
-FAKE_PATH_JSON_CLUBS = 'fake_club.json'
-FAKE_PATH_JSON_COMPETITIONS = 'fake_comp.json'
+# ================================================== FIXTURE FOR JSON TESTING
 
 
 EMPTY_JSON_PATH = 'tests/functional/empty.json'
+FAKE_PATH_JSON_CLUBS = 'fake_club.json'
+FAKE_PATH_JSON_COMPETITIONS = 'fake_comp.json'
+
 
 def get_empty_json(mocker):
     return mocker.patch.object(
         server, 'PATH_JSON_CLUBS', EMPTY_JSON_PATH), mocker.patch.object(
             server, 'PATH_JSON_COMPETITIONS', EMPTY_JSON_PATH)
 
+
 def get_wrong_json_path(mocker):
-    return mocker.patch.object(server, 'PATH_JSON_CLUBS', FAKE_PATH_JSON_CLUBS), mocker.patch.object(server, 'PATH_JSON_COMPETITIONS', FAKE_PATH_JSON_COMPETITIONS)
+    return mocker.patch.object(server, 'PATH_JSON_CLUBS',
+                               FAKE_PATH_JSON_CLUBS), mocker.patch.object(
+            server, 'PATH_JSON_COMPETITIONS', FAKE_PATH_JSON_COMPETITIONS)

tests/functional/test_load_json.py

@@ -1,6 +1,7 @@
 import pytest
+import server
 from server import loadClubs, loadCompetitions
-from conftest import get_empty_json, get_wrong_json_path, get
+from conftest import get_empty_json, get_wrong_json_path
 
 
 def test_valid_load_json():
@@ -22,7 +23,7 @@ def test_valid_load_json():
     assert len(competitions) > 0
 
 
-def test_with_empty_json(mocker, empty_clubs_fixture):
+def test_with_empty_json(mocker):
     """
         BACK END TESTING :
         GIVEN empty json files as database for flask app
@@ -36,7 +37,7 @@ def test_with_empty_json(mocker, empty_clubs_fixture):
     assert loadCompetitions() == "This file is empty, or key not found"
 
 
-def test_with_wrong_json_path(client, mocker):
+def test_with_wrong_json_path(mocker):
     """
         BACK END TESTING :
         GIVEN wrong path for json files as database for flask app
@@ -49,7 +50,7 @@ def test_with_wrong_json_path(client, mocker):
     assert loadClubs() == "[Errno 2] No such file or directory: 'fake_club.json'"
     assert loadCompetitions() == "[Errno 2] No such file or directory: 'fake_comp.json'"
 
-import server
+
 def test_index_with_empty_data(client, mocker):
     """
         FRONT END TESTING :
@@ -66,6 +67,3 @@ def test_index_with_empty_data(client, mocker):
 
     assert response.status_code == 500
     assert b'500 page' in response.data
-
-    # assert isinstance(empty_clubs, str)
-    # assert isinstance(empty_competitions, str)

tests/functional/test_route.py

@@ -10,6 +10,7 @@
     */logout'
 """
 
+
 def test_uknown_route(client):
     assert client.get('/fakeRoute').status_code == 404
 
@@ -41,7 +42,7 @@ def test_route_showSummary(client, fixture):
 
 def test_route_book(client, fixture):
 
-    data = get(fixture, "club_competition")
+    data = get(fixture, "valid_club_competition")
     response = client.get(f"/book/{data['competition']}/{data['club']}")
 
     assert response.status_code == 200

tests/integration/test_app.py

@@ -25,7 +25,7 @@ def test_app(client, fixture):
     response = client.post('/showSummary', data=email)
     assert response.status_code == 200
 
-    data = get(fixture, "club_competition")
+    data = get(fixture, "valid_club_competition")
     response = client.get(f"/book/{data['competition']}/{data['club']}")
     assert response.status_code == 200