Merge pull request #1263 from OpenTechFund/feature/workflow-automations-proposal

Automatically update status on proposals when reviewers are added and…

Author: frjo

opentech/apply/funds/views.py

@@ -411,18 +411,27 @@ def form_valid(self, form):
             removed=removed,
         )
 
-        if added and self.object.status == INITIAL_STATE:
-            # Automatically transition the submission to "Internal review".
-            action = self.object.workflow.stepped_phases[1][0].name
-            try:
-                self.object.perform_transition(
-                    action,
-                    self.request.user,
-                    request=self.request,
-                    notify=False,
-                )
-            except (PermissionDenied, KeyError):
-                pass
+        if added:
+            # Automatic workflow actions.
+            action = None
+            if self.object.status == INITIAL_STATE:
+                # Automatically transition the application to "Internal review".
+                action = self.object.workflow.stepped_phases[1][0].name
+            elif self.object.status == 'proposal_discussion':
+                # Automatically transition the proposal to "Internal review".
+                action = 'proposal_internal_review'
+
+            # If action is set run perform_transition().
+            if action:
+                try:
+                    self.object.perform_transition(
+                        action,
+                        self.request.user,
+                        request=self.request,
+                        notify=False,
+                    )
+                except (PermissionDenied, KeyError):
+                    pass
 
         return response
 

opentech/apply/funds/workflow.py

@@ -12,6 +12,8 @@
 Current limitations:
 * Changing the name of a phase will mean that any object which references it cannot progress. [will
 be fixed when streamfield, may require intermediate fix prior to launch]
+* Do not reorder without looking at workflow automations steps in form_valid() in
+opentech/apply/funds/views.py and opentech/apply/review/views.py.
 """
 
 

opentech/apply/review/views.py

@@ -113,22 +113,24 @@ def form_valid(self, form):
                 related=self.object,
             )
 
+            # Automatic workflow actions.
             submission_stepped_phases = self.submission.workflow.stepped_phases
+            action = None
             if self.submission.status == INITIAL_STATE:
-                # Automatically transition the submission to "Internal review".
+                # Automatically transition the application to "Internal review".
                 action = submission_stepped_phases[1][0].name
-                try:
-                    self.submission.perform_transition(
-                        action,
-                        self.request.user,
-                        request=self.request,
-                        notify=False,
-                    )
-                except (PermissionDenied, KeyError):
-                    pass
             elif self.submission.status == submission_stepped_phases[1][0].name and self.submission.reviews.count() > 1:
-                # Automatically transition the submission to "Ready for discussion".
+                # Automatically transition the application to "Ready for discussion".
                 action = submission_stepped_phases[2][0].name
+            elif self.submission.status == 'proposal_discussion':
+                # Automatically transition the proposal to "Internal review".
+                action = 'proposal_internal_review'
+            elif self.submission.status == 'external_review' and self.submission.reviews.count() > 1:
+                # Automatically transition the proposal to "Ready for discussion".
+                action = 'post_external_review_discussion'
+
+            # If action is set run perform_transition().
+            if action:
                 try:
                     self.submission.perform_transition(
                         action,