Merge branch 'dev' into POP-2284

Author: DynataRidley

dynatademand/api.py

@@ -137,6 +137,12 @@ def logout(self):
     def get_countries(self):
         return self._api_get('/countries')
 
+    def get_event(self, event_id):
+        return self._api_get('/events/{}'.format(event_id))
+
+    def get_events(self):
+        return self._api_get('/events')
+
     def create_project(self, project_data):
         # Creates a new project. Uses the "new project" schema.
         self._validate_object("project_new", project_data)
@@ -152,11 +158,23 @@ def create_project(self, project_data):
     def get_project(self, project_id):
         return self._api_get('/projects/{}'.format(project_id))
 
-    def get_lineitem(self, project_id, lineitem_id):
-        return self._api_get('/projects/{}/lineItems/{}'.format(project_id, lineitem_id))
+    def get_project_detailed_report(self, project_id):
+        return self._api_get('/projects/{}/detailedReport'.format(project_id))
+
+    def get_line_item(self, project_id, line_item_id):
+        return self._api_get('/projects/{}/lineItems/{}'.format(project_id, line_item_id))
+
+    def get_line_items(self, project_id):
+        return self._api_get('/projects/{}/lineItems'.format(project_id))
+
+    def get_line_item_detailed_report(self, project_id, line_item_id):
+        return self._api_get('/projects/{}/lineItems/{}/detailedReport'.format(project_id, line_item_id))
 
     def get_feasibility(self, project_id):
         return self._api_get('/projects/{}/feasibility'.format(project_id))
 
+    def get_survey_topics(self):
+        return self._api_get('/categories/surveyTopics')
+
     def get_sources(self):
         return self._api_get('/sources')

tests/test_lineitems.py tests/test_categories.pytests/test_lineitems.py renamed to tests/test_categories.py

@@ -15,16 +15,16 @@
 BASE_HOST = "http://test-url.example"
 
 
-class TestLineItemEndpoints(unittest.TestCase):
+class TestCategoryEndpoints(unittest.TestCase):
     def setUp(self):
         self.api = DemandAPIClient(client_id='test', username='testuser', password='testpass', base_host=BASE_HOST)
         self.api._access_token = 'Bearer testtoken'
 
     @responses.activate
-    def test_get_lineitem(self):
-        with open('./tests/test_files/get_lineitem.json', 'r') as lineitem_file:
-            lineitem_json = json.load(lineitem_file)
-        responses.add(responses.GET, '{}/sample/v1/projects/1/lineItems/100'.format(BASE_HOST), json=lineitem_json, status=200)
-        self.api.get_lineitem(1, 100)
+    def test_get_survey_topics(self):
+        with open('./tests/test_files/get_survey_topics.json', 'r') as survey_topics_file:
+            survey_topics_json = json.load(survey_topics_file)
+        responses.add(responses.GET, '{}/sample/v1/categories/surveyTopics'.format(BASE_HOST), json=survey_topics_json, status=200)
+        self.api.get_survey_topics()
         self.assertEqual(len(responses.calls), 1)
-        self.assertEqual(responses.calls[0].response.json(), lineitem_json)
+        self.assertEqual(responses.calls[0].response.json(), survey_topics_json)

tests/test_events.py

@@ -0,0 +1,39 @@
+# encoding: utf-8
+from __future__ import unicode_literals, print_function
+
+import json
+import unittest
+import responses
+
+try:
+    from unittest.mock import patch
+except ImportError:
+    from mock import patch
+
+from dynatademand.api import DemandAPIClient
+
+BASE_HOST = "http://test-url.example"
+
+
+class TestEventEndpoints(unittest.TestCase):
+    def setUp(self):
+        self.api = DemandAPIClient(client_id='test', username='testuser', password='testpass', base_host=BASE_HOST)
+        self.api._access_token = 'Bearer testtoken'
+
+    @responses.activate
+    def test_get_event(self):
+        with open('./tests/test_files/get_event.json', 'r') as event_file:
+            event_json = json.load(event_file)
+        responses.add(responses.GET, '{}/sample/v1/events/1337'.format(BASE_HOST), json=event_json, status=200)
+        self.api.get_event(1337)
+        self.assertEqual(len(responses.calls), 1)
+        self.assertEqual(responses.calls[0].response.json(), event_json)
+
+    @responses.activate
+    def test_get_events(self):
+        with open('./tests/test_files/get_events.json', 'r') as event_file:
+            event_json = json.load(event_file)
+        responses.add(responses.GET, '{}/sample/v1/events'.format(BASE_HOST), json=event_json, status=200)
+        self.api.get_events()
+        self.assertEqual(len(responses.calls), 1)
+        self.assertEqual(responses.calls[0].response.json(), event_json)

tests/test_files/get_event.json

@@ -0,0 +1,3 @@
+{
+  "event": "Cow jumping over the moon"
+}

tests/test_files/get_events.json

@@ -0,0 +1,3 @@
+{
+  "event": "Me, me, me"
+}

tests/test_files/get_lineitem.json tests/test_files/get_line_item.jsontests/test_files/get_lineitem.json renamed to tests/test_files/get_line_item.json

@@ -0,0 +1,3 @@
+{
+  "report": "That's my story and I'm sticking to it!"
+}

tests/test_files/get_line_item_detailed_report.json

@@ -0,0 +1,3 @@
+{
+  "test": "Literally anything can go here"
+}

tests/test_files/get_line_items.json

@@ -0,0 +1,3 @@
+{
+  "report": "That's my story and I'm sticking to it!"
+}

tests/test_files/get_project_detailed_report.json

@@ -0,0 +1,5 @@
+{
+  "survey": {
+    "topic": "milk"
+  }
+}