chore: release 0.38.6

Author: matteius

CHANGELOG.md

@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.38.6] - 2026-03-30
+
+### Fixed
+- **Workflow-level submission/final-decision notifications dispatched too early** — Submission-received and workflow-level final approval/rejection notifications are now dispatched on transaction commit so Celery does not race uncommitted submission/task state. This restores `submission_received` notifications for active workflows like Online Tuition Remission where approval requests were being sent but workflow-level notifications were missing from the notification log.
+- **Final decision recipients now include dynamic advisor/counselor assignees** — Final approval and rejection notifications now include direct assignees from workflow tasks backed by `assignee_form_field`, ensuring assigned advisors/counselors receive the final decision email alongside the submitter and any configured recipients.
+- **Approval comment help text clarified** — The approval page still warns that decision comments are public, but no longer tells end users to add a private field they cannot configure themselves.
+
 ## [0.38.5] - 2026-03-30
 
 ### Fixed

django_forms_workflows/tasks.py

@@ -770,6 +770,7 @@ def _collect_notification_recipients(
 
     Combines (in order):
     - submission.submitter.email if notif.notify_submitter is True and submission is provided.
+    - Dynamic workflow assignee emails for final decision notifications.
     - The dynamic email read from form_data via notif.email_field (if set and valid).
     - All static emails from notif.static_emails (comma-separated, if set).
     """
@@ -778,6 +779,20 @@ def _collect_notification_recipients(
         submitter_email = getattr(getattr(submission, "submitter", None), "email", None)
         if submitter_email and submitter_email not in recipients:
             recipients.append(submitter_email)
+    if submission is not None and getattr(notif, "notification_type", None) in {
+        "approval_notification",
+        "rejection_notification",
+    }:
+        dynamic_assignee_emails = (
+            submission.approval_tasks.select_related("assigned_to", "workflow_stage")
+            .filter(assigned_to__isnull=False)
+            .exclude(workflow_stage__assignee_form_field__isnull=True)
+            .exclude(workflow_stage__assignee_form_field="")
+            .values_list("assigned_to__email", flat=True)
+        )
+        for email in dynamic_assignee_emails:
+            if email and email not in recipients:
+                recipients.append(email)
     if notif.email_field:
         dynamic = _get_form_field_email(form_data, notif.email_field)
         if dynamic and dynamic not in recipients:

django_forms_workflows/templates/django_forms_workflows/approve.html

@@ -346,7 +346,6 @@ <h6 class="mb-3"><i class="bi bi-clipboard-check"></i> Your Decision</h6>
                         <div class="form-text text-muted">
                             <i class="bi bi-info-circle"></i>
                             This comment is <strong>visible to the submitter</strong> and appears on the public submission record.
-                            For internal notes, add a private field to this approval step's configuration instead.
                         </div>
                     </div>
                     <div class="d-grid gap-2 d-md-block">
@@ -590,7 +589,6 @@ <h5 class="mb-0"><i class="bi bi-clipboard-check"></i> Your Decision</h5>
                         <div class="form-text text-muted">
                             <i class="bi bi-info-circle"></i>
                             This comment is <strong>visible to the submitter</strong> and appears on the public submission record.
-                            For internal notes, add a private field to this approval step's configuration instead.
                         </div>
                     </div>
                     <div class="d-grid gap-2 d-md-block">

django_forms_workflows/workflow_engine.py

@@ -146,14 +146,28 @@ def _notify_form_field_recipients_for_submission(
     """
     try:
         from .tasks import send_submission_form_field_notifications
-
-        send_submission_form_field_notifications.delay(submission.id, notification_type)
     except Exception:
         logger.warning(
             "Could not dispatch form-field '%s' notifications for submission %s",
             notification_type,
             submission.id,
         )
+        return
+
+    def _dispatch() -> None:
+        try:
+            send_submission_form_field_notifications.delay(
+                submission.id, notification_type
+            )
+        except Exception:
+            logger.warning(
+                "Form-field '%s' notifications fell back to synchronous dispatch for submission %s",
+                notification_type,
+                submission.id,
+            )
+            send_submission_form_field_notifications(submission.id, notification_type)
+
+    transaction.on_commit(_dispatch)
 
 
 def _notify_workflow_level_recipients(
@@ -167,14 +181,28 @@ def _notify_workflow_level_recipients(
     """
     try:
         from .tasks import send_workflow_definition_notifications
-
-        send_workflow_definition_notifications.delay(submission.id, notification_type)
     except Exception:
         logger.warning(
             "Could not dispatch WorkflowNotification '%s' rules for submission %s",
             notification_type,
             submission.id,
         )
+        return
+
+    def _dispatch() -> None:
+        try:
+            send_workflow_definition_notifications.delay(
+                submission.id, notification_type
+            )
+        except Exception:
+            logger.warning(
+                "WorkflowNotification '%s' fell back to synchronous dispatch for submission %s",
+                notification_type,
+                submission.id,
+            )
+            send_workflow_definition_notifications(submission.id, notification_type)
+
+    transaction.on_commit(_dispatch)
 
 
 def _due_date_for(workflow: WorkflowDefinition):

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "django-forms-workflows"
-version = "0.38.5"
+version = "0.38.6"
 description = "Enterprise-grade, database-driven form builder with approval workflows and external data integration"
 license = "LGPL-3.0-only"
 readme = "README.md"

tests/test_notifications.py

@@ -0,0 +1,67 @@
+from unittest.mock import patch
+
+import pytest
+
+from django_forms_workflows.models import (
+    ApprovalTask,
+    FormSubmission,
+    WorkflowDefinition,
+    WorkflowNotification,
+    WorkflowStage,
+)
+from django_forms_workflows.tasks import send_workflow_definition_notifications
+
+
+@pytest.mark.parametrize(
+    "notification_type,task_status",
+    [
+        ("approval_notification", "approved"),
+        ("rejection_notification", "rejected"),
+    ],
+)
+def test_final_decision_notifications_include_dynamic_assignee(
+    notification_type,
+    task_status,
+    form_definition,
+    user,
+    approver_user,
+):
+    workflow = WorkflowDefinition.objects.create(
+        form_definition=form_definition,
+        requires_approval=True,
+    )
+    stage = WorkflowStage.objects.create(
+        workflow=workflow,
+        name="Advisor Review",
+        order=1,
+        approval_logic="all",
+        assignee_form_field="advisor_email",
+        assignee_lookup_type="email",
+    )
+    WorkflowNotification.objects.create(
+        workflow=workflow,
+        notification_type=notification_type,
+        notify_submitter=True,
+    )
+    submission = FormSubmission.objects.create(
+        form_definition=form_definition,
+        submitter=user,
+        form_data={"advisor_email": approver_user.email},
+        status="approved"
+        if notification_type == "approval_notification"
+        else "rejected",
+    )
+    ApprovalTask.objects.create(
+        submission=submission,
+        step_name="Advisor Review",
+        status=task_status,
+        assigned_to=approver_user,
+        workflow_stage=stage,
+        stage_number=1,
+    )
+
+    with patch("django_forms_workflows.tasks._send_html_email") as mock_send:
+        send_workflow_definition_notifications(submission.id, notification_type)
+
+    recipients = [call.args[1][0] for call in mock_send.call_args_list]
+    assert recipients == [user.email, approver_user.email]

tests/test_views.py

@@ -222,6 +222,17 @@ def test_approve_get(self, client, approver_user, approval_setup):
         assert resp.status_code == 200
         assert b"Manager Review" in resp.content
 
+    def test_approve_comment_help_text_keeps_public_warning_only(
+        self, client, approver_user, approval_setup
+    ):
+        sub, task, _ = approval_setup
+        client.force_login(approver_user)
+        url = reverse("forms_workflows:approve_submission", args=[task.pk])
+        resp = client.get(url)
+
+        assert b"visible to the submitter" in resp.content
+        assert b"add a private field to this approval step" not in resp.content
+
     def test_approve_post(self, client, approver_user, approval_setup):
         sub, task, _ = approval_setup
         client.force_login(approver_user)

tests/test_workflow_engine.py

@@ -16,6 +16,8 @@
     WorkflowStage,
 )
 from django_forms_workflows.workflow_engine import (
+    _notify_form_field_recipients_for_submission,
+    _notify_workflow_level_recipients,
     create_workflow_tasks,
     handle_approval,
     handle_rejection,
@@ -67,6 +69,36 @@ def test_workflow_no_approval_required(
         assert sub.status == "approved"
 
 
+class TestNotificationDispatch:
+    @patch(
+        "django_forms_workflows.workflow_engine.transaction.on_commit",
+        side_effect=lambda fn: fn(),
+    )
+    @patch("django_forms_workflows.tasks.send_workflow_definition_notifications.delay")
+    def test_workflow_notifications_dispatch_on_commit(
+        self, mock_delay, mock_on_commit, submission
+    ):
+        _notify_workflow_level_recipients(submission, "submission_received")
+
+        mock_on_commit.assert_called_once()
+        mock_delay.assert_called_once_with(submission.id, "submission_received")
+
+    @patch(
+        "django_forms_workflows.workflow_engine.transaction.on_commit",
+        side_effect=lambda fn: fn(),
+    )
+    @patch(
+        "django_forms_workflows.tasks.send_submission_form_field_notifications.delay"
+    )
+    def test_form_field_notifications_dispatch_on_commit(
+        self, mock_delay, mock_on_commit, submission
+    ):
+        _notify_form_field_recipients_for_submission(submission, "submission_received")
+
+        mock_on_commit.assert_called_once()
+        mock_delay.assert_called_once_with(submission.id, "submission_received")
+
+
 # ── Legacy flat mode (all) ────────────────────────────────────────────────