From e29ad46e7bca1998db1e90e0247965ea2e62b3f7 Mon Sep 17 00:00:00 2001
From: "Tibor Bossanyi (Freelancer)" <tibor.bossanyi@delti.com>
Date: Sat, 2 Oct 2021 19:24:22 +0200
Subject: [PATCH] V1.30.10 setting mode

---
 Dockerfile                                           |  3 +++
 .../controlling/automation/notification.py           |  9 +++++++--
 aitrainer_backoffice/controlling/models/customer.py  | 12 ++++++++++--
 .../controlling/models/notification.py               | 11 ++++++++++-
 docker-compose.yml                                   |  1 +
 5 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ac49646..4c14836 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,6 +24,9 @@ COPY uwsgi_params /var/www/aitrainer.info/
 COPY .key ./
 ENV DJANGO_KEY="9ö2345iőjfdsasd9ukjhlkdf9hg"
 ENV GOOGLE_APPLICATION_CREDENTIALS=/aitrainer_backoffice/aitrainer_backoffice/aitrainer_backoffice/asset/aitrainer-firebase-adminsdk.json
+ENV WORKOUTTEST_SETTING="DEPLOY"
 
 ENV PORT=8000
 EXPOSE 8000
+
+ENTRYPOINT cron start && tail -f /var/log/cron.log
diff --git a/aitrainer_backoffice/controlling/automation/notification.py b/aitrainer_backoffice/controlling/automation/notification.py
index 8a2fa8b..b797d11 100644
--- a/aitrainer_backoffice/controlling/automation/notification.py
+++ b/aitrainer_backoffice/controlling/automation/notification.py
@@ -1,6 +1,10 @@
 import datetime
+import pytz
 from .notification_hook import NotificationHook
-from ..models import notification as notif
+
+from aitrainer_backoffice.aitrainer_backoffice.models import notification as notif    
+
+
 from ..models.notification import NotificationHistory
 from .fcm import FCM
 import traceback
@@ -43,6 +47,7 @@ class Notification:
         history.notification = notification
         history.customer = customer
         history.response = rc
-        history.notification_date = datetime.datetime.now()
+        cet = pytz.timezone('Europe/Budapest')
+        history.notification_date = datetime.datetime.now(tz=cet)
         history.save()
         print(f'-- Notification History "{history}" has been saved')
diff --git a/aitrainer_backoffice/controlling/models/customer.py b/aitrainer_backoffice/controlling/models/customer.py
index b6c4d72..98500a0 100644
--- a/aitrainer_backoffice/controlling/models/customer.py
+++ b/aitrainer_backoffice/controlling/models/customer.py
@@ -1,14 +1,22 @@
+import os
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
-#from aitrainer_backoffice.models.sports import Sport
 
+SETTING = os.environ['WORKOUTTEST_SETTING']
+if SETTING == "PROD" :
+    from aitrainer_backoffice.aitrainer_backoffice.models.sports import Sport
+else:    
+    from aitrainer_backoffice.models.sports import Sport
+
+'''
 class Sport(models.Model):
     sport_id = models.AutoField(primary_key=True)
     name = models.CharField(max_length=200, help_text='Unique name',
                             verbose_name=_("name"))
 
     class Meta:
-        db_table = 'sport'                        
+        db_table = 'sport'      
+'''                          
 
 class Customer(models.Model):
     customer_id = models.BigAutoField(primary_key=True)
diff --git a/aitrainer_backoffice/controlling/models/notification.py b/aitrainer_backoffice/controlling/models/notification.py
index a8284f2..aa7fb45 100644
--- a/aitrainer_backoffice/controlling/models/notification.py
+++ b/aitrainer_backoffice/controlling/models/notification.py
@@ -1,9 +1,16 @@
+import os
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 
-#from aitrainer_backoffice.models.notification import Notification
+SETTING = os.environ['WORKOUTTEST_SETTING']
+if SETTING == "PROD":
+    from aitrainer_backoffice.aitrainer_backoffice.models.notification import Notification
+else:    
+    from aitrainer_backoffice.models.notification import Notification
+
 from ..models import Customer
 
+'''
 class Notification(models.Model):
     notification_id = models.AutoField(primary_key=True)
     message_title = models.CharField(max_length=50)
@@ -23,6 +30,8 @@ class Notification(models.Model):
 
     def __str__(self):
         return self.internal_name 
+        
+'''
 
 class NotificationHistory(models.Model):
     notification_history_id = models.AutoField(primary_key=True)
diff --git a/docker-compose.yml b/docker-compose.yml
index 8ea78e4..d115a1d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,6 +17,7 @@ services:
         - "8002:8000"
       environment:
         - GOOGLE_APPLICATION_CREDENTIALS=/aitrainer_backoffice/aitrainer_backoffice/aitrainer_backoffice/asset/aitrainer-firebase-adminsdk.json
+        - WORKOUTTEST_SETTING="PROD"
       command: gunicorn aitrainer_backoffice.aitrainer_backoffice.wsgi --env DJANGO_SETTINGS_MODULE=aitrainer_backoffice.aitrainer_backoffice.settings.prod --bind 0.0.0.0:8000 --workers 3
 
   mysql-server: