Update of API v3 vs v4.

Author: stanislavulrych

README.md

@@ -1,7 +1,8 @@
 # tempo-api-python-client
+
 Python bindings for Tempo Rest API.
 
-This is a Tempo API client library to simplify the interaction with Tempo timesheets.
+This is a Tempo API client library to simplify the interaction with Tempo timesheets. The implementation supports Tempo API v3 and v4.
 
 Pip release is available: https://pypi.org/project/tempo-api-python-client/
 
@@ -21,21 +22,38 @@ pip install tempo-api-python-client
 
 You need an API token for communicating with tempo REST APIs. 
 
-```
-from tempoapiclient import client
+For v3 use
 
-tempo = client.Tempo(
-    auth_token="<your_tempo_api_key>",
-    base_url="https://api.tempo.io/core/3")
+    from tempoapiclient import client_v3
 
-worklogs = tempo.get_worklogs(
-    dateFrom="2019-11-10",
-    dateTo="2019-11-11"
-    )
+    tempo = client_v3.Tempo(
+        auth_token="<your_tempo_api_key>",
+        )
+
+    worklogs = tempo.get_worklogs(
+        dateFrom="2019-11-10",
+        dateTo="2019-11-11"
+        )
+
+    for i in worklogs:
+        print(i)
+
+For v4 use
+
+    from tempoapiclient import client_v4
+
+    tempo = client_v4.Tempo(
+        auth_token="<your_tempo_api_key>",
+        )
+
+    worklogs = tempo.get_worklogs(
+        dateFrom="2019-11-10",
+        dateTo="2019-11-11"
+        )
+
+    for i in worklogs:
+        print(i)
 
-for i in worklogs:
-    print(i)
-```
 
 There are also functions to retrieve `user` and `team`-specific worklogs.
 
@@ -46,6 +64,7 @@ There are also functions to retrieve `user` and `team`-specific worklogs.
 
 - Pylint: `pylint --max-line-length=120 tempoapiclient`
 
+
 ## Contributing
 
 Contribution is welcome. See [CONTRIBUTING.md](CONTRIBUTING.md) for more details.

tempoapiclient/client.py tempoapiclient/client_v3.pytempoapiclient/client.py renamed to tempoapiclient/client_v3.py

@@ -18,7 +18,7 @@
 from .rest_client import RestAPIClient
 
 
-class TempoV4(RestAPIClient):
+class Tempo(RestAPIClient):
     """
     Basic Client for accessing Tempo Rest API as provided by api.tempo.io.
     """

tempoapiclient/client_v4.py

@@ -2,20 +2,20 @@
 import os
 import sys
 
-from tempoapiclient import client
+from tempoapiclient.client_v3 import Tempo
 
 # please set TEMPO_AUTH_TOKEN to environment before running this test
 
 
 class TestClient(TestCase):
 
     def setUp(self):
-        self.tempo = client.Tempo(auth_token=os.environ.get('TEMPO_AUTH_TOKEN'))
+        self.tempo = Tempo(auth_token=os.environ.get('TEMPO_AUTH_TOKEN'))
         self.dateFrom = "2020-09-01"
         self.dateTo = "2020-10-01"
 
     def test_client_creation(self):
-        self.assertTrue(isinstance(self.tempo, client.Tempo))
+        self.assertTrue(isinstance(self.tempo, Tempo))
         pass
 
     def test_get_accounts(self):

tests/test_client.py tests/test_client_v3.pytests/test_client.py renamed to tests/test_client_v3.py

@@ -0,0 +1,79 @@
+from unittest import TestCase, main
+import os
+import sys
+
+from tempoapiclient.client_v4 import Tempo
+
+# please set TEMPO_AUTH_TOKEN to environment before running this test
+
+
+class TestClient(TestCase):
+
+    def setUp(self):
+        self.tempo = Tempo(auth_token=os.environ.get('TEMPO_AUTH_TOKEN'))
+        self.dateFrom = "2020-09-01"
+        self.dateTo = "2020-10-01"
+    
+    def test_client_creation(self):
+        self.assertTrue(isinstance(self.tempo, Tempo))
+        pass
+
+    def test_get_accounts(self):
+        l = self.tempo.get_accounts()
+        print("get_accounts: ", len(l))
+        pass
+
+    def test_get_account_categories(self):
+        l = self.tempo.get_account_categories()
+        print("get_account_categories: ", len(l))
+        pass
+
+    def test_get_account_category_types(self):
+        l = self.tempo.get_account_category_types()
+        print("get_account_category_types: ", len(l))
+
+    def test_get_customers(self):
+        l = self.tempo.get_customers()
+        print("get_customers: ", len(l))
+
+    def test_get_holiday_schemes(self):
+        l = self.tempo.get_holiday_schemes()
+        print("get_holiday_schemes: ", len(l))
+
+    def test_get_periods(self):
+        l = self.tempo.get_periods(dateFrom=self.dateFrom, dateTo=self.dateTo)
+        print("get_periods: ", len(l))
+
+    def test_get_plans(self):
+        l = self.tempo.get_plans(dateFrom=self.dateFrom, dateTo=self.dateTo)
+        print("get_plans: ", len(l))
+
+    def test_get_teams(self):
+        l = self.tempo.get_teams()
+        print("get_teams: ", len(l))
+
+    def test_get_team_members(self):
+        team_id = [int(i['id']) for i in self.tempo.get_teams()][0]
+        team_members = self.tempo.get_team_members(teamId=team_id)
+        self.assertIsInstance(team_members, list)
+        self.assertIsInstance(team_members[0], dict)
+        self.assertIsInstance(team_members[0]['member'], dict)
+
+    #def test_get_team_memberships(self):
+        # l = self.tempo.get_team_memberships(membershipId=)
+        # display(l)
+
+    #def test_get_account_team_membership(self):
+        # l = self.tempo.get_account_team_membership(teamId=1, accountId=8)
+        # print("get_account_team_membership: ", len(l))
+
+    #def test_get_account_team_memberships(self):
+        # l = self.tempo.get_account_team_memberships(teamId=1, accountId=8)
+        # print("get_account_team_memberships: ", len(l))
+
+    def tearDown(self):
+        self.tempo.close()
+
+
+if __name__ == "__main__":
+    main()