Gcal Integration

bot/processors/pennychat.py

@@ -9,7 +9,7 @@
     post_organizer_edit_after_share_blocks,
     share_penny_chat_invitation,
     add_google_meet,
-    add_google_integration_blocks,
+    add_google_integration_blocks, update_google_meet,
 )
 from bot.utils import chat_postEphemeral_with_fallback
 from integrations.google import get_authorization_url
@@ -424,6 +424,8 @@ def submit_details_and_share(self, event):
 
         if not penny_chat_invitation.video_conference_link:
             add_google_meet(penny_chat_invitation.id)
+        else:
+            update_google_meet(penny_chat_invitation.id)
         share_penny_chat_invitation(penny_chat_invitation.id)
 
     @is_block_interaction_event

bot/tasks/pennychat.py

@@ -7,7 +7,6 @@
 from django.conf import settings
 from pytz import timezone, utc
 from sentry_sdk import capture_exception
-from slack.errors import SlackApiError
 
 from common.utils import get_slack_client
 from integrations.google import build_credentials, get_authorization_url, GoogleCalendar
@@ -67,37 +66,57 @@ def post_organizer_edit_after_share_blocks(penny_chat_view_id):
     )
 
 
-@background
-def add_google_meet(penny_chat_id):
-    slack_client = get_slack_client()
-    penny_chat_invitation = PennyChatSlackInvitation.objects.get(id=penny_chat_id)
-    user = None
+def get_user_google_calendar_from_slack_id(slack_id):
+    user = get_or_create_social_profile_from_slack_id(slack_id).user
     try:
-        user = get_or_create_social_profile_from_slack_id(penny_chat_invitation.organizer_slack_id).user
         google_credentials = GoogleCredentials.objects.get(user=user)
     except GoogleCredentials.DoesNotExist:
         authorization_url = get_authorization_url(user)
+        slack_client = get_slack_client()
         slack_client.chat_postMessage(
-            channel=penny_chat_invitation.organizer_slack_id,
+            channel=slack_id,
             blocks=add_google_integration_blocks(authorization_url, from_penny_chat=True),
         )
         return
-    except SlackApiError:
-        return
 
     credentials = build_credentials(google_credentials)
-    calendar = GoogleCalendar(credentials=credentials)
+    return GoogleCalendar(credentials=credentials)
+
+
+@background
+def add_google_meet(penny_chat_id):
+    penny_chat_invitation = PennyChatSlackInvitation.objects.get(id=penny_chat_id)
+
+    calendar = get_user_google_calendar_from_slack_id(penny_chat_invitation.organizer_slack_id)
+
+    if calendar is None:
+        return
 
     meet = calendar.create_event(
         summary=penny_chat_invitation.title,
         description=penny_chat_invitation.description,
         start=penny_chat_invitation.date
     )
 
-    penny_chat_invitation.video_conference_link = meet['hangoutLink']
+    penny_chat_invitation.video_conference_link = meet.get('hangoutLink')
+    penny_chat_invitation.google_event_id = meet.get('id')
     penny_chat_invitation.save()
 
 
+@background
+def update_google_meet(penny_chat_id):
+    penny_chat_invitation = PennyChatSlackInvitation.objects.get(id=penny_chat_id)
+
+    calendar = get_user_google_calendar_from_slack_id(penny_chat_invitation.organizer_slack_id)
+
+    calendar.update_event(
+        event_id=penny_chat_invitation.google_event_id,
+        summary=penny_chat_invitation.title,
+        description=penny_chat_invitation.description,
+        start=penny_chat_invitation.date
+    )
+
+
 @background
 def share_penny_chat_invitation(penny_chat_id):
     """Shares penny chat invitations with people and channels in the invitee list."""
@@ -261,7 +280,7 @@ def _penny_chat_details_blocks(penny_chat_invitation, mode=None):
         start_date = penny_chat_invitation.date.astimezone(utc).strftime('%Y%m%dT%H%M%SZ')
         end_date = (penny_chat_invitation.date.astimezone(utc) + timedelta(hours=1)).strftime('%Y%m%dT%H%M%SZ')
 
-        description = f'{penny_chat_invitation.description} [Video Link]({penny_chat_invitation.video_conference_link})'
+        description = f'{penny_chat_invitation.description}\nVideo Link: {penny_chat_invitation.video_conference_link}'
         google_cal_url = 'https://calendar.google.com/calendar/render?' \
                          'action=TEMPLATE&text=' \
                          f'{urllib.parse.quote(penny_chat_invitation.title)}&dates=' \
@@ -306,27 +325,25 @@ def _penny_chat_details_blocks(penny_chat_invitation, mode=None):
     ]
 
     if penny_chat_invitation.video_conference_link:
-        body.append(
-            {
-                'type': 'section',
-                'text': {
-                    'type': 'mrkdwn',
-                    'text': '*Video Call Link*'
-                }
-            }
-        )
         if mode in {PREVIEW, INVITE, UPDATE}:
             body.append(
                 {
                     'type': 'section',
                     'text': {
                         'type': 'mrkdwn',
-                        'text': 'A video link will be provided shortly before the chat starts'
+                        'text': '_(A video link will be provided shortly before the chat starts)_'
                     }
                 }
             )
         elif mode in {REMIND}:
