From 79269e26d49f8c407303cdf1926b0710484bfe3f Mon Sep 17 00:00:00 2001
From: Conor Maguire <conormag94@gmail.com>
Date: Sat, 1 Apr 2017 15:14:54 +0100
Subject: [PATCH] Add queries for the team resource

---
 pyscores/api_wrapper.py | 59 ++++++++++++++++++++++++++++-------------
 1 file changed, 41 insertions(+), 18 deletions(-)

diff --git a/pyscores/api_wrapper.py b/pyscores/api_wrapper.py
index 2b9c853..12d376d 100644
--- a/pyscores/api_wrapper.py
+++ b/pyscores/api_wrapper.py
@@ -8,20 +8,17 @@
 class APIWrapper(object):
 
     def __init__(self, base_url=None, auth_token=None):
-
         if base_url:
             self.base_url = base_url
         else:
             self.base_url = "http://api.football-data.org/v1"
 
         if auth_token:
-            self.headers = {
-                'X-Auth-Token': auth_token
-            }
+            self.headers = {'X-Auth-Token': auth_token}
         else:
             self.headers = {}
 
-    def do_request(self, url, filters=None):
+    def _request(self, url, filters=None):
         params = filters if filters else {}
         r = requests.get(url=url, params=params, headers=self.headers)
         if r.status_code == requests.codes.ok:
@@ -30,38 +27,64 @@ def do_request(self, url, filters=None):
 
     def all_competitions(self):
         url = "{0}/competitions".format(self.base_url)
-        response = self.do_request(url=url)
+        response = self._request(url=url)
         return response
 
     def competition(self, competition_id):
         """Return a JSON object for a competition by its id."""
         url = "{0}/competitions/{1}".format(self.base_url, competition_id)
-        response = self.do_request(url=url)
+        response = self._request(url=url)
         return response
 
-    #TODO: Add filters
     def competition_teams(self, competition_id):
         """Return a JSON list of teams in a particular competition."""
         url = "{0}/competitions/{1}/teams".format(self.base_url, competition_id)
-        response = self.do_request(url=url)
-        return response
+        return self._request(url=url)
 
-    # TODO: Add filters
     def competition_fixtures(self, competition_id):
-        """Returns a JSON list of all fixtures, past and present, in a competition"""
+        """Return a JSON list of all fixtures, past and present, in a competition."""
         url = "{0}/competitions/{1}/fixtures".format(self.base_url, competition_id)
-        response = self.do_request(url=url)
-        return response
+        return self._request(url=url)
 
     def competition_table(self, competition_id, filters=None):
-        """Return the current league table for a competition"""
+        """
+        Return the current league table for a competition as a JSON list.
+        
+        Example filters:
+        - matchday=23
+        """
         url = "{0}/competitions/{1}/leagueTable".format(self.base_url, competition_id)
-        response = self.do_request(url=url, filters=filters)
-        return response
+        return self._request(url=url, filters=filters)
+
+    def team(self, team_id):
+        """Return a JSON object for a team by id."""
+        url = "{0}/teams/{1}".format(self.base_url, team_id)
+        return self._request(url=url)
+
+    def team_players(self, team_id):
+        """Return a JSON list of the players playing for a team."""
+        url = "{0}/teams/{1}/players".format(self.base_url, team_id)
+        return self._request(url=url)
+
+    def team_fixtures(self, team_id, filters=None):
+        """
+        Return a list of fixtures for a team.
+        
+        Example filters:
+        - season=2016   -> Fixtures for the 2016/2017 season
+        - timeFrame=p20 -> Fixtures for previous 20 days
+        - timeFrame=n7  -> Fixtures for next 7 days (default)
+        - timeFrameStart=2017-03-14&timeFrameEnd=2017-03-31
+                        -> Fixtures between two dates (both must be present)
+        - venue=home    -> Show only home or away fixtures
+        """
+        url = "{0}/teams/{1}/fixtures".format(self.base_url, team_id)
+        return self._request(url=url, filters=filters)
+
 
 def main():
     api = APIWrapper(auth_token=os.environ["PYSCORES_KEY"])
-    res = api.do_request("http://api.football-data.org/v1/competitions")
+    res = api.all_competitions()
     print(res)
 
 if __name__ == "__main__":