Provide flag n error response if we have pending tasks

Author: Abdu-moustafa

opengever/api/tests/test_dossier_workflow.py

@@ -250,7 +250,12 @@ def test_resolve_dossier_auto_close_tasks(self, browser):
             self.assertEqual(400, browser.status_code)
             self.assertDictEqual(
                 {
-                    u'error': {u'message': u'', u'errors': [u'not all task are closed'], u'type': u'PreconditionsViolated'}
+                    u'error': {
+                        u'message': u'',
+                        u'errors': [u'not all task are closed'],
+                        u'type': u'PreconditionsViolated',
+                        u'has_not_closed_tasks': True,
+                    }
                 },
                 browser.json)
 

opengever/api/transition.py

@@ -9,6 +9,7 @@
 from opengever.dossier.resolve import InvalidDates
 from opengever.dossier.resolve import LockingResolveManager
 from opengever.dossier.resolve import MSG_ALREADY_BEING_RESOLVED
+from opengever.dossier.resolve import NOT_CLOSED_TASKS
 from opengever.dossier.resolve import PreconditionsViolated
 from opengever.sign.sign import Signer
 from plone import api
@@ -189,6 +190,7 @@ def reply(self):
             return dict(error=dict(
                 type='PreconditionsViolated',
                 errors=map(self.translate, e.errors),
+                has_not_closed_tasks=NOT_CLOSED_TASKS in e.errors,
                 message=self.translate(str(e))))
 
         except InvalidDates as e:

opengever/dossier/tests/test_activate.py

@@ -138,6 +138,7 @@ def assert_errors(self, dossier, browser, error_msgs):
             {u'error':
                 {u'message': u'',
                  u'errors': error_msgs,
+                 u'has_not_closed_tasks': False,
                  u'type': u'PreconditionsViolated'}},
             browser.json)
         expected_url = dossier.absolute_url() + \

opengever/dossier/tests/test_archiver.py

@@ -525,6 +525,7 @@ def test_precondition_violation_raises_error_already_on_resolve_view(self, brows
             {u'error': {
                 u'message': u'',
                 u'errors': [u'not all task are closed'],
+                u'has_not_closed_tasks': True,
                 u'type': u'PreconditionsViolated'}},
             browser.json)
 

opengever/dossier/tests/test_deactivate.py

@@ -167,6 +167,7 @@ def assert_errors(self, dossier, browser, error_msgs):
             {u'error':
                 {u'message': u'',
                  u'errors': error_msgs,
+                 u'has_not_closed_tasks': False,
                  u'type': u'PreconditionsViolated'}},
             browser.json)
         expected_url = dossier.absolute_url() + \
@@ -303,6 +304,7 @@ def assert_errors(self, dossier, browser, error_msgs):
             {u'error':
                 {u'message': u'',
                  u'errors': error_msgs,
+                 u'has_not_closed_tasks': False,
                  u'type': u'PreconditionsViolated'}},
             browser.json)
         expected_url = dossier.absolute_url() + \

opengever/dossier/tests/test_reactivate.py

@@ -93,7 +93,7 @@ def test_reactivating_a_subdossier_of_a_resolved_dossier_is_not_possible(self, b
         self.reactivate(self.resolvable_subdossier, browser)
 
         self.assert_errors(self.resolvable_subdossier, browser,
-                           ["A subdossier may not be reopened on its own. Please reopen the main dossier."])
+                           [u"A subdossier may not be reopened on its own. Please reopen the main dossier."])
         self.assert_workflow_state('dossier-state-resolved',
                                    self.resolvable_subdossier)
 
@@ -170,6 +170,7 @@ def assert_errors(self, dossier, browser, error_msgs):
             {u'error': {
                 u'message': u'',
                 u'errors': error_msgs,
+                u'has_not_closed_tasks': False,
                 u'type': u'PreconditionsViolated'}},
             browser.json)
         expected_url = dossier.absolute_url() + '/@workflow/dossier-transition-reactivate'

opengever/dossier/tests/test_resolve.py

@@ -151,11 +151,12 @@ def assert_success(self, dossier, browser, info_msgs=None):
              u'review_state': u'dossier-state-resolved'},
             browser.json)
 
-    def assert_errors(self, dossier, browser, error_msgs):
+    def assert_errors(self, dossier, browser, error_msgs, has_not_closed_tasks=False):
         self.assertEqual(400, browser.status_code)
         self.assertEqual(
             {u'error': {
                 u'message': u'',
+                u'has_not_closed_tasks': has_not_closed_tasks,
                 u'errors': error_msgs,
                 u'type': u'PreconditionsViolated'}},
             browser.json)
@@ -1014,7 +1015,7 @@ def test_resolving_is_cancelled_when_active_tasks_exist(self, browser):
 
         self.assert_not_resolved(self.resolvable_dossier)
         self.assert_errors(self.resolvable_dossier, browser,
-                           ['not all task are closed'])
+                           [u'not all task are closed'], has_not_closed_tasks=True)
 
     @browsing
     def test_resolving_is_cancelled_when_dossier_has_an_invalid_end_date(self, browser):
@@ -1026,8 +1027,12 @@ def test_resolving_is_cancelled_when_dossier_has_an_invalid_end_date(self, brows
         self.resolve(self.resolvable_dossier, browser)
 
         self.assert_not_resolved(self.resolvable_dossier)
-        self.assert_errors(self.resolvable_dossier, browser,
-                           ['The dossier A resolvable main dossier has a invalid end_date'])
+        self.assertEqual(
+            {u'error': {
+                u'message': u'',
+                u'errors': [u'The dossier A resolvable main dossier has a invalid end_date'],
+                u'type': u'PreconditionsViolated'}},
+            browser.json)
 
     @browsing
     def test_resolving_is_cancelled_when_subdossier_has_an_invalid_end_date(self, browser):
@@ -1042,8 +1047,12 @@ def test_resolving_is_cancelled_when_subdossier_has_an_invalid_end_date(self, br
         self.resolve(self.resolvable_dossier, browser)
 
         self.assert_not_resolved(self.resolvable_dossier)
-        self.assert_errors(self.resolvable_dossier, browser,
-                           ['The dossier Resolvable Subdossier has a invalid end_date'])
+        self.assertEqual(
+            {u'error': {
+                u'message': u'',
+                u'errors': [u'The dossier Resolvable Subdossier has a invalid end_date'],
+                u'type': u'PreconditionsViolated'}},
+            browser.json)
 
     @browsing
     def test_dossier_is_resolved_when_resolved_subdossier_has_an_invalid_end_date(self, browser):