Adding support for unique_user_constraint and parameter_not_found errors. intercom#97

jkeyes · jkeyes · commit fc70b492cc5c · 2015-08-11T22:37:42.000+01:00
diff --git a/intercom/errors.py b/intercom/errors.py
@@ -59,8 +59,10 @@ class UnexpectedError(IntercomError):
     'bad_request': BadRequestError,
     'missing_parameter': BadRequestError,
     'parameter_invalid': BadRequestError,
+    'parameter_not_found': BadRequestError,
     'not_found': ResourceNotFound,
     'rate_limit_exceeded': RateLimitExceeded,
     'service_unavailable': ServiceUnavailableError,
     'conflict': MultipleMatchingUsersError,
+    'unique_user_constraint': MultipleMatchingUsersError
 }
diff --git a/intercom/request.py b/intercom/request.py
@@ -127,13 +127,13 @@ def raise_application_errors_on_failure(cls, error_list_details, http_code):  #
                     error_details, http_code)
             error_class = errors.UnexpectedError
         else:
-            message = error_details['message']
+            message = error_details.get('message')
         raise error_class(message, error_context)
 
     @classmethod
     def message_for_unexpected_error_with_type(cls, error_details, http_code):  # noqa
-        error_type = error_details['type']
-        message = error_details['message']
+        error_type = error_details.get('type')
+        message = error_details.get('message')
         return "The error of type '%s' is not recognized. It occurred with the message: %s and http_code: '%s'. Please contact Intercom with these details." % (error_type, message, http_code)  # noqa
 
     @classmethod
diff --git a/tests/unit/test_request.py b/tests/unit/test_request.py
@@ -225,6 +225,42 @@ def it_raises_a_multiple_matching_users_error(self):
             with assert_raises(intercom.MultipleMatchingUsersError):
                 Intercom.get('/users')
 
+    @istest
+    def it_handles_no_error_type(self):
+        payload = {
+            'errors': [
+                {
+                    'code': 'unique_user_constraint',
+                    'message': 'User already exists.'
+                }
+            ],
+            'request_id': '00000000-0000-0000-0000-000000000000',
+            'type': 'error.list'
+        }
+        content = json.dumps(payload).encode('utf-8')
+        resp = mock_response(content)
+        with patch('requests.request') as mock_method:
+            mock_method.return_value = resp
+            with assert_raises(intercom.MultipleMatchingUsersError):
+                Intercom.get('/users')
+
+        payload = {
+            'errors': [
+                {
+                    'code': 'parameter_not_found',
+                    'message': 'missing data parameter'
+                }
+            ],
+            'request_id': None,
+            'type': 'error.list'
+        }
+        content = json.dumps(payload).encode('utf-8')
+        resp = mock_response(content)
+        with patch('requests.request') as mock_method:
+            mock_method.return_value = resp
+            with assert_raises(intercom.BadRequestError):
+                Intercom.get('/users')
+
     @istest
     def it_handles_empty_responses(self):
         resp = mock_response('', status_code=202)
