(fix) Linting

Author: br-imen

.flake8

@@ -0,0 +1,12 @@
+[flake8]
+max-line-length = 80
+exclude = 
+    bin/activate.py,
+    lib,
+    packages,
+    migrations,
+    build,
+    dist,
+    *.pyc,
+    __pycache__,
+    bin/activate_this.py

pyproject.toml

@@ -0,0 +1,2 @@
+[tool.black]
+line-length = 80

requirements.txt

@@ -4,4 +4,6 @@ itsdangerous==1.1.0
 Jinja2==2.11.2
 MarkupSafe==1.1.1
 Werkzeug==1.0.1
-pytest
+pytest
+black
+flake8

server.py

@@ -1,66 +1,80 @@
 import json
-from flask import Flask,render_template,request,redirect,flash,url_for
+from flask import Flask, render_template, request, redirect, flash, url_for
 
 
 def loadClubs():
-    with open('clubs.json') as c:
-         listOfClubs = json.load(c)["clubs"]
-         return listOfClubs
+    with open("clubs.json") as c:
+        listOfClubs = json.load(c)["clubs"]
+        return listOfClubs
 
 
 def loadCompetitions():
-    with open('competitions.json') as comps:
-         listOfCompetitions = json.load(comps)["competitions"]
-         return listOfCompetitions
+    with open("competitions.json") as comps:
+        listOfCompetitions = json.load(comps)["competitions"]
+        return listOfCompetitions
 
 
 app = Flask(__name__)
-app.secret_key = 'something_special'
+app.secret_key = "something_special"
 
 competitions = loadCompetitions()
 clubs = loadClubs()
 
-@app.route('/')
+
+@app.route("/")
 def index():
-    return render_template('index.html')
+    return render_template("index.html")
+
 
-@app.route('/showSummary',methods=['POST'])
+@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"]][0]
+    return render_template("welcome.html", club=club, competitions=competitions)
 
 
-@app.route('/book/<competition>/<club>')
-def book(competition,club):
-    foundClub = [c for c in clubs if c['name'] == club][0]
-    foundCompetition = [c for c in competitions if c['name'] == competition][0]
+@app.route("/book/<competition>/<club>")
+def book(competition, club):
+    foundClub = [c for c in clubs if c["name"] == club][0]
+    foundCompetition = [c for c in competitions if c["name"] == competition][0]
     if foundClub and foundCompetition:
-        return render_template('booking.html',club=foundClub,competition=foundCompetition)
+        return render_template(
+            "booking.html", club=foundClub, competition=foundCompetition
+        )
     else:
         flash("Something went wrong-please try again")
-        return render_template('welcome.html', club=club, competitions=competitions)
+        return render_template(
+            "welcome.html", club=club, competitions=competitions
+        )
 
 
-@app.route('/purchasePlaces',methods=['POST'])
+@app.route("/purchasePlaces", methods=["POST"])
 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]
-    if not request.form['places'] or int(request.form['places']) < 1 :
+    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]
+    if not request.form["places"] or int(request.form["places"]) < 1:
         flash("Places required must be a positive integer")
-        return redirect(url_for('book',competition=competition['name'],club=club['name']))
-    placesRequired = int(request.form['places'])
-    if placesRequired > int(club['points']):
+        return redirect(
+            url_for("book", competition=competition["name"], club=club["name"])
+        )
+    placesRequired = int(request.form["places"])
+    if placesRequired > int(club["points"]):
         flash("Places required exceed club's total points")
-        return redirect(url_for('book',competition=competition['name'],club=club['name']))
-    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)
+        return redirect(
+            url_for("book", competition=competition["name"], club=club["name"])
+        )
+    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)
 
 
 # TODO: Add route for points display
 
 
-@app.route('/logout')
+@app.route("/logout")
 def logout():
-    return redirect(url_for('index'))
+    return redirect(url_for("index"))

templates/booking.html

@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html lang="en">
 <head>
     <meta charset="UTF-8">
@@ -19,7 +20,7 @@ <h2>{{competition['name']}}</h2>
     <form action="/purchasePlaces" method="post">
         <input type="hidden" name="club" value="{{club['name']}}">
         <input type="hidden" name="competition" value="{{competition['name']}}">
-        <label for="places">How many places?</label><input type="number" name="places" id=""/>
+        <label for="places">How many places?</label><input type="number" name="places" id="places"/>
         <button type="submit">Book</button>
     </form>
 </body>

tests/test_endpoints.py

@@ -2,41 +2,74 @@
 from server import app
 import html
 
+
 @pytest.fixture
 def client():
     return app.test_client()
 
+
 def test_purchasePlaces_available_points(client):
-    response = client.post("/purchasePlaces", data = {"places":1,"competition":"Fall Classic","club":"Iron Temple"})
+    response = client.post(
+        "/purchasePlaces",
+        data={
+            "places": 1,
+            "competition": "Fall Classic",
+            "club": "Iron Temple",
+        },
+    )
     assert response.status_code == 200
-    assert b'Great-booking complete!' in response.data
+    assert b"Great-booking complete!" in response.data
+
 
 def test_purchasePlaces_unavailable_points(client):
-    response = client.post("/purchasePlaces", data = {"places":5,"competition":"Fall Classic","club":"Iron Temple"})
+    response = client.post(
+        "/purchasePlaces",
+        data={
+            "places": 5,
+            "competition": "Fall Classic",
+            "club": "Iron Temple",
+        },
+    )
     assert response.status_code == 302
     response_redirect = client.get("/book/Fall%20Classic/Iron%20Temple")
     # Byte string to string into a specific encoding utf-8
-    response_data = response_redirect.data.decode('UTF-8')
+    response_data = response_redirect.data.decode("UTF-8")
     # Html entities to actual special char (" ' "), human readable
-    converted_str = html.unescape(response_data) 
+    converted_str = html.unescape(response_data)
     assert "Places required exceed club's total points" in converted_str
 
+
 def test_purchasePlaces_negative_input(client):
-    response = client.post("/purchasePlaces", data = {"places":-1,"competition":"Fall Classic","club":"Iron Temple"})
+    response = client.post(
+        "/purchasePlaces",
+        data={
+            "places": -1,
+            "competition": "Fall Classic",
+            "club": "Iron Temple",
+        },
+    )
     assert response.status_code == 302
     response_redirect = client.get("/book/Fall%20Classic/Iron%20Temple")
     # Byte string to string into a specific encoding utf-8
-    response_data = response_redirect.data.decode('UTF-8')
+    response_data = response_redirect.data.decode("UTF-8")
     # Html entities to actual special char (" ' "), human readable
-    converted_str = html.unescape(response_data) 
+    converted_str = html.unescape(response_data)
     assert "Places required must be a positive integer" in converted_str
 
+
 def test_purchasePlaces_none_input(client):
-    response = client.post("/purchasePlaces", data = {"places": "","competition":"Fall Classic","club":"Iron Temple"})
+    response = client.post(
+        "/purchasePlaces",
+        data={
+            "places": "",
+            "competition": "Fall Classic",
+            "club": "Iron Temple",
+        },
+    )
     assert response.status_code == 302
     response_redirect = client.get("/book/Fall%20Classic/Iron%20Temple")
     # Byte string to string into a specific encoding utf-8
-    response_data = response_redirect.data.decode('UTF-8')
+    response_data = response_redirect.data.decode("UTF-8")
     # Html entities to actual special char (" ' "), human readable
-    converted_str = html.unescape(response_data) 
-    assert "Places required must be a positive integer" in converted_str
+    converted_str = html.unescape(response_data)
+    assert "Places required must be a positive integer" in converted_str