Refactoring code

Change-Id: I68bb5e567e429f29ad9c84c15ef33b5a7c9e8eeb
Signed-off-by: Jago Gardiner <jagogardiner@gmail.com>

app/routes.py

@@ -22,9 +22,8 @@ from data.teams import (
 @app.route("/")
 @app.route("/home")
 def home():
-    data = get_objects(read_csv())
-    teams = filter_teams(data)
-    players = filter_players(data)
+    teams = filter_teams()
+    players = filter_players()
     for player in players:
         player.win_percentage = calculate_win_percentage_overall(player)
         player.transfer_value = "{:,}".format(transfer_value_overall(player))
@@ -36,8 +35,7 @@ def home():
 
 @app.route("/teams")
 def teams():
-    data = get_objects(read_csv())
-    teams = filter_teams(data)
+    teams = filter_teams()
     for team in teams:
         team.win_percentage = team_win_percentage_overall(team.name)
         team.transfer_value = "{:,}".format(team_transfer_value_avr(team.name))
@@ -47,8 +45,7 @@ def teams():
 
 @app.route("/player/<player_id>")
 def player(player_id):
-    data = get_objects(read_csv())
-    players = filter_players(data)
+    players = filter_players()
     for player in players:
         if player.name == player_id:
             return render_template(
@@ -73,8 +70,7 @@ def player(player_id):
 
 @app.route("/team/<team_id>")
 def team(team_id):
-    data = get_objects(read_csv())
-    teams = filter_teams(data)
+    teams = filter_teams()
     player_list = team_player_list(team_id)
     wp_last_5 = team_win_percentage_last_5(team_id)
     wp_overall = team_win_percentage_overall(team_id)
@@ -100,11 +96,6 @@ def team(team_id):
             )
 
 
-@app.route("/test")
-def test():
-    return render_template("template.html")
-
-
 @app.route("/header")
 def header():
     return render_template("header.html")

data/processing.py

@@ -182,7 +182,14 @@ def get_objects(data: pd.DataFrame) -> list[DataObject]:
     return objects
 
 
-def filter_teams(data):
+def filter_teams() -> list[Team]:
+    """
+    Creates a list of Team objects from the pandas dataframe
+
+    Returns:
+        list[Team]: List of Team objects
+    """
+    data = get_objects(read_csv())
     # Read all team names. If a team name is duplicated, remove it
     team_names = []
     for team in data:
@@ -200,7 +207,14 @@ def filter_teams(data):
     return teams
 
 
-def filter_players(data):
+def filter_players() -> list[Player]:
+    """
+    Creates a list of Player objects from the pandas dataframe
+
+    Returns:
+        list[Player]: List of Player objects
+    """
+    data = get_objects(read_csv())
     players = []
     for player in data:
         players.append(Player(player))

data/teams.py

@@ -22,8 +22,7 @@ def team_player_list(team_name: str) -> list:
         list: List of players
     """
     # Get all players
-    data = get_objects(read_csv())
-    players = filter_players(data)
+    players = filter_players()
 
     # Create a list of players for the team
     team_players = []