(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
@@ -58,6 +70,7 @@ class Arguments:
         organizer = graphene.String(required=False)
         description = graphene.String(required=False)
         room = graphene.String(required=True)
+        room_id = graphene.Int(required=True)
         time_zone = graphene.String(required=True)
 
     @Auth.user_roles('Admin', 'Default User', 'Super Admin')
@@ -73,9 +86,11 @@ def mutate(self, info, **kwargs):
             attendees: A string of emails of the event guests
             description: Any additional information about the event
             room: The meeting room where the even will be held [required]
+            room_id: The id of 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.
@@ -88,12 +103,14 @@ def mutate(self, info, **kwargs):
         organizer = kwargs.get('organizer', None)
 
         event_title = kwargs['event_title']
+        room_id = kwargs['room_id']
         empty_string_checker(event_title)
         empty_string_checker(room)
+        empty_string_checker(room_id)
         empty_string_checker(time_zone)
 
         start_date, end_date = calendar_dates_format(
-            kwargs['start_date'], kwargs['start_time'], duration)
+            kwargs['start_date'], kwargs['start_time'], duration, time_zone)
 
         attendees = attendees.replace(" ", "").split(",")
         guests = []
@@ -119,8 +136,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=room_id,
+            cancelled=False,
+            organizer_email=organizer
+        )
+        new_event.save()
         return BookEvent(response='Event created successfully')
 
 
@@ -129,11 +161,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 +194,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,14 +244,32 @@ 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.Int(required=True)
+        start_time = EventArguments.start_time
+        end_time = EventArguments.end_time
         meeting_end_time = graphene.String(required=True)
     event = graphene.Field(Events)
 
     def mutate(self, info, **kwargs):
+        calendar_id = kwargs['calendar_id']
+        event_id = kwargs['event_id']
+        organizer_email = kwargs['organizer_email']
+        room_id = kwargs['room_id']
+        start_time = kwargs['start_time']
+        end_time = kwargs['end_time']
+        meeting_end_time = kwargs['meeting_end_time']
+
+        empty_string_checker(calendar_id)
+        empty_string_checker(event_id)
+        empty_string_checker(organizer_email)
+        empty_string_checker(room_id)
+        empty_string_checker(start_time)
+        empty_string_checker(end_time)
+        empty_string_checker(meeting_end_time)
+
         room_id, event = check_event_in_db(self, info, "ended", **kwargs)
         if kwargs.get('meeting_end_time'):
             update_device_last_activity(
@@ -230,8 +280,8 @@ def mutate(self, info, **kwargs):
                 meeting_end_time=kwargs['meeting_end_time']
             )
             event.save()
-        event_id = kwargs['event_id']
-        notify_slack.delay(event_id)
+
+        notify_slack.delay(event_id, organizer_email, room_id)
         return EndEvent(event=event)
 
 

fixtures/events/book_event_fixtures.py

@@ -6,7 +6,8 @@
         duration:60
         attendees: "[email protected], [email protected]",
         timeZone: "Africa/Kigali",
-        room:"Yankara"
+        room:"Yankara",
+        roomId:1
     ){
             response
         }
@@ -21,7 +22,8 @@
         duration:60
         attendees: "[email protected], [email protected]",
         timeZone: "Africa/Kigali",
-        room:"Yankara"
+        room:"Yankara",
+        roomId:1
     ){
             response
         }
@@ -36,7 +38,8 @@
         duration:60
         attendees: "[email protected], [email protected]",
         timeZone: "Africa/Kigali",
-        room:""
+        room:"",
+        roomId:1
     ){
             response
         }
@@ -51,7 +54,8 @@
         duration:60
         attendees: "[email protected], [email protected]",
         timeZone: "Africa/Kigali",
-        room:"Yankara"
+        room:"Yankara",
+        roomId:1
     ){
             response
         }
@@ -66,7 +70,8 @@
         duration:60
         attendees: "[email protected], [email protected]",
         timeZone: "Africa/Kigali",
-        room:"Yankara"
+        room:"Yankara",
+        roomId:1
     ){
             response
         }
@@ -81,7 +86,8 @@
         duration:60
         attendees: "[email protected], [email protected]",
         timeZone: "",
-        room:"Yankara"
+        room:"Yankara",
+        roomId:1
     ){
             response
         }

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)

helpers/events_filter/events_filter.py

@@ -6,6 +6,7 @@
 
 
 utc = pytz.utc
+timezone = pytz.timezone
 
 
 def validate_date_input(start_date, end_date):
@@ -97,14 +98,15 @@ def date_time_format_validator(date_text, time_text):
         raise ValueError("start time should be in this format: 'HH:MM'")
 
 
-def calendar_dates_format(start_date, start_time, duration):
+def calendar_dates_format(start_date, start_time, duration, time_zone):
     """Converts user date, time and duration input into start_date
         and end_date format that is acceptable by the Google Calendar API
 
     Args:
         start_date: Date string of the day of the event
         start_time: Time sting of the time of the event
         duration: A float of the duration of the event
+        time_zone: The timezone of the event location eg. 'Africa/Kigali'
 
     Returns:
         start_date and end_date in this format "%Y-%m-%dT%H:%M:%S".
@@ -121,7 +123,7 @@ def calendar_dates_format(start_date, start_time, duration):
 
     end_date = start_date + timedelta(minutes=duration)
 
-    start_date = start_date.strftime('%Y-%m-%dT%H:%M:%S')
-    end_date = end_date.strftime('%Y-%m-%dT%H:%M:%S')
+    start_date = start_date.replace(tzinfo=timezone(time_zone)).isoformat()
+    end_date = end_date.replace(tzinfo=timezone(time_zone)).isoformat()
 
     return (start_date, end_date)