(test) handle update points of club

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,72 +1,83 @@
 import json
-from flask import Flask,render_template,request,redirect,flash,url_for
+from flask import Flask, render_template, request, redirect, flash, url_for
 
 
 app = Flask(__name__)
-app.secret_key = 'something_special'
-app.config['CLUBS_FILE'] = 'clubs.json'
+app.secret_key = "something_special"
+app.config["CLUBS_FILE"] = "clubs.json"
+
 
 def loadClubs():
-    with open(app.config['CLUBS_FILE']) as c:
-        listOfClubs = json.load(c)['clubs']
+    with open(app.config["CLUBS_FILE"]) 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
 
 
 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():
     dict_clubs = {}
-    competition = [c for c in competitions if c['name'] == request.form['competition']][0]
-    club, index_club = [(c, clubs.index(c)) for c in clubs if c['name'] == request.form['club']][0]
-    placesRequired = int(request.form['places'])
-    competition['numberOfPlaces'] = int(competition['numberOfPlaces'])-placesRequired
-    club['points'] = int(club['points']) - placesRequired
-    clubs[index_club]['points'] = str(club['points'])
+    competition = [
+        c for c in competitions if c["name"] == request.form["competition"]
+    ][0]
+    club, index_club = [
+        (c, clubs.index(c)) for c in clubs if c["name"] == request.form["club"]
+    ][0]
+    placesRequired = int(request.form["places"])
+    competition["numberOfPlaces"] = (
+        int(competition["numberOfPlaces"]) - placesRequired
+    )
+    club["points"] = int(club["points"]) - placesRequired
+    clubs[index_club]["points"] = str(club["points"])
     dict_clubs["clubs"] = clubs
     try:
-        with open(app.config['CLUBS_FILE'], 'w') as file_club:
+        with open(app.config["CLUBS_FILE"], "w") as file_club:
             json.dump(dict_clubs, file_club, indent=4)
     except FileNotFoundError:
-        flash('File clubs not found')
-        return redirect(url_for('book'), competition, club)
-    flash('Great-booking complete!')
-    return render_template('welcome.html', club=club, competitions=competitions)
+        flash("File clubs not found")
+        return redirect(url_for("book"), competition, club)
+    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"))

tests/test_endpoints.py

@@ -2,38 +2,70 @@
 import pytest
 from server import app
 
-@pytest.fixture
-def client(tmpdir):
+
+@pytest.fixture(scope="function")
+def temp_clubs_file(tmpdir, request):
     original_clubs_file = tmpdir.join("clubs.json")
-    original_clubs_file.write(json.dumps({
-    "clubs": [
-        {"name": "Simply Lift", "email": "john@simplylift.co", "points": "11"},
-        {"name": "Iron Temple", "email": "admin@irontemple.com", "points": "4"},
-        {"name": "She Lifts", "email": "kate@shelifts.co.uk", "points": "12"}
-    ]
-    }, indent=4))
-    app.config['CLUBS_FILE'] = str(original_clubs_file)
-    return app.test_client()
+    initial_clubs = {
+        "clubs": [
+            {
+                "name": "Simply Lift",
+                "email": "john@simplylift.co",
+                "points": "11",
+            },
+            {
+                "name": "Iron Temple",
+                "email": "admin@irontemple.com",
+                "points": "2",
+            },
+            {
+                "name": "She Lifts",
+                "email": "kate@shelifts.co.uk",
+                "points": "12",
+            },
+        ]
+    }
+    with open(original_clubs_file, "w") as clubs_file:
+        json.dump(initial_clubs, clubs_file, indent=4)
 
-def test_purchasePlaces_update_points(client):
-    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
-    # Verify the points and number of places have been updated
-    with open(app.config['CLUBS_FILE']) as f:
-        updated_clubs = json.load(f)['clubs']
-        updated_club = next(c for c in updated_clubs if c['name'] == 'Iron Temple')
-        assert updated_club['points'] == "3"
+    app.config["CLUBS_FILE"] = str(original_clubs_file)
+
+    # Ensure the clubs are reset for each test
+    from server import clubs
+
+    clubs.clear()
+    clubs.extend(initial_clubs["clubs"])
 
-def test_purchasePlaces_update_points_file_not_found(client):
-    app.config['CLUBS_FILE'] = ""
-    response = client.post("/purchasePlaces", data = {"places":1,"competition":"Fall Classic","club":"Iron Temple"})
-    assert response.status_code == 500
-    # assert b'File clubs not found' in response.data
+    yield initial_clubs
 
-def test_purchasePlaces_update_points_club_not_found(client):
-    pass
+    # Cleanup code
+    try:
+        tmpdir.remove(ignore_errors=True)
+    except Exception as e:
+        print(f"Error during cleanup: {e}")
 
-def test_purchasePlaces_update_points_more_than_available(client):
-    pass
 
+@pytest.fixture
+def client(temp_clubs_file):
+    with app.test_client() as client:
+        yield client
+
+
+def test_purchasePlaces_update_points(client):
+    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
+    # Verify the points and number of places have been updated
+    with open(app.config["CLUBS_FILE"]) as f:
+        updated_clubs = json.load(f)["clubs"]
+        updated_club = next(
+            c for c in updated_clubs if c["name"] == "Iron Temple"
+        )
+        assert updated_club["points"] == "1"