Add __str__ to classes

football/models/competition.py

@@ -1,6 +1,8 @@
 import requests
 
 from .fixture import Fixture
+from .table import Table
+from .team import Team
 from ..utils import headers
 
 
@@ -29,18 +31,22 @@ def fixtures(self):
         Returns all current fixtures of the competition.
         """
         response = requests.get(self._fixtures_url, headers=headers()).json()
-        return [Fixture(fixture) for fixture in response]
+        return [Fixture(fixture) for fixture in response["fixtures"]]
 
     def teams(self):
         """
         Returns all teams currently participating in the competition.
         """
-        response = requests.get(self._teams_url, headers=headers())
-        return response.json()
+        response = requests.get(self._teams_url, headers=headers()).json()
+        return [Team(team) for team in response["teams"]]
 
-    def league_table(self):
+    def table(self):
         """
         Returns the current league table of the competition.
         """
-        response = requests.get(self._league_table_url, headers=headers())
-        return response.json()
+        response = requests.get(
+            self._league_table_url, headers=headers()).json()
+        return Table(response)
+
+    def __str__(self):
+        return self.name

football/models/fixture.py

@@ -18,6 +18,7 @@ def __init__(self, fixture):
         self.status = fixture["status"]
         self.winner = self._winner()
 
+        # Get result depending if required data available
         if "halfTime" in fixture["result"].keys():
             self.away_goals_ht = fixture["result"]["halfTime"]["goalsAwayTeam"]
             self.home_goals_ht = fixture["result"]["halfTime"]["goalsHomeTeam"]
@@ -34,3 +35,10 @@ def _winner(self):
         elif self.away_goals > self.home_goals:
             return self.away_team
         return None
+
+    def __str__(self):
+        if self.winner:
+            return (f"{self.home_team} {self.home_goals}-{self.away_goals} "
+                    f"{self.away_team} - {self.date}")
+        else:
+            return f"{self.home_team} vs. {self.away_team} - {self.date}"

football/models/player.py

@@ -35,3 +35,6 @@ def _team(self):
         response = requests.get(
             f"{self.API_URL}teams/{self.team_id}", headers=headers()).json()
         return response["name"]
+
+    def __str__(self):
+        return (f"{self.number} - {self.name} - {self.position} - {self.team}")

football/models/team.py

@@ -28,18 +28,15 @@ def _players(self):
         Returns a list of Player objects.
         """
         response = requests.get(self.players_url, headers=headers()).json()
-        try:
-            return [Player(player, self.team_id, self.name)
-                    for player in response["players"]]
-        except KeyError:
-            return []
+        return [Player(player, self.team_id, self.name)
+                for player in response["players"]]
 
     def _fixtures(self):
         """
         Returns a list of Fixture objects.
         """
         response = requests.get(self.fixtures_url, headers=headers()).json()
-        try:
-            return [Fixture(fixture) for fixture in response["fixtures"]]
-        except KeyError:
-            return []
+        return [Fixture(fixture) for fixture in response["fixtures"]]
+
+    def __str__(self):
+        return self.name