Changes on server

- bugfixes in gcal callback
- requirements txt

eventplanner_gcal/signals.py

@@ -2,9 +2,11 @@ from django.db.models.signals import post_save,pre_delete
 from django.dispatch import receiver
 from eventplanner.models import Event, EventParticipation
 from django.contrib.auth.models import User
-
-
 import eventplanner_gcal.models
+import logging
+
+logger = logging.getLogger( __name__ )
+
 
 class SignalLock:
     def __init__(self):
@@ -25,10 +27,21 @@ class SignalLock:
 
 signalLock = SignalLock()
 
-@receiver( post_save, sender=User )
-def user_changed( **kwargs ):
+
+def onGoogleCallback():
     if not signalLock.isLocked():
         with signalLock:
+	    logger.info( "Sync back from google" )
+            eventplanner_gcal.models.syncParticipationFromGoogleToLocal()
+
+
+@receiver( post_save, sender=User )
+def user_changed( **kwargs ):
+    logger.info("User info changed")
+    if not signalLock.isLocked():
+        with signalLock:
+            logger.info("Synchronizing with google - user information changed")
+            eventplanner_gcal.models.deleteAllGCalEvents()
             eventplanner_gcal.models.syncGCalEvents()
 
 
@@ -39,10 +52,10 @@ def event_post_save_handler( **kwargs):
             event = kwargs['instance']
             created = kwargs['created']
             if created:
-                print("Creating Gcal event")
+                logger.info("Creating Gcal event")
                 eventplanner_gcal.models.createGCalEvent( event ).execute()
             else:
-                print( "Updating Gcal event")
+                logger.info( "Updating Gcal event")
                 eventplanner_gcal.models.updateGCalEvent( event ).execute()
 
 
@@ -52,7 +65,7 @@ def event_pre_delete_handler( **kwargs):
     if not signalLock.isLocked():
         with signalLock:
             event = kwargs['instance']
-            print ("Deleting GCAL event")
+            logger.info ("Deleting GCAL event")
             eventplanner_gcal.models.deleteGCalEvent( event ).execute()
 
 
@@ -61,7 +74,7 @@ def participation_post_save_handler( **kwargs):
     if not signalLock.isLocked():
         with signalLock:
             participation = kwargs['instance']
-            print("Participation post save -> update gcal")
+            logger.info("Participation post save -> update gcal")
             eventplanner_gcal.models.updateGCalEvent( participation.event ).execute()