diff --git a/fet2020/fet2020/settings.py b/fet2020/fet2020/settings.py index 784aef0c..cb400926 100644 --- a/fet2020/fet2020/settings.py +++ b/fet2020/fet2020/settings.py @@ -46,7 +46,6 @@ INSTALLED_APPS = [ "ckeditor_uploader", "easy_thumbnails", "rest_framework", - "django_crontab", "django_filters", "django_static_jquery_ui", "fontawesomefree", @@ -337,12 +336,6 @@ CKEDITOR_CONFIGS = { } -# CRON JOBS -CRONJOBS = [ - ("0 16 * * *", "posts.cronjobs.check_to_send_agenda_mail"), -] - - # ETHERPAD ETHERPAD_HOST = env("ETHERPAD_HOST").strip() if not ETHERPAD_HOST or ETHERPAD_HOST == "": diff --git a/fet2020/posts/cronjobs.py b/fet2020/posts/cronjobs.py deleted file mode 100644 index 15d628d8..00000000 --- a/fet2020/posts/cronjobs.py +++ /dev/null @@ -1,22 +0,0 @@ -# HOW TO ADD CRONJOBS -# write a cronjob function -# add cronjob to fet2020/settings.py -# add cronjob with cmd 'python3 fet2020/manage.py crontab add' -import logging -from datetime import timedelta - -from django.utils import timezone - -from .mails import send_agenda_mail -from .models import FetMeeting - -logger = logging.getLogger(__name__) - - -def check_to_send_agenda_mail(): - agenda_date = timezone.now().date() + timedelta(days=2) - next_meeting = FetMeeting.objects.filter(event_start__date=agenda_date).first() - - if next_meeting and next_meeting.has_agenda: - logger.info("Agenda für die %s soll gesendet werden.", next_meeting.slug) - send_agenda_mail(next_meeting) diff --git a/fet2020/posts/mails.py b/fet2020/posts/mails.py deleted file mode 100644 index 2ae9e5dc..00000000 --- a/fet2020/posts/mails.py +++ /dev/null @@ -1,37 +0,0 @@ -import logging - -from django.conf import settings -from django.core.mail import send_mail -from html2text import html2text - -logger = logging.getLogger(__name__) - - -def send_agenda_mail(meeting): - date = meeting.event_start.date().strftime("%d.%m.%Y") - time = meeting.event_start.time() - agenda = html2text(meeting.agenda_html) - - msg = ( - "Liebe Alle,\n\n" - "wir haben am " + str(date) + " um " + str(time) + " wieder eine FET-Sitzung.\n" - "du hast noch bis morgen " - + str(time) - + " Zeit, weitere Themen auf die Agenda zu schreiben: " - + settings.HOST_NAME - + "/posts/" - + str(meeting.slug) - + ".\n\n" - "Die aktuelle Agenda ist: \n\n" + agenda + "\n\n" - "LG deine FET" - ) - - if send_mail( - subject="Test - Agenda der FET Sitzung von " + str(date), - message=msg, - from_email="service@fet.at", - recipient_list=["patrick@fet.at"], - ): - logger.info("Mail für die Agenda %s wurde gesendet.", meeting.slug) - else: - logger.info("Mail für die Agenda %s wurde nicht gesendet.", meeting.slug)