Merge branch 'product-dev' into 'product-sit'

Product dev

See merge request rms/Backend/api-main-service!944

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/download/accounts/views.py

@@ -22,7 +22,6 @@ class UserDownloadRequest(XLSXFileMixin, ReadOnlyModelViewSet):
     permission_classes = (AllowAny,)
     
     def list(self, request, *args, **kwargs):
-
         user_type = self.request.user.user_type
         company = self.request.user.department.company.code
         department = self.request.user.department.code

app/applicationlayer/management/account/serializer.py

@@ -34,13 +34,13 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer):
     department = serializers.SerializerMethodField()
     company = serializers.SerializerMethodField()
     cms_privilege = serializers.SerializerMethodField()
+    my_successions = serializers.SerializerMethodField()
 
-    
     class Meta:
         model = User
         fields = (
             'id',
-            "cms_privilege",
+            'cms_privilege',
             'code', 'name',
             'username', 'contact_no',
             'image', 'company',
@@ -86,21 +86,36 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer):
 
     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())
+        # 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")
+
+        create_form = AllowedCompany.objects.filter(
+            Q(id_number=user.code) &
+            Q(create_change_request=True)
+        ).count()
+
+        create_template = AllowedCompany.objects.filter(
+            Q(id_number=user.code) &
+            Q(create_change_request_template=True)
+        ).count()
+
+        if create_form >= 1:
+            create_form = 1
+
+        if create_template >= 1:
+            create_template = 1
+
+
+        return {
+            "create_form": create_form,
+            "create_template": create_template
+        }
+
 
-        if test.count() >= 1:
-            return {**test.values("create_form","create_template")[0]}
-        else:
-            return {
-                "create_form": False,
-                "create_template": False
-            }
 
     def get_image(self, user):
         request = self.context.get('request')

app/applicationlayer/utils.py

@@ -4,46 +4,35 @@ 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
+from pusher import Pusher
 import os
 import configparser
 
-
 config = configparser.ConfigParser()
 config_file = os.path.join('./', 'env.ini')
 config.read(config_file)
 
 
 REALTIMESERVER_IP = settings.REALTIMESERVER_IP
-app_id = config['SETTINGS']['app_id'],
-key = config['SETTINGS']['key']
-secret = config['SETTINGS']['secret']
-cluster = config['SETTINGS']['cluster']
-ssl = True if config['SETTINGS']['ssl'] == 1 else False
-cms_notification = config['SETTINGS']['cms_notification']
-
+SSL = False if config['SETTINGS']['SSL'] == 1 else True
 
 def rms_websocket(my_channel, my_event, msg):
     pusher_client = pusher.Pusher(
-        app_id=app_id,
-        key=key,
-        secret=secret,
-        cluster=cluster,
-        ssl=ssl
+        app_id='957253',
+        key='c29a7f6579108991e79e',
+        secret='b3df5d55196b5fbd3eff',
+        cluster='ap1',
+        ssl=True
     )
-
     pusher_client.trigger(
         my_channel, my_event, msg
-        # 'my-channel', 'my-event', {'message': 'hello world'}
     )
 
 
@@ -238,14 +227,8 @@ def notification_create(form_code, message, account_no,
         
         ROOM = account_no
         # SENDER = sender_account_no
-        
-        # send_broadcast_message(
-        #     ROOM,
-        #     SENDER,
-        #     'NEW NOTIFICATIONS'
-        # )
 
-        if ssl != 1:
+        if SSL != True:
             send_broadcast_message(
                 ROOM,
                 SENDER,
@@ -254,7 +237,8 @@ def notification_create(form_code, message, account_no,
         else:
             rms_websocket(
                 ROOM,
-                'NEW NOTIFICATIONS'
+                'cms-notification',
+                {'message': 'NEW NOTIFICATIONS'}
             )
 
         return True