-            body.append(
+            body += [
+                {
+                    'type': 'section',
+                    'text': {
+                        'type': 'mrkdwn',
+                        'text': '*Video Call Link*'
+                    }
+                },
                 {
                     'type': 'actions',
                     'elements': [
@@ -342,7 +359,7 @@ def _penny_chat_details_blocks(penny_chat_invitation, mode=None):
                         }
                     ]
                 }
-            )
+            ]
 
     if include_rsvp:
         body.append(
@@ -533,7 +550,7 @@ def missing_google_auth_blocks():
 
 
 def add_google_integration_blocks(authorization_url, from_penny_chat=False):
-    pre_add_button_blocks = missing_google_auth_blocks() if from_penny_chat else None
+    pre_add_button_blocks = missing_google_auth_blocks() if from_penny_chat else []
     blocks = pre_add_button_blocks + [
         {
             'type': 'section',

integrations/__init__.py

@@ -0,0 +1 @@
+default_app_config = 'integrations.apps.IntegrationsConfig'

integrations/apps.py

@@ -3,3 +3,6 @@
 
 class IntegrationsConfig(AppConfig):
     name = 'integrations'
+
+    def ready(self):
+        import integrations.signals  # noqa

integrations/google.py

@@ -6,7 +6,6 @@
 from django.utils.http import urlsafe_base64_encode
 from google_auth_oauthlib.flow import Flow
 from googleapiclient.discovery import build
-from googleapiclient.errors import HttpError
 from google.oauth2.credentials import Credentials
 
 from django.conf import settings
@@ -16,10 +15,7 @@ class GoogleCalendar:
     def __init__(self, credentials, calendar_id='primary'):
         self.service = build('calendar', 'v3', credentials=credentials)
         self.calendar_id = calendar_id
-
-    @property
-    def events(self):
-        return self.service.events()
+        self.events = self.service.events()
 
     def add_conference_call_to_event(self, event_id):
         event_patch = {
@@ -39,7 +35,8 @@ def add_conference_call_to_event(self, event_id):
         # Fetch updated event and return it
         return self.events.get(calendarId=self.calendar_id, eventId=event_id).execute()
 
-    def create_event(self, summary, description, start, end=None, with_meet=True):
+    @staticmethod
+    def build_event_data(summary, description, start, end):
         if not end:
             end = start + timedelta(hours=1)
         data = {
@@ -52,16 +49,21 @@ def create_event(self, summary, description, start, end=None, with_meet=True):
                 'dateTime': end.isoformat(),
             }
         }
-        try:
-            event_data = self.events.insert(calendarId='primary', body=data).execute()
+        return data
 
-            if with_meet:
-                event_data = self.add_conference_call_to_event(event_id=event_data['id'])
-        except HttpError as e:
-            print(e)
+    def create_event(self, summary, description, start, end=None, with_meet=True):
+        data = GoogleCalendar.build_event_data(summary, description, start, end)
+        event_data = self.events.insert(calendarId='primary', body=data).execute()
+
+        if with_meet:
+            event_data = self.add_conference_call_to_event(event_id=event_data['id'])
 
         return event_data
 
+    def update_event(self, event_id, summary, description, start, end=None):
+        data = GoogleCalendar.build_event_data(summary, description, start, end)
+        self.events.patch(calendarId='primary', eventId=event_id, body=data).execute()
+
 
 def get_google_flow():
     client_secrets = {

integrations/signals.py

@@ -0,0 +1,18 @@
+from django.db.models.signals import post_save
+from django.dispatch import receiver
+from django.utils import timezone
+
+from bot.tasks import add_google_meet
+from integrations.models import GoogleCredentials
+from pennychat.models import PennyChatSlackInvitation
+
+
+@receiver(post_save, sender=GoogleCredentials)
+def add_google_meet_to_upcoming_chats(sender, **kwargs):
+    credentials = kwargs.get('instance')
+    if credentials:
+        user = credentials.user
+        slack_ids = [profile.slack_id for profile in user.social_profiles.all()]
+        invites = PennyChatSlackInvitation.objects.filter(organizer_slack_id__in=slack_ids, date__gt=timezone.now())
+        for invite in invites:
+            add_google_meet(invite.id)

pennychat/migrations/0005_pennychat_google_event_id.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.2.13 on 2020-11-18 01:20
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pennychat', '0004_pennychat_video_conference_link'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='pennychat',
+            name='google_event_id',
+            field=models.TextField(null=True),
+        ),
+    ]

pennychat/models.py

@@ -35,6 +35,7 @@ class PennyChat(models.Model):
     created_from_slack_team_id = models.CharField(max_length=20, null=True)
     visibility = models.IntegerField(choices=VISIBILITY_CHOICES, default=PUBLIC)
     video_conference_link = models.TextField(null=True)
+    google_event_id = models.TextField(null=True)
 
     # meta
     created = models.DateTimeField(auto_now_add=True)