update admin_notifications setup

Author: codinger41

.circleci/config.yml

@@ -191,7 +191,7 @@ jobs:
             ./cc-test-reporter before-build
             . venv/bin/activate
             coverage combine parallel-coverage/ 
-            coverage xml
+            coverage xml -i
             coverage report
             ./cc-test-reporter format-coverage -o ./.coverage -t coverage.py
             ./cc-test-reporter upload-coverage -i .coverage

.codeclimate.yml

@@ -2,4 +2,7 @@ version: "2"
 exclude_patterns:
   - "helpers/auth/authentication.py"
   - "helpers/calendar/events.py"
-  - "alembic/"
+  - "alembic/"
+  - "admin_notifications/__init__.py"
+  - "admin_notifications/helpers/__init__.py"
+  - "admin_notifications/helpers/notification_templates.py"

admin_notifications/helpers/create_notification.py

@@ -1,24 +1,34 @@
-from flask_socketio import send
 from admin_notifications.models import AdminNotification
-from manage import socketio
-
-def create_notification(title, message, location_id):
-  notification = AdminNotification(
-    title=title,
-    message=message,
-    location_id=location_id,
-    status="unread"
-  )
-  notification.save()
-  
-  @socketio.on('notification')
-  def send_notification():
-    notification = { "title": title, "message": message }
-    return send(notification, broadcast=True)
+from api.location.models import Location
+from datetime import datetime
+import celery
 
 
+def update_notification(notification_id):
+    notification = AdminNotification.query.filter_by(id=notification_id).first()
+    notification.date_received = datetime.now()
+    notification.save()
 
 
-
-def create_notif_lol():
-  return create_notification(title="twre3r", message="rerf3ef3rf3rf", location_id=1)
+@celery.task
+def create_notification(title, message, location_id):
+    """
+    Create notifications in the database and emit them to the client
+    """
+    from manage import socketio
+    location = Location.query.filter_by(id=location_id).first()
+    location_name = location.name
+    notification = AdminNotification(
+        title=title,
+        message=message,
+        location_id=location_id,
+        status="unread"
+    )
+    notification.save()
+    new_notification = {"title": title, "message": message}
+    return socketio.emit(
+            f"notifications-{location_name}",
+            {'notification': new_notification},
+            broadcast=True,
+            callback=update_notification(notification.id)
+        )

admin_notifications/helpers/device_last_seen.py

@@ -0,0 +1,6 @@
+def event_auto_cancelled_notification(event_name, room_name):
+    return {
+        "title": "Event Auto cancelled.",
+        "message": f"An event {event_name} in {room_name} \
+has been auto cancelled."
+    }

admin_notifications/helpers/notification_templates.py

@@ -15,4 +15,5 @@ class AdminNotification(Base, Utility):
     location_id = Column(
         Integer,
         ForeignKey('locations.id', ondelete="CASCADE"),
-        nullable=True)
+        nullable=True
+    )

admin_notifications/helpers/queue_manager.py

@@ -0,0 +1,67 @@
+import graphene
+from graphene_sqlalchemy import SQLAlchemyObjectType
+from graphql import GraphQLError
+from helpers.auth.authentication import Auth
+from datetime import datetime
+from admin_notifications.models import AdminNotification as \
+    AdminNotificationModel
+
+
+class AdminNotifications(SQLAlchemyObjectType):
+    """
+        Returns the admin_notificationspayload
+    """
+    class Meta:
+        model = AdminNotificationModel
+
+
+class NotificationsList(graphene.ObjectType):
+    """
+        Class to return the types for Admin notifications
+        \n- rooms: The rooms data
+    """
+    notifications = graphene.List(AdminNotifications)
+
+
+class Query(graphene.ObjectType):
+    all_unread_notifications = graphene.Field(
+        NotificationsList,
+        description="Returns a list of admin notifications"
+    )
+
+    @Auth.user_roles('Admin')
+    def resolve_all_unread_notifications(self, info):
+        query = AdminNotifications.get_query(info)
+        notifications = query.filter(
+            AdminNotificationModel.status == "unread").all()
+        return NotificationsList(notifications=notifications)
+
+
+class UpdateNotificationStatus(graphene.Mutation):
+    """
+        Class to update the status of a notification
+    """
+
+    class Arguments:
+        notification_id = graphene.Int(required=True)
+    notification = graphene.Field(AdminNotifications)
+
+    @Auth.user_roles('Admin')
+    def mutate(self, info, notification_id):
+        query = AdminNotifications.get_query(info)
+        unread_notifications = query.filter(
+            AdminNotificationModel.status == "unread")
+        notification = unread_notifications.filter(
+            AdminNotificationModel.id == notification_id).first()
+        if not notification:
+            raise GraphQLError("Notification is already read or not found.")
+        notification.status = "read"
+        notification.date_read = datetime.now()
+        notification.save()
+        return UpdateNotificationStatus(notification=notification)
+
+
+class Mutation(graphene.ObjectType):
+    update_notification_status = UpdateNotificationStatus.Field(
+        description="Updates the status of a notification and takes the argument\
+            \n- notification_id: The name of the room[required]")

