Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🐛 [#2166] Make status argument for send_case_update_email optional #1069

Merged
merged 1 commit into from
Mar 4, 2024
Merged

🐛 [#2166] Make status argument for send_case_update_email optional #1069

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/open_inwoner/openzaak/notifications.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import logging
from datetime import date, timedelta
from typing import List
from typing import List, Optional

from django.conf import settings
from django.urls import reverse
Expand Down Expand Up @@ -553,7 +553,7 @@ def handle_status_update(
else:
template_name = "case_status_notification"

send_case_update_email(user, case, status, template_name)
send_case_update_email(user, case, template_name, status=status)
note.mark_sent()

log_system_action(
Expand All @@ -565,8 +565,8 @@ def handle_status_update(
def send_case_update_email(
user: User,
case: Zaak,
status: Status,
template_name: str,
status: Optional[Status] = None,
extra_context: dict = None,
):
"""
Expand Down
4 changes: 3 additions & 1 deletion src/open_inwoner/openzaak/tests/test_notification_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@ def test_send_case_update_email(self):
Zaak, "_format_zaak_identificatie"
) as format_identificatie:
format_identificatie.return_value = ret_val
send_case_update_email(user, case, status, "case_status_notification")
send_case_update_email(
user, case, "case_status_notification", status=status
)

format_identificatie.assert_called_once()

Expand Down
12 changes: 8 additions & 4 deletions src/open_inwoner/openzaak/tests/test_notification_zaak_status.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -595,10 +595,12 @@ def test_handle_status_update(self, mock_send: Mock, mock_feed_hook: Mock):

# check call arguments
args = mock_send.call_args.args
kwargs = mock_send.call_args.kwargs

self.assertEqual(args[0], user)
self.assertEqual(args[1].url, case.url)
self.assertEqual(args[2], status)
self.assertEqual(args[3], "case_status_notification")
self.assertEqual(args[2], "case_status_notification")
self.assertEqual(kwargs["status"], status)

mock_send.reset_mock()

Expand Down Expand Up @@ -693,7 +695,9 @@ def test_action_required_template(self, mock_send: Mock, mock_feed_hook: Mock):
mock_send.assert_called_once()
# check call arguments
args = mock_send.call_args.args
kwargs = mock_send.call_args.kwargs

self.assertEqual(args[0], user)
self.assertEqual(args[1].url, case.url)
self.assertEqual(args[2], status)
self.assertEqual(args[3], "case_status_notification_action_required")
self.assertEqual(args[2], "case_status_notification_action_required")
self.assertEqual(kwargs["status"], status)
Loading