(CON-328-story): add organizer_email and room_id

  - ensure the returned url is comprised with the organizer_email and room_id

[Delivers CON-328]

Author: MCFrank16

alembic/versions/859f31384fe2_add_organizer_email_field.py

@@ -0,0 +1,25 @@
+"""add organizer email field
+
+Revision ID: 859f31384fe2
+Revises: c058d462a21d
+Create Date: 2019-11-18 09:26:07.682060
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '859f31384fe2'
+down_revision = 'c058d462a21d'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    op.add_column('events', sa.Column(
+        'organizer_email', sa.String(), nullable=True))
+
+
+def downgrade():
+    op.drop_column('events', 'organizer_email')

api/events/models.py

@@ -29,6 +29,7 @@ class Events(Base, Utility):
     meeting_end_time = Column(String, nullable=True)
     auto_cancelled = Column(Boolean, nullable=True, default=False)
     app_booking = Column(Boolean, nullable=True, default=False)
+    organizer_email = Column(String, nullable=True)
 
 
 def filter_events_by_date_range(query, start_date, end_date):

api/events/schema.py

@@ -43,6 +43,18 @@ class Meta:
         model = EventsModel
 
 
+class EventArguments(graphene.ObjectType):
+
+    """
+    returns common event arguments
+    """
+
+    calendar_id = graphene.String(required=True)
+    event_id = graphene.String(required=True)
+    start_time = graphene.String(required=True)
+    end_time = graphene.String(required=True)
+
+
 class BookEvent(graphene.Mutation):
     """
         Book Calendar events
@@ -74,8 +86,8 @@ def mutate(self, info, **kwargs):
             description: Any additional information about the event
             room: The meeting room where the even will be held [required]
             time_zone: The timezone of the event location eg. 'Africa/Kigali'
-            organizer: The email of the co-organizer, the converge email is
-            the default
+            organizer: The email of the organizer. it should be gotten
+            from the user token.
 
         Returns:
             A string that communicates a successfully created event.
@@ -119,8 +131,23 @@ def mutate(self, info, **kwargs):
             }
         }
         service = credentials.set_api_credentials()
-        service.events().insert(calendarId='primary', body=event,
-                                sendNotifications=True).execute()
+        event_created = service.events() \
+            .insert(calendarId='primary',
+                    body=event,
+                    sendNotifications=True).execute()
+        new_event = EventsModel(
+            event_id=event_created['id'],
+            event_title=kwargs['event_title'],
+            start_time=start_date,
+            end_time=end_date,
+            number_of_participants=len(guests),
+            app_booking=True,
+            checked_in=False,
+            room_id=1,
+            cancelled=False,
+            organizer_email=organizer
+        )
+        new_event.save()
         return BookEvent(response='Event created successfully')
 
 
@@ -129,11 +156,11 @@ class EventCheckin(graphene.Mutation):
         Returns the eventcheckin payload
     """
     class Arguments:
-        calendar_id = graphene.String(required=True)
-        event_id = graphene.String(required=True)
+        calendar_id = EventArguments.calendar_id
+        event_id = EventArguments.event_id
         event_title = graphene.String(required=True)
-        start_time = graphene.String(required=True)
-        end_time = graphene.String(required=True)
+        start_time = EventArguments.start_time
+        end_time = EventArguments.end_time
         number_of_participants = graphene.Int(required=True)
         check_in_time = graphene.String(required=False)
     event = graphene.Field(Events)
@@ -162,11 +189,11 @@ class CancelEvent(graphene.Mutation):
         Returns the payload on event cancelation
     """
     class Arguments:
-        calendar_id = graphene.String(required=True)
-        event_id = graphene.String(required=True)
+        calendar_id = EventArguments.calendar_id
+        event_id = EventArguments.event_id
         event_title = graphene.String(required=True)