admin_notifications/models.py

@@ -0,0 +1,28 @@
+"""Add CheckOptions column to Questions table
+
+Revision ID: 50173cb0491f
+Revises: ac2686b45596
+Create Date: 2019-05-07 14:47:01.869751
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = '50173cb0491f'
+down_revision = 'a5a4841351d7'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('questions', sa.Column('check_options', postgresql.ARRAY(sa.String()), nullable=True))
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('questions', 'check_options')
+    # ### end Alembic commands ###

admin_notifications/schema.py

@@ -23,9 +23,10 @@ def upgrade():
         'check', 'text_area', 'rate', name='questiontype')
     questiontype.create(op.get_bind())
     op.add_column('responses', sa.Column('question_type', sa.Enum(
-        'rate', 'check', 'text_area', name='questiontype'), nullable=True))
+        'rate', 'check', 'text_area', 'missing_items', name='questiontype'),
+         nullable=True))
     op.add_column('responses', sa.Column(
-        'response', sa.String(), nullable=True))
+        'response', postgresql.ARRAY(sa.String()), nullable=True))
     op.drop_column('responses', 'text_area')
     op.drop_column('responses', 'check')
     op.drop_column('responses', 'rate')

admin_notifications/socket_handler.py

@@ -0,0 +1,39 @@
+"""add admin notifications table
+
+Revision ID: f0873fb8edb3
+Revises: 50173cb0491f
+Create Date: 2019-06-27 13:31:19.694650
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'f0873fb8edb3'
+down_revision = '50173cb0491f'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.execute('DROP TYPE statustype;')
+    op.create_table('admin_notifications',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('title', sa.String(), nullable=True),
+    sa.Column('message', sa.String(), nullable=True),
+    sa.Column('date_received', sa.String(), nullable=True),
+    sa.Column('date_read', sa.String(), nullable=True),
+    sa.Column('status', sa.Enum('read', 'unread', name='statustype'), nullable=True),
+    sa.Column('location_id', sa.Integer(), nullable=True),
+    sa.ForeignKeyConstraint(['location_id'], ['locations.id'], ondelete='CASCADE'),
+    sa.PrimaryKeyConstraint('id')
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table('admin_notifications')
+    # ### end Alembic commands ###

alembic/versions/1b53553ddacf_add_activity_column_to_devices_table.py

@@ -4,7 +4,7 @@
 
 from helpers.database import Base
 from utilities.validations import validate_empty_fields
-from utilities.utility import Utility, ActivityType
+from utilities.utility import Utility
 
 
 class Devices(Base, Utility):
@@ -17,7 +17,6 @@ class Devices(Base, Utility):
     location = Column(String, nullable=False)
     room_id = Column(Integer, ForeignKey('rooms.id', ondelete="CASCADE"))
     room = relationship('Room')
-    activity = Column(Enum(ActivityType), default="active")
 
     def __init__(self, **kwargs):
         validate_empty_fields(**kwargs)

alembic/versions/50173cb0491_add_check_options_column_to_questions_table.py

@@ -1,6 +1,6 @@
 from sqlalchemy import (Column, String, Integer, Boolean, Enum, Index)
 from sqlalchemy.orm import relationship, validates
-
+from sqlalchemy.dialects import postgresql
 from helpers.database import Base
 from utilities.utility import Utility, StateType
 import api.response.models
@@ -13,6 +13,7 @@ class Question(Base, Utility):
     question_type = Column(String, nullable=False)
     question = Column(String, nullable=False)
     start_date = Column(String, nullable=False)
+    check_options = Column(postgresql.ARRAY(String))
     end_date = Column(String, nullable=False)
     total_views = Column(Integer, default=0)
     response = relationship('Response', cascade="all, delete-orphan")

alembic/versions/a5a4841351d7_refactor_response_model.py

@@ -41,18 +41,27 @@ class Arguments:
         question = graphene.String(required=True)
         start_date = graphene.DateTime(required=True)
         end_date = graphene.DateTime(required=True)
+        check_options = graphene.List(graphene.String, required=False)
     question = graphene.Field(Question)
 
     @Auth.user_roles('Admin')
     def mutate(self, info, **kwargs):
         validate_empty_fields(**kwargs)
         validate_question_type(**kwargs)
         validate_date_time_range(**kwargs)
-        question = QuestionModel(**kwargs)
+        question_type = kwargs['question_type']
+        fields = kwargs
+        if question_type == "check" and not kwargs.get('check_options'):
+            return GraphQLError(
+                "No check options supplied for question type check"
+            )
+        if question_type != "check":
+            fields['check_options'] = None
         payload = {
             'model': QuestionModel, 'field': 'question',
             'value':  kwargs['question']
             }
+        question = QuestionModel(**fields)
         with SaveContextManager(question, 'Question', payload):
             return CreateQuestion(question=question)