From 11f50ab5376961e8481d6a1e279cc98362d5d0c9 Mon Sep 17 00:00:00 2001 From: Isak Berg Endresen Date: Wed, 9 Oct 2024 22:22:48 +0200 Subject: [PATCH] Fix ValueError and more renaming --- lego/apps/events/tasks.py | 11 +++-------- lego/apps/events/tests/test_async_tasks.py | 6 +++--- lego/apps/notifications/constants.py | 1 + lego/settings/celery.py | 4 ++-- 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/lego/apps/events/tasks.py b/lego/apps/events/tasks.py index bf5835b74..47d551fd4 100644 --- a/lego/apps/events/tasks.py +++ b/lego/apps/events/tasks.py @@ -577,15 +577,10 @@ def notify_event_creator_when_payment_overdue(self, logger_context=None): @celery_app.task(serializer="json", bind=True, base=AbakusTask) -def assign_penalties_and_unregister_when_payment_overdue(self, logger_context=None): +def handle_overdue_payment(self, logger_context=None): """ - Task that automatically assigns prikk. - Gives penalty - Unregisters - Sends email - TODO: - Do not check now but payment deadline instead - Do not unregister if they have paid, even after deadline? + Task that automatically assigns penalty, unregisters user from event + and notifies them when payment is overdue. """ self.setup_logger(logger_context) diff --git a/lego/apps/events/tests/test_async_tasks.py b/lego/apps/events/tests/test_async_tasks.py index afbae541f..78c0de51c 100644 --- a/lego/apps/events/tests/test_async_tasks.py +++ b/lego/apps/events/tests/test_async_tasks.py @@ -10,7 +10,7 @@ from lego.apps.events.models import Event, Registration from lego.apps.events.tasks import ( AsyncRegister, - assign_penalties_and_unregister_when_payment_overdue, + handle_overdue_payment, async_register, async_retrieve_payment, bump_waiting_users_to_new_pool, @@ -805,7 +805,7 @@ def test_user_is_given_penalty_is_unregistered_and_notified( number_of_registrations_before = self.event.number_of_registrations number_of_penalties_before = registration_two.user.number_of_penalties() - assign_penalties_and_unregister_when_payment_overdue.delay() + handle_overdue_payment.delay() registration_two.refresh_from_db() self.assertLess( @@ -841,7 +841,7 @@ def test_user_is_not_given_penalty_is_not_unregistered_and_not_notified( number_of_registrations_before = self.event.number_of_registrations number_of_penalties_before = registration_two.user.number_of_penalties() - assign_penalties_and_unregister_when_payment_overdue.delay() + handle_overdue_payment.delay() registration_two.refresh_from_db() self.assertEqual( diff --git a/lego/apps/notifications/constants.py b/lego/apps/notifications/constants.py index 94285336a..1db9ff751 100644 --- a/lego/apps/notifications/constants.py +++ b/lego/apps/notifications/constants.py @@ -56,6 +56,7 @@ EVENT_ADMIN_REGISTRATION, EVENT_ADMIN_UNREGISTRATION, EVENT_PAYMENT_OVERDUE, + EVENT_PAYMENT_OVERDUE_PENALTY, MEETING_INVITE, MEETING_INVITATION_REMINDER, PENALTY_CREATION, diff --git a/lego/settings/celery.py b/lego/settings/celery.py index 55cdc0137..54bcbc2e1 100644 --- a/lego/settings/celery.py +++ b/lego/settings/celery.py @@ -56,8 +56,8 @@ def on_setup_logging(**kwargs): "task": "lego.apps.events.tasks.notify_event_creator_when_payment_overdue", "schedule": crontab(hour=21, minute=0), }, - "assign_penalties_and_unregister_when_payment_overdue": { - "task": "lego.apps.events.tasks.assign_penalties_and_unregister_when_payment_overdue", + "handle_overdue_payment": { + "task": "lego.apps.events.tasks.handle_overdue_payment", "schedule": crontab(hour=9, minute=0), }, "sync-external-systems": {