From 67ac1e1dddac8c1a1e00771c4303ac5d21901a93 Mon Sep 17 00:00:00 2001 From: "Tibor Bossanyi (Freelancer)" Date: Wed, 1 Dec 2021 20:41:23 +0100 Subject: [PATCH] BO 1.34+4 trial sync --- aitrainer_backoffice/controlling/automation/mautic.py | 8 ++++---- aitrainer_backoffice/controlling/cron/cron.py | 11 ----------- cron.sh | 2 +- 3 files changed, 5 insertions(+), 16 deletions(-) diff --git a/aitrainer_backoffice/controlling/automation/mautic.py b/aitrainer_backoffice/controlling/automation/mautic.py index 0f078e8..4b07505 100644 --- a/aitrainer_backoffice/controlling/automation/mautic.py +++ b/aitrainer_backoffice/controlling/automation/mautic.py @@ -29,7 +29,7 @@ class Mautic: "&mauticform[database_id]=" + str(customer.customer_id) + \ "&mauticform[lang]=" + str(customer.lang) + \ "&mauticform[formId]=7" + \ - "&mauticform[formName]=appdatachange" + "&mauticform[formName]=appdatasync" print(data) @@ -49,7 +49,7 @@ class Mautic: return True def syncTrial(self): - qs = Customer.objects.raw('SELECT * from customer WHERE trial_date is not null and trial_date != "1900-01-01 00:00:00 00:00" and trial_date_sync is null') + qs = Customer.objects.raw('select * FROM customer WHERE trial_date <= NOW() - INTERVAL 10 DAY and trial_date_sync is null') logger = logging.getLogger(__name__) logger.info("Syncronising trial date...") @@ -61,9 +61,9 @@ class Mautic: for customer in qs: data = "mauticform[email]=" + customer.email + \ "&mauticform[database_id]=" + str(customer.customer_id) + \ - "&mauticform[trialdate]=" + str(customer.trial_date) + \ + "&mauticform[trialdate]=1900-01-01" + \ "&mauticform[formId]=7" + \ - "&mauticform[formName]=appdatachange" + "&mauticform[formName]=appdatasync" print(data) diff --git a/aitrainer_backoffice/controlling/cron/cron.py b/aitrainer_backoffice/controlling/cron/cron.py index aafa307..959f367 100644 --- a/aitrainer_backoffice/controlling/cron/cron.py +++ b/aitrainer_backoffice/controlling/cron/cron.py @@ -3,17 +3,6 @@ from ..automation.mautic import Mautic from django_cron import CronJobBase, Schedule import datetime - -class MyCronJob(CronJobBase): - - RUN_EVERY_MINS = 60 - schedule = Schedule(run_every_mins=RUN_EVERY_MINS) - code = 'aitrainer_backoffice.controlling.cron' # a unique code - - def do(self): - print(datetime.datetime.now(), " *** START sync customers ") - - class NotificationJob(CronJobBase): notif = NotificationExec() RUN_EVERY_MINS = 5 diff --git a/cron.sh b/cron.sh index 712c79f..e29cc7a 100644 --- a/cron.sh +++ b/cron.sh @@ -1,2 +1,2 @@ -export $(cat /aitrainer_backoffice.env | xargs) +export $(cat /aitrainer_backoffice/.env | xargs) /usr/local/bin/python /aitrainer_backoffice/aitrainer_backoffice/manage.py runcrons --settings aitrainer_backoffice.settings.deploy >> /var/log/cronjob.log 2>&1 \ No newline at end of file