From: Matthew Vernon <mv3@sanger.ac.uk>
Date: Fri, 19 Oct 2018 16:53:17 +0000 (+0100)
Subject: Update changekey of master event after adjusting instances
X-Git-Tag: v0.1~11
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~matthewv/git?p=gooswapper;a=commitdiff_plain;h=2b80433e6fa6afb092d28241cf576d0ccd853ce2

Update changekey of master event after adjusting instances

Changing the instances (e.g. by adding a gcal_link) updates the
changekey of the master instance. So we need to reflect this in our
cache.
---

diff --git a/gooswapper.py b/gooswapper.py
index dac4263..8009a97 100644
--- a/gooswapper.py
+++ b/gooswapper.py
@@ -246,11 +246,13 @@ def add_ex_to_gcal(ex_acct,
                                            body=gevent).execute()
         event.gcal_link = gevent.get("id")
         event.save(update_fields=["gcal_link"])
-        events[event.item_id] = events[event.item_id]._replace(changekey=event.changekey,gcal_link=event.gcal_link)
         if event.type=="RecurringMaster" and (event.deleted_occurrences or \
                                               event.modified_occurrences):
             modify_recurring(ex_acct,gcal_acct,gcal_tz,
                              events,event,gcal_id)
+            #changekey is updated by the above
+            event.refresh()
+        events[event.item_id] = events[event.item_id]._replace(changekey=event.changekey,gcal_link=event.gcal_link)
         
 def del_ex_to_gcal(ex_acct, gcal_acct, events, deleted, gcal_id="primary"):
     for ev_id in deleted: