Skip to content

Commit 11f50ab

Browse files
committed
Fix ValueError and more renaming
1 parent 030a46f commit 11f50ab

File tree

4 files changed

+9
-13
lines changed

4 files changed

+9
-13
lines changed

lego/apps/events/tasks.py

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -577,15 +577,10 @@ def notify_event_creator_when_payment_overdue(self, logger_context=None):
577577

578578

579579
@celery_app.task(serializer="json", bind=True, base=AbakusTask)
580-
def assign_penalties_and_unregister_when_payment_overdue(self, logger_context=None):
580+
def handle_overdue_payment(self, logger_context=None):
581581
"""
582-
Task that automatically assigns prikk.
583-
Gives penalty
584-
Unregisters
585-
Sends email
586-
TODO:
587-
Do not check now but payment deadline instead
588-
Do not unregister if they have paid, even after deadline?
582+
Task that automatically assigns penalty, unregisters user from event
583+
and notifies them when payment is overdue.
589584
"""
590585

591586
self.setup_logger(logger_context)

lego/apps/events/tests/test_async_tasks.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
from lego.apps.events.models import Event, Registration
1111
from lego.apps.events.tasks import (
1212
AsyncRegister,
13-
assign_penalties_and_unregister_when_payment_overdue,
13+
handle_overdue_payment,
1414
async_register,
1515
async_retrieve_payment,
1616
bump_waiting_users_to_new_pool,
@@ -805,7 +805,7 @@ def test_user_is_given_penalty_is_unregistered_and_notified(
805805
number_of_registrations_before = self.event.number_of_registrations
806806
number_of_penalties_before = registration_two.user.number_of_penalties()
807807

808-
assign_penalties_and_unregister_when_payment_overdue.delay()
808+
handle_overdue_payment.delay()
809809
registration_two.refresh_from_db()
810810

811811
self.assertLess(
@@ -841,7 +841,7 @@ def test_user_is_not_given_penalty_is_not_unregistered_and_not_notified(
841841
number_of_registrations_before = self.event.number_of_registrations
842842
number_of_penalties_before = registration_two.user.number_of_penalties()
843843

844-
assign_penalties_and_unregister_when_payment_overdue.delay()
844+
handle_overdue_payment.delay()
845845
registration_two.refresh_from_db()
846846

847847
self.assertEqual(

lego/apps/notifications/constants.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
EVENT_ADMIN_REGISTRATION,
5757
EVENT_ADMIN_UNREGISTRATION,
5858
EVENT_PAYMENT_OVERDUE,
59+
EVENT_PAYMENT_OVERDUE_PENALTY,
5960
MEETING_INVITE,
6061
MEETING_INVITATION_REMINDER,
6162
PENALTY_CREATION,

lego/settings/celery.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ def on_setup_logging(**kwargs):
5656
"task": "lego.apps.events.tasks.notify_event_creator_when_payment_overdue",
5757
"schedule": crontab(hour=21, minute=0),
5858
},
59-
"assign_penalties_and_unregister_when_payment_overdue": {
60-
"task": "lego.apps.events.tasks.assign_penalties_and_unregister_when_payment_overdue",
59+
"handle_overdue_payment": {
60+
"task": "lego.apps.events.tasks.handle_overdue_payment",
6161
"schedule": crontab(hour=9, minute=0),
6262
},
6363
"sync-external-systems": {

0 commit comments

Comments
 (0)