V1.30.10 setting mode

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

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')

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)

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)

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: