From 528b2bb5a680d457f08b3edfdf7cb04ad5d08ad5 Mon Sep 17 00:00:00 2001
From: Michael Olund <michaelo@openroad.ca>
Date: Mon, 26 Oct 2020 12:47:46 -0700
Subject: [PATCH] Updated error handling to reduce nesting

---
 edivorce/apps/core/utils/cso_filing.py | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/edivorce/apps/core/utils/cso_filing.py b/edivorce/apps/core/utils/cso_filing.py
index 7d15d7ca..e5c95f90 100644
--- a/edivorce/apps/core/utils/cso_filing.py
+++ b/edivorce/apps/core/utils/cso_filing.py
@@ -28,23 +28,22 @@ def file_documents(request, responses, initial=False):
     if errors:
         return errors, None
 
-    if settings.EFILING_HUB_ENABLED:
-        hub = EFilingHub(initial_filing=initial)
-
-        post_files, documents = hub.get_files(request, responses, uploaded, generated)
-        location = hub.get_location(responses)
-        parties = hub.get_parties(responses)
+    if not settings.EFILING_HUB_ENABLED:
+        return after_file_documents(request, initial)
 
-        redirect_url, msg = hub.upload(request, post_files, documents, parties, location)
+    hub = EFilingHub(initial_filing=initial)
+    post_files, documents = hub.get_files(request, responses, uploaded, generated)
+    location = hub.get_location(responses)
+    parties = hub.get_parties(responses)
 
-        if redirect_url:
-            return errors, redirect_url
+    redirect_url, msg = hub.upload(request, post_files, documents, parties, location)
 
-        if msg:
-            return msg, None
+    if msg:
+        errors.append(msg)
+        return errors, None
 
-    else:
-        return after_file_documents(request, initial)
+    if redirect_url:
+        return None, redirect_url
 
     return None, None