From 0244c2dce23b39c93ccb8f8b16f80e47b63fe294 Mon Sep 17 00:00:00 2001 From: earlinn Date: Wed, 17 Apr 2024 15:17:41 +0500 Subject: [PATCH] Fix localization error --- .gitignore | 2 +- infra/docker-compose.local.yml | 2 +- infra/docker-compose.yml | 2 +- src/applications/tasks.py | 16 ++++++++++++++++ src/events/serializers.py | 3 ++- src/templates/remind_by_email.html | 10 ++++++++++ src/templates/submit_application.html | 2 +- 7 files changed, 32 insertions(+), 5 deletions(-) create mode 100644 src/templates/remind_by_email.html diff --git a/.gitignore b/.gitignore index c68254a..c73b93b 100644 --- a/.gitignore +++ b/.gitignore @@ -163,7 +163,7 @@ cython_debug/ .vscode* # DB dumps -dump.json +dump* # Static folder static/ diff --git a/infra/docker-compose.local.yml b/infra/docker-compose.local.yml index a89638c..afbe84b 100644 --- a/infra/docker-compose.local.yml +++ b/infra/docker-compose.local.yml @@ -46,7 +46,7 @@ services: build: ../ image: funtech_celery_worker container_name: funtech_celery_worker - command: celery -A config.celery.app worker worker -l INFO + command: celery -A config.celery.app worker -l INFO volumes: - static_value:/app/static/ - media_value:/app/media/ diff --git a/infra/docker-compose.yml b/infra/docker-compose.yml index 73bc62d..c92bca6 100644 --- a/infra/docker-compose.yml +++ b/infra/docker-compose.yml @@ -31,7 +31,7 @@ services: celery_worker: image: hackathonyacrm/funtech_backend:v.01 container_name: funtech_celery_worker - command: celery -A config.celery.app worker worker -l INFO + command: celery -A config.celery.app worker -l INFO volumes: - static_value:/app/static/ - media_value:/app/media/ diff --git a/src/applications/tasks.py b/src/applications/tasks.py index 9ef5ac6..4c58bd4 100644 --- a/src/applications/tasks.py +++ b/src/applications/tasks.py @@ -16,3 +16,19 @@ def send_email_after_submission_of_application( "submit_application.html", {"first_name": first_name, "event": event} ) send_mail(subject, message, from_email=None, recipient_list=[to_email]) + + +@shared_task +def remind_participant_about_upcoming_event( + first_name: str, event: str, date: str, time: str, to_email: str, **kwargs +) -> None: + """ + Reminds the person who applied to participate in the event + that the event will start soon. + """ + subject = "Напоминание о предстоящем мероприятии" + message = render_to_string( + "remind_by_email.html", + {"first_name": first_name, "event": event, "date": date, "time": time}, + ) + send_mail(subject, message, from_email=None, recipient_list=[to_email]) diff --git a/src/events/serializers.py b/src/events/serializers.py index e639600..40f7e84 100644 --- a/src/events/serializers.py +++ b/src/events/serializers.py @@ -152,7 +152,6 @@ class EventListSerializer(serializers.ModelSerializer): submitted_applications = serializers.SerializerMethodField() first_speaker = serializers.SerializerMethodField() image = Base64ImageField() - status = serializers.CharField(source="get_status_display") format = serializers.CharField(source="get_format_display") class Meta: @@ -237,6 +236,8 @@ class EventDetailSerializer(EventListSerializer): event_parts = EventPartSerializer(many=True, source="parts") image = Base64ImageField() + status = serializers.CharField(source="get_status_display") + format = serializers.CharField(source="get_format_display") class Meta(EventListSerializer.Meta): fields = [ diff --git a/src/templates/remind_by_email.html b/src/templates/remind_by_email.html new file mode 100644 index 0000000..2de4909 --- /dev/null +++ b/src/templates/remind_by_email.html @@ -0,0 +1,10 @@ +{% autoescape off %} +Здравствуйте, {{ first_name }}! + +Напоминаем вам, что мероприятие {{ event }}, на участие в котором вы ранее подавали +заявку через https://hackathon-funtech.sytes.net/, начнется {{ date }} в {{ time }} +по московскому времени. + +С уважением, +Funtech. +{% endautoescape %} diff --git a/src/templates/submit_application.html b/src/templates/submit_application.html index 28577a5..3328e58 100644 --- a/src/templates/submit_application.html +++ b/src/templates/submit_application.html @@ -5,5 +5,5 @@ Ответим вам в ближайшее время. С уважением, -Ваш Funtech. +Funtech. {% endautoescape %} \ No newline at end of file