From dee9cc153340fc68a059881b1426a3cdea99cb76 Mon Sep 17 00:00:00 2001
From: Albert Sun <Albert.Sun@nytimes.com>
Date: Fri, 7 Jul 2017 16:52:07 -0400
Subject: [PATCH] add a bit of compatibility code for old configs of this agent

---
 .../agents/google_calendar_publish_agent.rb   | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/models/agents/google_calendar_publish_agent.rb b/app/models/agents/google_calendar_publish_agent.rb
index b2b13875..773d741a 100644
--- a/app/models/agents/google_calendar_publish_agent.rb
+++ b/app/models/agents/google_calendar_publish_agent.rb
@@ -29,7 +29,7 @@ module Agents
         "type": "service_account",
         "project_id": "huginn-123123",
         "private_key_id": "6d6b476fc6ccdb31e0f171991e5528bb396ffbe4",
-        "private_key": "-----BEGIN PRIVATE KEY-----\n...\n-----END PRIVATE KEY-----\n",
+        "private_key": "-----BEGIN PRIVATE KEY-----\\n...\\n-----END PRIVATE KEY-----\\n",
         "client_email": "huginn-calendar@huginn-123123.iam.gserviceaccount.com",
         "client_id": "123123...123123",
         "auth_uri": "https://accounts.google.com/o/oauth2/auth",
@@ -39,7 +39,6 @@ module Agents
       }</code></pre>
 
 
-
       Agent Configuration:
 
       `calendar_id` - The id the calendar you want to publish to. Typically your google account email address.  Liquid formatting (e.g. `{{ cal_id }}`) is allowed here in order to extract the calendar_id from the incoming event.
@@ -65,12 +64,10 @@ module Agents
           "summary": "Awesome event",
           "description": "An example event with text. Pro tip: DateTimes are in RFC3339",
           "start": {
-            "date_time": "2017-06-30T17:00:00-05:00",
-            "time_zone": "America/New_York"
+            "date_time": "2017-06-30T17:00:00-05:00"
           },
           "end": {
-            "date_time": "2017-06-30T18:00:00-05:00",
-            "time_zone": "America/New_York"
+            "date_time": "2017-06-30T18:00:00-05:00"
           }
         }
       }</code></pre>
@@ -112,9 +109,17 @@ module Agents
       incoming_events.each do |event|
         calendar = GoogleCalendar.new(interpolate_options(options, event), Rails.logger)
 
+        cal_message = event.payload["message"]
+        if cal_message["start"].present? && cal_message["start"]["dateTime"].present? && !cal_message["start"]["date_time"].present?
+          cal_message["start"]["date_time"] = cal_message["start"].delete "dateTime"
+        end
+        if cal_message["end"].present? && cal_message["end"]["dateTime"].present? && !cal_message["end"]["date_time"].present?
+          cal_message["end"]["date_time"] = cal_message["end"].delete "dateTime"
+        end
+
         calendar_event = calendar.publish_as(
               interpolated(event)['calendar_id'],
-              event.payload["message"]
+              cal_message
             )
 
         create_event :payload => {