Fix the email sending and status change processes in the Suricate workflow (#5092)

* Send emails to Suricate when changing report status

* Format if conditions in report form

* Add an entry in the changelog

Author: PartyNell

docs/changelog.rst

@@ -8,6 +8,7 @@ CHANGELOG
 **Bug fixes**
 
 * Draft path can be add by user without permission to add regular path
+* Fix the email sending and status change processes in the Suricate workflow.
 
 
 2.121.0         (2025-11-14)

geotrek/feedback/forms.py

@@ -96,10 +96,9 @@ def __init__(self, *args, **kwargs):
                     identifier__in=next_statuses
                 )
                 # current_user
-                if (
+                if self.old_status.identifier not in ["filed", "waiting"] or (
                     WorkflowManager.objects.first()
-                    and self.old_status.identifier not in ["filed", "waiting"]
-                    or kwargs["user"] != WorkflowManager.objects.first().user
+                    and kwargs["user"] != WorkflowManager.objects.first().user
                 ):
                     # only manager can reassign a report
                     self.fields["current_user"].widget = HiddenInput()
@@ -192,7 +191,11 @@ def save(self, *args, **kwargs):
         if (not creation) and settings.SURICATE_WORKFLOW_ENABLED:
             waiting_status = ReportStatus.objects.get(identifier="waiting")
             # Assign report through moderation step
-            if self.old_status.identifier in ["filed"] and report.current_user:
+            if (
+                self.old_status.identifier in ["filed"]
+                and report.status.identifier in ["waiting"]
+                and report.current_user
+            ):
                 msg = self.cleaned_data.get("message_supervisor", "")
                 report.notify_current_user(msg)
                 report.assigned_handler = report.current_user
@@ -229,8 +232,10 @@ def save(self, *args, **kwargs):
                 self.old_status.identifier != report.status.identifier
                 or self.old_user != report.current_user
                 # do not notify suricate when the supervisor is reassigned
-                and self.old_status.identifier in ["waiting"]
-                and report.status.identifier in ["waiting"]
+                and not (
+                    self.old_status.identifier in ["waiting"]
+                    and report.status.identifier in ["waiting"]
+                )
             ):
                 msg_sentinel = self.cleaned_data.get("message_sentinel", "")
                 msg_admins = self.cleaned_data.get("message_administrators", "")

geotrek/feedback/tests/test_forms.py

@@ -197,6 +197,7 @@ def test_workflow_assign_supervisor_step(self, mocked_post, mocked_get):
         # When assigning a user to a report
         data = {
             "current_user": str(self.other_user.pk),
+            "status": self.waiting_status,
             "email": "[email protected]",
             "geom": self.filed_report.geom,
             "message_sentinel": "Your message",
@@ -269,6 +270,7 @@ def test_workflow_assign_manager_step(self, mocked_post, mocked_get):
         # When assigning a user to a report
         data = {
             "current_user": str(self.workflow_manager.user.pk),
+            "status": self.waiting_status,
             "email": "[email protected]",
             "geom": self.filed_report.geom,
             "message_sentinel": "Your message",