From 1a2ab5ddb88c2e68d441925c32184dd58c751d85 Mon Sep 17 00:00:00 2001
From: "Tibor Bossanyi (Freelancer)" <tibor.bossanyi@delti.com>
Date: Sun, 3 Oct 2021 07:51:51 +0200
Subject: [PATCH] BO 1.30.15 double Notification class name

---
 aitrainer_backoffice/aitrainer_backoffice/settings/dev.py   | 1 +
 aitrainer_backoffice/controlling/admin/customer.py          | 4 ++--
 aitrainer_backoffice/controlling/automation/notification.py | 6 +++---
 aitrainer_backoffice/controlling/cron/cron.py               | 4 ++--
 aitrainer_backoffice/cron.txt                               | 1 -
 5 files changed, 8 insertions(+), 8 deletions(-)
 delete mode 100644 aitrainer_backoffice/cron.txt

diff --git a/aitrainer_backoffice/aitrainer_backoffice/settings/dev.py b/aitrainer_backoffice/aitrainer_backoffice/settings/dev.py
index ff5c815..2fe18ae 100644
--- a/aitrainer_backoffice/aitrainer_backoffice/settings/dev.py
+++ b/aitrainer_backoffice/aitrainer_backoffice/settings/dev.py
@@ -17,6 +17,7 @@ DEBUG = True
 
 env = os.environ['GOOGLE_APPLICATION_CREDENTIALS']
 FIREBASE_APP = initialize_app()
+DEFAULT_AUTO_FIELD='django.db.models.AutoField'
 
 INSTALLED_APPS = [
     'aitrainer_backoffice',
diff --git a/aitrainer_backoffice/controlling/admin/customer.py b/aitrainer_backoffice/controlling/admin/customer.py
index 5dca311..a8aa9f9 100644
--- a/aitrainer_backoffice/controlling/admin/customer.py
+++ b/aitrainer_backoffice/controlling/admin/customer.py
@@ -17,7 +17,7 @@ else:
     from aitrainer_backoffice.models.sports import Sport
     from aitrainer_backoffice.models.customer import Customer
 
-from ..automation.notification import Notification
+from ..automation.notification import NotificationExec
 
 class SportFilter(SimpleListFilter, ABC):
     title = "Sport"
@@ -37,7 +37,7 @@ class SportFilter(SimpleListFilter, ABC):
 
 
 class CustomerAdmin(admin.ModelAdmin):
-    notif = Notification()
+    notif = NotificationExec()
 
     change_list_template = "controlling/mautic.html"
     list_display = ('customer_id', 'name','firstname', 'email', 'date_add', 'get_sport')
diff --git a/aitrainer_backoffice/controlling/automation/notification.py b/aitrainer_backoffice/controlling/automation/notification.py
index 4a7ab2f..b478ded 100644
--- a/aitrainer_backoffice/controlling/automation/notification.py
+++ b/aitrainer_backoffice/controlling/automation/notification.py
@@ -12,7 +12,7 @@ else:
 from .fcm import FCM
 import traceback
 
-class Notification:
+class NotificationExec:
     fcm = None
     def __init__(self) -> None: 
         if self.fcm == None:       
@@ -21,7 +21,7 @@ class Notification:
     def run(self):  
         print("** Running Notification automation")
         notification_queryset = Notification.objects.using('live').raw('SELECT * from notification WHERE active = 1')
-        
+
         for notification in notification_queryset:
             if notification.schedule_date != None:
                 pass
@@ -57,4 +57,4 @@ class Notification:
         history.notification_date = datetime.datetime.now(tz=cet)
         history.save()
         print(f'-- Notification History "{history}" has been saved')
-            
+
diff --git a/aitrainer_backoffice/controlling/cron/cron.py b/aitrainer_backoffice/controlling/cron/cron.py
index 15049d2..c10274f 100644
--- a/aitrainer_backoffice/controlling/cron/cron.py
+++ b/aitrainer_backoffice/controlling/cron/cron.py
@@ -1,4 +1,4 @@
-from ..automation.notification import Notification
+from ..automation.notification import NotificationExec
 from django_cron import CronJobBase, Schedule
 import datetime
 
@@ -14,7 +14,7 @@ class MyCronJob(CronJobBase):
 
 
 class NotificationJob(CronJobBase):
-    notif = Notification()
+    notif = NotificationExec()
     RUN_EVERY_MINS = 5
     schedule = Schedule(run_every_mins=RUN_EVERY_MINS)
     code = 'aitrainer_backoffice.controlling.notification'    # a unique code
diff --git a/aitrainer_backoffice/cron.txt b/aitrainer_backoffice/cron.txt
deleted file mode 100644
index 18f3392..0000000
--- a/aitrainer_backoffice/cron.txt
+++ /dev/null
@@ -1 +0,0 @@
-*/5 * * * * python /aitrainer_backoffice/aitrainer_backoffice/manage.py runcrons > /var/log/cronjob.log
\ No newline at end of file