Merge pull request #66 from osmlab/dev

Merge dev > master

Author: mattmanley

examples/challenge_examples.py

@@ -19,6 +19,10 @@
 print(json.dumps(api.get_challenge_by_name(project_id=project_id,
                                            challenge_name=challenge_name), indent=4, sort_keys=True))
 
+# We can also use challenges' set tags to retrieve them:
+challenge_tags = 'River'
+print(json.dumps(api.get_challenges_by_tags(challenge_tags=challenge_tags), indent=4, sort_keys=True))
+
 # We can access challenge statistics as well:
 print(json.dumps(api.get_challenge_statistics_by_id(challenge_id)))
 

maproulette/__init__.py

@@ -14,4 +14,4 @@
 from .api.task import Task
 from .api.user import User
 
-__version__ = '1.4.0'
+__version__ = '1.5.0'

maproulette/api/challenge.py

@@ -54,6 +54,25 @@ def get_challenge_by_name(self, project_id, challenge_name):
         response = self.get(endpoint=f"/project/{project_id}/challenge/{challenge_name}")
         return response
 
+    def get_challenges_by_tags(self, challenge_tags, limit=10, page=0):
+        """Method to retrieve challenge information via tags applied to the challenge
+
+        :param challenge_tags: a comma-separated list of tags to search challenges for
+        :param limit: the limit to the number of results returned in the response. Default is 10
+        :param page: used in conjunction with the limit parameter to page through X number of responses. Default is 0.
+        :returns: the API response from the GET request
+        """
+        query_params = {
+            "tags": str(challenge_tags),
+            "limit ": str(limit),
+            "page": str(page)
+        }
+        response = self.get(
+            endpoint=f"/challenges/tags",
+            params=query_params
+        )
+        return response
+
     def get_virtual_challenge_by_id(self, challenge_id):
         """Method to retrieve an existing virtual challenge
 

maproulette/models/challenge.py

@@ -131,7 +131,7 @@ def medium_priority_rule(self):
         return self._medium_priority_rule
 
     @medium_priority_rule.setter
-    def high_priority_rule(self, value):
+    def medium_priority_rule(self, value):
         self._medium_priority_rule = value
 
     @property

tests/test_challenge_api.py

@@ -66,6 +66,13 @@ def test_get_challenge_by_name(self, mock_request, api_instance=api):
         response = api_instance.get_challenge_by_name(test_project_id, test_challenge_name)
         self.assertEqual(response['status'], '200')
 
+    @patch('maproulette.api.maproulette_server.requests.Session.get')
+    def test_get_challenges_by_tags(self, mock_request, api_instance=api):
+        test_challenge_tag = 'River'
+        mock_request.return_value.status_code = '200'
+        response = api_instance.get_challenges_by_tags(test_challenge_tag)
+        self.assertEqual(response['status'], '200')
+
     @patch('maproulette.api.maproulette_server.requests.Session.get')
     def test_get_virtual_challenge_by_id(self, mock_request, api_instance=api):
         test_virtual_challenge_id = '12345'