CON-336-story(activity): implement update device last seen time after end meeting (#504)

- update the device last seen after end meeting
- add a last_activity field in devices table that stores what event logged the last seen update

[Delivers CON-336]

Author: mifeille

alembic/versions/98e4dbfc868a_add_last_activity_to_devices.py

@@ -0,0 +1,24 @@
+"""Add_last_activity_to_devices
+
+Revision ID: 98e4dbfc868a
+Revises: ace641b9b89b
+Create Date: 2019-10-15 09:22:19.847309
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '98e4dbfc868a'
+down_revision = 'ace641b9b89b'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    op.add_column('devices', sa.Column('last_activity', sa.String(), nullable=True))
+
+
+def downgrade():
+    op.drop_column('devices', 'last_activity')

api/devices/models.py

@@ -18,6 +18,7 @@ class Devices(Base, Utility):
     room_id = Column(Integer, ForeignKey('rooms.id', ondelete="CASCADE"))
     room = relationship('Room')
     state = Column(Enum(StateType), nullable=False, default="active")
+    last_activity = Column(String, nullable=True)
 
     def __init__(self, **kwargs):
         validate_empty_fields(**kwargs)

api/events/schema.py

@@ -12,7 +12,7 @@
 from helpers.calendar.credentials import get_single_calendar_event
 from helpers.auth.authentication import Auth
 from helpers.pagination.paginate import ListPaginate
-from helpers.devices.devices import update_device_last_seen
+from helpers.devices.devices import update_device_last_activity
 from helpers.events_filter.events_filter import (
     filter_events_by_date_range,
     validate_page_and_per_page
@@ -46,7 +46,7 @@ class Arguments:
     def mutate(self, info, **kwargs):
         room_id, event = check_event_in_db(self, info, "checked_in", **kwargs)
         if kwargs.get('check_in_time'):
-            update_device_last_seen(info, room_id, kwargs['check_in_time'])
+            update_device_last_activity(info, room_id, kwargs['check_in_time'], 'check in')
         if not event:
             event = EventsModel(
                 event_id=kwargs['event_id'],
@@ -82,7 +82,7 @@ def mutate(self, info, **kwargs):
                     kwargs['start_time']) + timedelta(minutes=10)
         except ValueError:
             raise GraphQLError("Invalid start time")
-        update_device_last_seen(info, room_id, device_last_seen)
+        update_device_last_activity(info, room_id, device_last_seen, 'cancel meeting')
         if not event:
             event = EventsModel(
                 event_id=kwargs['event_id'],
@@ -124,6 +124,8 @@ class Arguments:
 
     def mutate(self, info, **kwargs):
         room_id, event = check_event_in_db(self, info, "ended", **kwargs)
+        if kwargs.get('meeting_end_time'):
+            update_device_last_activity(info, room_id, kwargs['meeting_end_time'], 'end meeting')
         if not event:
             event = EventsModel(
                 event_id=kwargs['event_id'],

helpers/devices/devices.py

@@ -3,12 +3,13 @@
 from api.devices.schema import Devices as DeviceSchema
 
 
-def update_device_last_seen(info, room_id, check_in_time):
+def update_device_last_activity(info, room_id, activity_time, activity):
     device_query = DeviceSchema.get_query(info)
     device = device_query.filter(
                 DeviceModel.room_id == room_id
             ).first()
     if not device:
         raise GraphQLError("Room device not found")
-    device.last_seen = check_in_time
+    device.last_seen = activity_time
+    device.last_activity = activity
     device.save()