add new key for cms privilege

app/applicationlayer/cms/form/onbehalf/views.py

@@ -7,8 +7,7 @@ from rest_framework import status, views
 
 from django.db.models import Q
 from app.applicationlayer.utils import (QuerySetHelper,
-                                        status_message_response,
-                                        send_broadcast_message)
+                                        status_message_response)
 from app.businesslayer.changerequest import change_request
 
 from app.entities import enums

app/applicationlayer/management/account/serializer.py

@@ -33,16 +33,14 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer):
     applications = serializers.SerializerMethodField()
     department = serializers.SerializerMethodField()
     company = serializers.SerializerMethodField()
-    create_form = serializers.SerializerMethodField()
-    create_template = serializers.SerializerMethodField()
+    cms_privilege = serializers.SerializerMethodField()
     my_successions = serializers.SerializerMethodField()
 
     class Meta:
         model = User
         fields = (
             'id',
-            'create_form',
-            'create_template',
+            'cms_privilege',
             'code', 'name',
             'username', 'contact_no',
             'image', 'company',
@@ -86,27 +84,18 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer):
         }
         return data
 
-    def get_create_form(self, user):
-        check_user = AllowedCompany.objects.filter(
-            Q(id_number=user.code) &
-            Q(create_change_request=True)
-        ).count()
-        if check_user <= 0:
-            permission = False
-        else:
-            permission = True
-        return permission
-
-    def get_create_template(self, user):
-        check_user = AllowedCompany.objects.filter(
-            Q(id_number=user.code) &
-            Q(create_change_request_template=True)
-        ).count()
-        if check_user <= 0:
-            permission = False
-        else:
-            permission = True
-        return permission
+    def get_cms_privilege(self, user):
+
+        test = AllowedCompany.objects.extra(
+            select={
+                'create_form': "create_change_request=True",
+                'create_template': "create_change_request_template=True",
+            }
+        ).filter(id_number=user.code).values('create_form', "create_template")
+        # print(test.count())
+
+        if test.count() >= 1:
+            return {**test.values("create_form","create_template")[0]}
 
     def get_image(self, user):
         request = self.context.get('request')

app/applicationlayer/utils.py

@@ -4,17 +4,37 @@ from rest_framework.response import Response
 from functools import wraps
 from app.entities import enums
 from app.entities.models import EntityLog, Notification
-
 from django.conf import settings
 from websocket import create_connection
 import json
 from rest_framework import status
-
 from rest_framework import serializers
 import copy
 import json
+import pusher
+
 
 REALTIMESERVER_IP = settings.REALTIMESERVER_IP
+app_id = settings.app_id
+key = settings.key
+secret = settings.secret
+cluster = settings.cluster
+ssl = settings.ssl
+
+
+def rms_websocket(my_channel, my_event, msg):
+    pusher_client = pusher.Pusher(
+        app_id=app_id,
+        key=key,
+        secret=secret,
+        cluster=cluster,
+        ssl=ssl
+    )
+
+    pusher_client.trigger(
+        my_channel, my_event, msg
+        # 'my-channel', 'my-event', {'message': 'hello world'}
+    )
 
 
 def error_message(code, message, status, status_code):
@@ -209,7 +229,7 @@ def notification_create(form_code, message, account_no,
         ROOM = account_no
         SENDER = sender_account_no
         
-        send_broadcast_message(
+        rms_websocket(
             ROOM,
             SENDER,
             'NEW NOTIFICATIONS'

requirements/local.txt

@@ -15,7 +15,7 @@ channels-redis==2.4.0
 chardet==3.0.4
 colorama==0.4.1
 constantly==15.1.0
-cryptography==2.7
+cryptography==2.8
 cssselect2==0.2.2
 daphne==2.3.0
 defusedxml==0.6.0
@@ -40,15 +40,20 @@ Markdown==3.1
 mccabe==0.6.1
 msgpack==0.6.1
 mysqlclient==1.4.2.post1
+ndg-httpsclient==0.5.1
 numpy==1.17.3
 openpyxl==3.0.0
 pandas==0.25.3
 pep8==1.7.1
 Pillow==6.0.0
+pusher==2.1.4
+pyasn1==0.4.8
 pycodestyle==2.5.0
 pycparser==2.19
 PyHamcrest==1.9.0
 pylint==2.3.1
+PyNaCl==1.3.0
+pyOpenSSL==19.1.0
 PyPDF2==1.26.0
 Pyphen==0.9.5
 python-dateutil==2.8.1