Merge pull request #222 in RMS/api-main-service from gladys-dev2 to RMSv2

* commit '6d298a90':
  notif

app/applicationlayer/management/notification/views.py

@@ -29,60 +29,60 @@ class NotificationsViewset(meviewsets.ModelViewSet):
     pagination_class = CustomPagination
 
     def list(self, request, *args, **kwargs):
-        # try:
-        req = self.request
-        account_no = req.query_params.get('account_no')
-        app = req.query_params.get('app')
-        
-        if account_no:
+        try:
+            req = self.request
+            account_no = req.query_params.get('account_no')
+            app = req.query_params.get('app')
             
-            queryset = models.Notification.objects.filter(
-                account_no=account_no).order_by('-created')
-            queryset = self.filter_queryset(queryset)
-            unseen = models.Notification.objects.filter(
-                account_no=account_no, is_read=False).count()
-
-            if app:
-
+            if account_no:
+                
                 queryset = models.Notification.objects.filter(
-                    account_no=account_no, app=app).order_by('-created')
+                    account_no=account_no).order_by('-created')
                 queryset = self.filter_queryset(queryset)
                 unseen = models.Notification.objects.filter(
-                    account_no=account_no, app=app, is_read=False).count()
-            
-        else:
-            queryset = models.Notification.objects.all().order_by('-created')
-            queryset = self.filter_queryset(queryset)
-            unseen = models.Notification.objects.filter(
-                is_read=False).count()
-
-        if not queryset:
-            message = status_message_response(
-                            200, 'success', 'No records found', []
-                        )
-            
-            return Response(message)
-
-        serializer = self.get_serializer(queryset, many=True)
-        page = self.paginate_queryset(queryset)
-        if page is not None:
-            serializer = self.get_serializer(page, many=True)
-            message = {
-                'unseen': unseen,
-                'code': 200,
-                'status': 'success',
-                'message': 'List of Notifications found',
-                'results': serializer.data
-            }
-
-            return self.get_paginated_response(message)
+                    account_no=account_no, is_read=False).count()
+
+                if app:
+
+                    queryset = models.Notification.objects.filter(
+                        account_no=account_no, app=app).order_by('-created')
+                    queryset = self.filter_queryset(queryset)
+                    unseen = models.Notification.objects.filter(
+                        account_no=account_no, app=app, is_read=False).count()
+                
+            else:
+                queryset = models.Notification.objects.all().order_by('-created')
+                queryset = self.filter_queryset(queryset)
+                unseen = models.Notification.objects.filter(
+                    is_read=False).count()
+
+            if not queryset:
+                message = status_message_response(
+                                200, 'success', 'No records found', []
+                            )
+                
+                return Response(message)
+
+            serializer = self.get_serializer(queryset, many=True)
+            page = self.paginate_queryset(queryset)
+            if page is not None:
+                serializer = self.get_serializer(page, many=True)
+                message = {
+                    'unseen': unseen,
+                    'code': 200,
+                    'status': 'success',
+                    'message': 'List of Notifications found',
+                    'results': serializer.data
+                }
+
+                return self.get_paginated_response(message)
     
-        # except Exception as e:
-        #     message = status_message_response(
-        #         500, 'failed',
-        #         'Request was not able to process' + str(e), [])
-        #     return Response(message,
-        #                     status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+        except Exception as e:
+            message = status_message_response(
+                500, 'failed',
+                'Request was not able to process' + str(e), [])
+            return Response(message,
+                            status=status.HTTP_500_INTERNAL_SERVER_ERROR)
 
     # comment
     @action(methods=["PATCH"], detail=True)