From 0894f86a749a23bad17854faf841178056a8ec14 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Thu, 15 Jun 2017 13:16:37 +0200
Subject: [PATCH] hour check added for sending email
---
smash/web/views/kit.py | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/smash/web/views/kit.py b/smash/web/views/kit.py
index 37378013..8179e28a 100644
--- a/smash/web/views/kit.py
+++ b/smash/web/views/kit.py
@@ -139,16 +139,20 @@ class KitRequestEmailSendJob(CronJobBase):
# check if we sent email this day already
date = pytz.utc.localize(now.replace(hour=hour, minute=minute))
# TODO it's a hack assuming that we are in CEST
- date = date - datetime.timedelta(hours=2)
+ date = date - datetime.timedelta(minutes=122)
jobs = CronJobLog.objects.filter(code=KitRequestEmailSendJob.code, message="mail sent", start_time__gte=date)
if jobs.count() == 0:
- if self.match_day_of_week():
- data = get_kit_requests(Worker.objects.create());
- send_mail(data);
- return "mail sent"
+ date = datetime.datetime.now().replace(hour=hour, minute=minute)
+ if datetime.datetime.now() > date:
+ if self.match_day_of_week():
+ data = get_kit_requests(Worker.objects.create());
+ send_mail(data);
+ return "mail sent"
+ else:
+ return "day of week doesn't match"
else:
- return "day of week doesn't match"
+ return "too early"
else:
return "mail already sent"
--
GitLab