-        start_time = graphene.String(required=True)
-        end_time = graphene.String(required=True)
+        start_time = EventArguments.start_time
+        end_time = EventArguments.end_time
         number_of_participants = graphene.Int()
     event = graphene.Field(Events)
 
@@ -212,10 +239,12 @@ class EndEvent(graphene.Mutation):
     Returns event payload on ending the event
     """
     class Arguments:
-        calendar_id = graphene.String(required=True)
-        event_id = graphene.String(required=True)
-        start_time = graphene.String(required=True)
-        end_time = graphene.String(required=True)
+        calendar_id = EventArguments.calendar_id
+        event_id = EventArguments.event_id
+        organizer_email = graphene.String(required=True)
+        room_id = graphene.String(required=True)
+        start_time = EventArguments.start_time
+        end_time = EventArguments.end_time
         meeting_end_time = graphene.String(required=True)
     event = graphene.Field(Events)
 
@@ -231,7 +260,10 @@ def mutate(self, info, **kwargs):
             )
             event.save()
         event_id = kwargs['event_id']
-        notify_slack.delay(event_id)
+        organizer_email = kwargs['organizer_email']
+        room_id = kwargs['room_id']
+
+        notify_slack.delay(event_id, organizer_email, room_id)
         return EndEvent(event=event)
 
 

fixtures/events/end_event_fixtures.py

@@ -1,6 +1,8 @@
 end_event_mutation = '''mutation {
     endEvent(calendarId:"[email protected]",
             eventId:"test_id5",
+            organizerEmail:"[email protected]",
+            roomId:"1",
             startTime:"2018-07-10T09:00:00Z",
             endTime:"2018-07-10T09:45:00Z",
             meetingEndTime: "2018-07-10T09:45:00Z"){
@@ -43,6 +45,8 @@
     endEvent(calendarId:"[email protected]",
             eventId:"test_id5",
             startTime:"2018-07-11T09:00:00Z",
+            organizerEmail:"[email protected]",
+            roomId:"1",
             endTime:"2018-07-11T09:45:00Z",
             meetingEndTime: "2018-07-11T09:45:00Z"){
             event{
@@ -69,6 +73,8 @@
     endEvent(calendarId:"invalid_calendar_id",
             eventId:"test_id5",
             startTime:"2018-08-11T09:00:00Z",
+            organizerEmail:"[email protected]",
+            roomId:"1",
             endTime:"2018-08-11T09:45:00Z",
             meetingEndTime: "2018-08-11T09:45:00Z"){
             event{

helpers/calendar/events.py

@@ -189,6 +189,7 @@ def sync_single_room_events(self, room):
                         recurring_event_id=event.get("recurringEventId"),
                         room_id=room.id,
                         event_title=event.get("summary"),
+                        organizer_email=organizer.get('email'),
                         start_time=event["start"].get(
                             "dateTime") or event["start"].get("date"),
                         end_time=event["end"].get(

helpers/event/slack_notifier.py

@@ -2,12 +2,17 @@
 import celery
 from config import Config
 
-"""
-This function call slack bot url
-"""
-
 
 @celery.task(name="notify-slack")
-def notify_slack(event_id):
-    responce = requests.get(url=Config.NOTIFY_URL + event_id)
-    return(responce.status_code)
+def notify_slack(event_id, organizer_email, room_id):
+    """
+    This function calls the slack BOT URL
+    and notifies the organizer.
+    """
+    params_data = {
+        "event_id": event_id,
+        "organizer_email": organizer_email,
+        "room_id": room_id
+    }
+    response = requests.get(url=Config.NOTIFY_URL, params=params_data)
+    return(response.status_code)

requirements.txt

@@ -39,3 +39,62 @@ flake8==3.5.0
 coveralls
 validators==0.12.4
 requests==2.22.0
+alembic==0.9.8
+amqp==1.4.9
+aniso8601==3.0.2
+anyjson==0.3.3
+astroid==2.3.1
+autopep8==1.4.4
+billiard==3.3.0.23
+blinker==1.4
+bugsnag==3.4.2
+celery==3.1.17
+Click==7.0
+coverage==4.5.1
+Flask==0.12.2
+Flask-Cors==3.0.4
+Flask-GraphQL==1.4.1
+Flask-JSON==0.3.2
+Flask-Mail==0.9.1
+Flask-Script==2.0.6
+google-api-python-client==1.6.7
+graphene==2.1
+graphene-sqlalchemy==2.0.0
+graphql-core==2.2.1
+graphql-relay==0.4.5
+httplib2==0.14.0
+imgkit==1.0.1
+iso8601==0.1.12
+isort==4.3.21
+itsdangerous==1.1.0
+Jinja2==2.10.1
+kombu==3.0.37
+lazy-object-proxy==1.4.2
+Mako==1.1.0
+MarkupSafe==1.0
+mccabe==0.6.1
+more-itertools==4.1.0
+numpy==1.15.2
+oauth2client==4.1.3
+opencv-python==3.4.3.18
+pandas==0.23.4
+pdfkit==0.6.1
+Pillow==5.3.0
+promise==2.2.1
+pyasn1==0.4.7
+pyasn1-modules==0.2.6
+pycodestyle==2.5.0
+pylint==2.4.2
+python-dateutil==2.7.0
+python-editor==1.0.3
+pytz==2019.2
+rsa==4.0
+Rx==1.6.1
+singledispatch==3.4.0.3
+six==1.12.0
+SQLAlchemy==1.2.6
+typed-ast==1.4.0
+uritemplate==3.0.0
+WebOb==1.8.5
+Werkzeug==0.16.0
+wrapt==1.11.2

tests/base.py

@@ -142,6 +142,7 @@ def setUp(self, mock_verify_calendar_id):
                 event_id="test_id5",
                 room_id=1,
                 event_title="Onboarding",
+                organizer_email="[email protected]",
                 start_time="2018-07-11T09:00:00Z",
                 end_time="2018-07-11T09:45:00Z",
                 number_of_participants=4,
@@ -211,18 +212,18 @@ def setUp(self, mock_verify_calendar_id):
             )
             structure.save()
             parent_node = OfficeStructure(
-                 id='C56A4180-65AA-42EC-A945-5FD21DEC0518',
-                 name='Epic Tower',
-                 tag='Lagos Building',
-                 location_id=1
+                id='C56A4180-65AA-42EC-A945-5FD21DEC0518',
+                name='Epic Tower',
+                tag='Lagos Building',
+                location_id=1
             )
             parent_node.save()
             child_node = OfficeStructure(
-                 id='C56A4180-65AA-42EC-A945-5FD21DEC0519',
-                 name='Gold Coast',
-                 tag='First Floor',
-                 parent_id='C56A4180-65AA-42EC-A945-5FD21DEC0518',
-                 location_id=1
+                id='C56A4180-65AA-42EC-A945-5FD21DEC0519',
+                name='Gold Coast',
+                tag='First Floor',
+                parent_id='C56A4180-65AA-42EC-A945-5FD21DEC0518',
+                location_id=1
             )
             child_node.save()
             db_session.commit()

tests/test_events/test_end_event.py

@@ -1,5 +1,5 @@
 from tests.base import BaseTestCase, CommonTestCases
-from unittest.mock import Mock, patch
+from unittest.mock import patch
 
 from fixtures.events.end_event_fixtures import (
     end_event_mutation,

tests/test_events/test_slack_notifier.py

@@ -1,5 +1,5 @@
 import unittest
-from unittest.mock import Mock, patch
+from unittest.mock import patch
 from helpers.event.slack_notifier import notify_slack
 
 
@@ -11,5 +11,5 @@ def test_slack_notifier(self, mock_get_request):
         Test to verify that a request is made when
         an event ends
         """
-        notify_slack('event_id')
+        notify_slack('event_id', '[email protected]', '18')
         mock_get_request.assert_called_once()