From 70f207209fe257b91bda0e6b0f71a8cb5728ee62 Mon Sep 17 00:00:00 2001
From: "Tibor Bossanyi (Freelancer)" <tibor.bossanyi@delti.com>
Date: Sat, 2 Oct 2021 16:02:34 +0200
Subject: [PATCH] V1.30.9 env settings fixes

---
 Dockerfile                                              | 2 +-
 aitrainer_backoffice/controlling/automation/fcm.py      | 3 +++
 aitrainer_backoffice/controlling/models/notification.py | 2 +-
 docker-compose.yml                                      | 2 ++
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e751144..ac49646 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,7 +23,7 @@ RUN pip install --no-cache-dir -r requirements.txt
 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 GOOGLE_APPLICATION_CREDENTIALS=/aitrainer_backoffice/aitrainer_backoffice/aitrainer_backoffice/asset/aitrainer-firebase-adminsdk.json
 
 ENV PORT=8000
 EXPOSE 8000
diff --git a/aitrainer_backoffice/controlling/automation/fcm.py b/aitrainer_backoffice/controlling/automation/fcm.py
index f6f72d1..5db258a 100644
--- a/aitrainer_backoffice/controlling/automation/fcm.py
+++ b/aitrainer_backoffice/controlling/automation/fcm.py
@@ -1,4 +1,5 @@
 import datetime
+import os
 from firebase_admin import messaging, initialize_app, exceptions
 
 class FCM:
@@ -8,6 +9,8 @@ class FCM:
     def __init__(self):
         # To learn more, visit the docs here:
         # https://cloud.google.com/docs/authentication/getting-started>
+        env = os.environ['GOOGLE_APPLICATION_CREDENTIALS']
+        print(f'ENV: {env}')
         default_app = initialize_app()
 
     def send_to_multiple_token(self, title, body, registration_token, image_url = None):
diff --git a/aitrainer_backoffice/controlling/models/notification.py b/aitrainer_backoffice/controlling/models/notification.py
index 4638029..a8284f2 100644
--- a/aitrainer_backoffice/controlling/models/notification.py
+++ b/aitrainer_backoffice/controlling/models/notification.py
@@ -29,7 +29,7 @@ class NotificationHistory(models.Model):
     notification = models.ForeignKey(Notification, on_delete=models.CASCADE)
     customer = models.ForeignKey(Customer, on_delete=models.CASCADE)    
     response = models.CharField(max_length=255)
-    notification_date = models.DateField(blank=True, null=True)
+    notification_date = models.DateTimeField(blank=True, null=True)
 
     class Meta:
         db_table = 'notification_history'
diff --git a/docker-compose.yml b/docker-compose.yml
index c733ade..8ea78e4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -15,6 +15,8 @@ services:
         - mysql-server
       ports:
         - "8002:8000"
+      environment:
+        - GOOGLE_APPLICATION_CREDENTIALS=/aitrainer_backoffice/aitrainer_backoffice/aitrainer_backoffice/asset/aitrainer-firebase-adminsdk.json
       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: