Move the determination messages to include the request

opentech/apply/determinations/models.py

@@ -2,8 +2,6 @@ import bleach
 from django.conf import settings
 from django.contrib.postgres.fields import JSONField
 from django.db import models
-from django.db.models.signals import post_save
-from django.dispatch import receiver
 from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 from wagtail.admin.edit_handlers import TabbedInterface, ObjectList, FieldPanel
@@ -11,9 +9,6 @@ from wagtail.contrib.settings.models import BaseSetting
 from wagtail.contrib.settings.registry import register_setting
 from wagtail.core.fields import RichTextField
 
-from opentech.apply.activity.models import Activity
-from opentech.apply.activity.messaging import messenger, MESSAGES
-
 
 REJECTED = 0
 NEEDS_MORE_INFO = 1
@@ -68,26 +63,6 @@ class Determination(models.Model):
         return f'<{self.__class__.__name__}: {str(self.data)}>'
 
 
-@receiver(post_save, sender=Determination)
-def log_determination_activity(sender, **kwargs):
-    determination = kwargs.get('instance')
-
-    if kwargs.get('created', False):
-        messenger(
-            MESSAGES.NEW_DETERMINATION,
-            user=determination.author,
-            submission=determination.submission,
-        )
-
-    if not kwargs.get('is_draft', False):
-        submission = determination.submission
-        messenger(
-            MESSAGES.DETERMINATION_OUTCOME,
-            user=determination.author,
-            submission=submission,
-        )
-
-
 @register_setting
 class DeterminationMessageSettings(BaseSetting):
     class Meta:

opentech/apply/determinations/views.py

@@ -74,11 +74,27 @@ class DeterminationCreateOrUpdateView(CreateOrUpdateView):
         return self.submission.get_absolute_url()
 
     def form_valid(self, form):
+        is_new = not form.instance.id
+
         response = super().form_valid(form)
 
         if not self.object.is_draft:
+            messenger(
+                MESSAGES.DETERMINATION_OUTCOME,
+                request=self.request,
+                user=self.object.author,
+                submission=self.object.submission,
+            )
             action_name = self.get_action_name_from_determination(int(form.cleaned_data.get('outcome')))
+
             self.submission.perform_transition(action_name, self.request.user)
+        elif is_new:
+            messenger(
+                MESSAGES.NEW_DETERMINATION,
+                request=self.request,
+                user=self.object.author,
+                submission=self.object.submission,
+            )
 
         return self.progress_stage(self.submission) or response