Merge pull request #2 from elbryan/team-worklogs

Added team worklogs.

Author: stanislavulrych

README.md

@@ -25,7 +25,7 @@ tempo = client.Tempo(
     auth_token="<your_tempo_api_key>",
     base_url="https://api.tempo.io/core/3")
 
-worklogs = tempo.get_worklogs(
+worklogs = tempo.get_all_worklogs(
     date_from="2019-11-10",
     date_to="2019-11-11"
     )
@@ -34,6 +34,8 @@ for i in worklogs:
     print(i)
 ```
 
+There are also functions to retrieve `user` and `team`-specific worklogs.
+
 
 ## Contributing
 

setup.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="tempo-api-python-client",
-    version="0.0.1",
+    version="0.0.2",
     author="Stanislav Ulrych",
     author_email="[email protected]",
     description="Python bindings for Tempo (https://tempo-io.github.io/tempo-api-docs/)",
@@ -19,4 +19,4 @@
         "Operating System :: OS Independent",
     ],
     python_requires='>=3.6',
-)
+)

tempoapiclient/client.py

@@ -112,28 +112,8 @@ def get_work_attributes(self):
         """
         return { x["key"]: x for x in self._list("/work-attributes") }
 
-
-    def get_worklogs(self, date_from, date_to, user=None, add_work_attributes=False):
-        """
-        Returns worklogs inside ```date_from``` and ```date_to```, 
-        for particular ```user```, adding work attributes if ```add_work_attributes```.
-        """
-
-        work_attributes = None
-        date_from = self._resolve_date(date_from).isoformat()
-        date_to = self._resolve_date(date_to).isoformat()
-        url = "/worklogs"
-        if user is not None:
-            url += "/user/{}".format(user)
-        params = { "from": date_from, "to": date_to, "limit": self.MAX_RESULTS }
-        l = self._list(url, **params)
-        
-        # restructure workattributes
-        
-        if not self.work_attributes:
-            self.work_attributes = self.get_work_attributes()
-
-        for worklog in l:
+    def _process_worklogs(self, worklogs):
+        for worklog in worklogs:
             attributes = (worklog.get("attributes") or {}).get("values") or {}
             resolved_attributes = {}
 
@@ -145,6 +125,39 @@ def get_worklogs(self, date_from, date_to, user=None, add_work_attributes=False)
             worklog["attributes"] = resolved_attributes
             yield worklog
 
+    def get_all_worklogs(self, date_from, date_to):
+        date_from = self._resolve_date(date_from).isoformat()
+        date_to = self._resolve_date(date_to).isoformat()
+        url = f"/worklogs"
+        params = { "from": date_from, "to": date_to, "limit": self.MAX_RESULTS }
+        l = self._list(url, **params)
+        return self._process_worklogs(l)
+
+    def get_user_worklogs(self, date_from, date_to, userid):
+        """
+        Returns worklogs inside ```date_from``` and ```date_to```, 
+        for particular ```user```.
+        """
+
+        date_from = self._resolve_date(date_from).isoformat()
+        date_to = self._resolve_date(date_to).isoformat()
+        url = f"/worklogs/user/{userid}"
+        params = { "from": date_from, "to": date_to, "limit": self.MAX_RESULTS }
+        l = self._list(url, **params)
+        return self._process_worklogs(l)
+
+    def get_team_worklogs(self, date_from, date_to, teamid):
+        """
+        Returns worklogs inside ```date_from``` and ```date_to```, 
+        for particular ```team```.
+        """
+
+        date_from = self._resolve_date(date_from).isoformat()
+        date_to = self._resolve_date(date_to).isoformat()
+        url = f"/worklogs/team/{teamid}"
+        params = { "from": date_from, "to": date_to, "limit": self.MAX_RESULTS }
+        l = self._list(url, **params)
+        return self._process_worklogs(l)
 
     def get_user_schedule(self, date_from, date_to, user=None):
         """
@@ -157,4 +170,4 @@ def get_user_schedule(self, date_from, date_to, user=None):
         if user is not None:
             url += "/{}".format(user)
         params = { "from": date_from, "to": date_to, "limit": self.MAX_RESULTS }
-        return list(self._list(url, **params))
+        return list(self._list(url, **params))