Merge pull request ej2#128 from bendavis78/exceptions

Add handling for different exception types

Author: ej2

quickbooks/client.py

@@ -12,7 +12,7 @@
 import codecs
 import json
 
-from .exceptions import QuickbooksException, SevereException, AuthorizationException
+from . import exceptions
 import base64
 import hashlib
 import hmac
@@ -221,17 +221,17 @@ def make_request(self, request_type, url, request_body=None, content_type='appli
  req = self.process_request(request_type, url, headers=headers, params=params, data=request_body)
 
  if req.status_code == httplib.UNAUTHORIZED:
- raise AuthorizationException("Application authentication failed", detail=req.text)
+ raise exceptions.AuthorizationException("Application authentication failed", detail=req.text)
 
  try:
  result = req.json()
  except:
- raise QuickbooksException("Error reading json response: {0}".format(req.text), 10000)
+ raise exceptions.QuickbooksException("Error reading json response: {0}".format(req.text), 10000)
 
  if "Fault" in result:
  self.handle_exceptions(result["Fault"])
  elif not req.status_code == httplib.OK:
- raise QuickbooksException("Error returned with status code '{0}': {1}".format(
+ raise exceptions.QuickbooksException("Error returned with status code '{0}': {1}".format(
  req.status_code, req.text), 10000)
  else:
  return result
@@ -244,7 +244,7 @@ def post(self, *args, **kwargs):
 
  def process_request(self, request_type, url, headers="", params="", data=""):
  if self.session_manager is None:
- raise QuickbooksException('No session manager')
+ raise exceptions.QuickbooksException('No session manager')
 
  if self.session_manager.oauth_version == 2.0:
  headers.update({'Authorization': 'Bearer ' + self.session_manager.access_token})
@@ -276,10 +276,20 @@ def handle_exceptions(self, results):
  if "code" in error:
  code = int(error["code"])
 
- if code >= 10000:
- raise SevereException(message, code, detail)
+ if code > 0 and code <= 499:
+ raise exceptions.AuthorizationException(message, code, detail)
+ elif code >= 500 and code <= 599:
+ raise exceptions.UnsupportedException(message, code, detail)
+ elif code >= 600 and code <= 1999:
+ if code == 610:
+ raise exceptions.ObjectNotFoundException(message, code, detail)
+ raise exceptions.GeneralException(message, code, detail)
+ elif code >= 2000 and code <= 4999:
+ raise exceptions.ValidationException(message, code, detail)
+ elif code >= 10000:
+ raise exceptions.SevereException(message, code, detail)
  else:
- raise QuickbooksException(message, code, detail)
+ raise exceptions.QuickbooksException(message, code, detail)
 
  def create_object(self, qbbo, request_body, _file_path=None):
  self.isvalid_object_name(qbbo)
@@ -327,7 +337,7 @@ def misc_operation(self, end_point, request_body):
 
  def download_pdf(self, qbbo, item_id):
  if self.session_manager is None:
- raise QuickbooksException('No session manager')
+ raise exceptions.QuickbooksException('No session manager')
 
  url = "{0}/company/{1}/{2}/{3}/pdf".format(
  self.api_url, self.company_id, qbbo.lower(), item_id)
@@ -349,7 +359,7 @@ def download_pdf(self, qbbo, item_id):
  try:
  result = response.json()
  except:
- raise QuickbooksException("Error reading json response: {0}".format(response.text), 10000)
+ raise exceptions.QuickbooksException("Error reading json response: {0}".format(response.text), 10000)
 
  self.handle_exceptions(result["Fault"])
  else:

quickbooks/exceptions.py

@@ -43,3 +43,11 @@ class SevereException(QuickbooksException):
  Quickbooks Error Codes greater than 10000
  """
  pass
+
+
+class ObjectNotFoundException(QuickbooksException):
+ """
+ Quickbooks Error Code 610
+ """
+ pass
+