Fix auto close function

Author: elioschmutz

opengever/task/__init__.py

@@ -35,6 +35,10 @@
 
 TASK_STATE_IN_PROGRESS = 'task-state-in-progress'
 
+TASK_STATE_RESOLVED = 'task-state-resolved'
+
+TASK_STATE_REJECTED = 'task-state-rejected'
+
 FINAL_TASK_STATES = [
     'task-state-tested-and-closed',
     'task-state-cancelled',

opengever/task/task.py

@@ -34,6 +34,8 @@
 from opengever.task import TASK_STATE_IN_PROGRESS
 from opengever.task import TASK_STATE_OPEN
 from opengever.task import TASK_STATE_PLANNED
+from opengever.task import TASK_STATE_REJECTED
+from opengever.task import TASK_STATE_RESOLVED
 from opengever.task import TASK_STATE_SKIPPED
 from opengever.task import util
 from opengever.task.interfaces import ITaskSettings
@@ -47,6 +49,7 @@
 from persistent.dict import PersistentDict
 from persistent.list import PersistentList
 from plone import api
+from plone.api.exc import InvalidParameterError
 from plone.app.textfield import RichText
 from plone.autoform import directives as form
 from plone.dexterity.content import Container
@@ -907,14 +910,6 @@ def _set_review_state(self, review_state):
         self.sync()
         self.reindexObject()
 
-    def get_available_transitions(self):
-        wftool = api.portal.get_tool("portal_workflow")
-        actions = wftool.listActionInfos(object=self)
-        return [
-            action['id'] for action in actions
-            if action['category'] == 'workflow'
-        ]
-
     def force_finish_task(self):
         """This method is used to forcefully close a task, including all its subtasks,
         when a dossier is being closed and active tasks still exist.
@@ -924,32 +919,32 @@ def force_finish_task(self):
         Rather than preventing the dossier from closing, we force each task into a
         valid terminal state based on its current state.
 
-        # This method is recursive, ensuring that all subtasks are also finished in the same way,
+        This method is recursive, ensuring that all subtasks are also finished in the same way,
         """
-        state = api.content.get_state(self)
-        transitions = self.get_available_transitions()
+        if api.content.get_state(self) == TASK_STATE_REJECTED:
+            api.content.transition(obj=self, transition='task-transition-rejected-open')
+
+        if api.content.get_state(self) == TASK_STATE_OPEN:
+            api.content.transition(obj=self, transition='task-transition-open-cancelled')
+            # Cancel a task will automatically cancel all subtasks.
+            return
 
         for subtask in self.objectValues():
             if ITask.providedBy(subtask):
                 subtask.force_finish_task()
 
-        if state == TASK_STATE_OPEN:
-            api.content.transition(obj=self, transition='task-transition-open-cancelled')
-
-        elif state == TASK_STATE_IN_PROGRESS:
-            if 'task-transition-in-progress-resolved' in transitions:
-                api.content.transition(obj=self, transition='task-transition-in-progress-resolved')
-                # refresh transitions after state change
-                transitions = self.get_available_transitions()
-
-            if 'task-transition-resolved-tested-and-closed' in transitions:
+        if api.content.get_state(self) == TASK_STATE_IN_PROGRESS:
+            # Depending on the task type, some transitions are not possible. We
+            # do not try to understand the businesslogic here and naivily do
+            # the expected transitions.
+            try:
+                # We first try to directly close it.
                 api.content.transition(obj=self, transition='task-transition-resolved-tested-and-closed')
+            except InvalidParameterError:
+                # If it does not work, we try to resolve it first.
+                api.content.transition(obj=self, transition='task-transition-in-progress-resolved')
 
-            if 'task-transition-in-progress-cancelled' in transitions:
-                api.content.transition(obj=self, transition='task-transition-in-progress-cancelled')
-                transitions = self.get_available_transitions()
-
-        elif state == 'task-state-resolved':
+        if api.content.get_state(self) == TASK_STATE_RESOLVED:
             api.content.transition(obj=self, transition='task-transition-resolved-tested-and-closed')
 
 

opengever/task/tests/test_task.py

@@ -743,7 +743,7 @@ def test_force_update_resolved_main_task_without_subtasks(self, browser):
 
     @browsing
     def test_force_finish_task_open_with_subtask(self, browser):
-        self.login(self.dossier_responsible)
+        self.login(self.dossier_responsible, browser)
 
         dossier = create(Builder('dossier'))
         main_task = create(
@@ -802,6 +802,7 @@ def test_force_finish_task_open_with_subtask(self, browser):
 
         main_task.force_finish_task()
 
+        # If the main task is cancelled, every subtask will be cancelled as well
         self.assertEqual('task-state-cancelled', api.content.get_state(main_task))
         self.assertEqual('task-state-cancelled', api.content.get_state(subtask1))
         self.assertEqual('task-state-cancelled', api.content.get_state(subtask2))
@@ -810,7 +811,7 @@ def test_force_finish_task_open_with_subtask(self, browser):
 
     @browsing
     def test_force_finish_task_in_progress_with_subtask(self, browser):
-        self.login(self.dossier_responsible)
+        self.login(self.dossier_responsible, browser)
 
         dossier = create(Builder('dossier'))
         main_task = create(
@@ -869,15 +870,15 @@ def test_force_finish_task_in_progress_with_subtask(self, browser):
 
         main_task.force_finish_task()
 
-        self.assertEqual('task-state-cancelled', api.content.get_state(main_task))
-        self.assertEqual('task-state-cancelled', api.content.get_state(subtask1))
-        self.assertEqual('task-state-cancelled', api.content.get_state(subtask2))
+        self.assertEqual('task-state-tested-and-closed', api.content.get_state(main_task))
+        self.assertEqual('task-state-tested-and-closed', api.content.get_state(subtask1))
+        self.assertEqual('task-state-tested-and-closed', api.content.get_state(subtask2))
         self.assertEqual('task-state-cancelled', api.content.get_state(subtask3))
         self.assertEqual('task-state-cancelled', api.content.get_state(subtask4))
 
     @browsing
     def test_force_finish_task_resolved_with_subtask(self, browser):
-        self.login(self.dossier_responsible)
+        self.login(self.dossier_responsible, browser)
 
         dossier = create(Builder('dossier'))
         main_task = create(
@@ -940,4 +941,4 @@ def test_force_finish_task_resolved_with_subtask(self, browser):
         self.assertEqual('task-state-tested-and-closed', api.content.get_state(subtask1))
         self.assertEqual('task-state-tested-and-closed', api.content.get_state(subtask2))
         self.assertEqual('task-state-cancelled', api.content.get_state(subtask3))
-        self.assertEqual('task-state-rejected', api.content.get_state(subtask4))
+        self.assertEqual('task-state-cancelled', api.content.get_state(subtask4))