Skip to content

R
red-ci-cd
Commit d6c43522 authored by Gladys Forte's avatar Gladys Forte
Browse files
Options

notification v2

parent fe520cc9
Hide whitespace changes
Inline Side-by-side
Showing with 80 additions and 61 deletions
app/applicationlayer/management/notification/utils_notif.py
View file @ d6c43522
from django.conf import settings
from websocket import create_connection
import json
from rest_framework.pagination import PageNumberPagination
from rest_framework.response import Response
REALTIMESERVER_IP = settings.REALTIMESERVER_IP
......@@ -13,4 +15,24 @@ def send_broadcast_message(room_name, sender, message):
'message': message
}
ws.send(json.dumps(data))
ws.close()
\ No newline at end of file
ws.close()
class CustomPagination(PageNumberPagination):
page_size = 10
max_page_size = 50
page_query_param = 'page'
page_size_query_param = 'page_size'
def get_paginated_response(self, data):
return Response({
'page_number': self.page.number,
'size_per_page': self.page.paginator.per_page,
'total_pages': self.page.paginator.num_pages,
'total': self.page.paginator.count,
'totalunseen': data['unseen'],
'code': data['code'],
'status': data['status'],
'message': data['message'],
'results': data['results']
})
\ No newline at end of file
app/applicationlayer/management/notification/views.py
View file @ d6c43522
......@@ -14,9 +14,9 @@ from rest_framework import status
from django.conf import settings
from app.applicationlayer.management.notification.utils_notif import (
send_broadcast_message)
from app.applicationlayer.utils import (status_message_response,
CustomPagination)
send_broadcast_message,
CustomPagination)
from app.applicationlayer.utils import (status_message_response)
from rest_framework.exceptions import ValidationError
from django.shortcuts import render, redirect, get_object_or_404
from rest_framework.decorators import action
......@@ -32,59 +32,59 @@ 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_code')
if account_no:
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:
try:
req = self.request
account_no = req.query_params.get('account_no')
app = req.query_params.get('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:
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(
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)
# return Response(serializer.data)
# 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)
500, 'failed',
'Request was not able to process' + str(e), [])
return Response(message,
status=status.HTTP_500_INTERNAL_SERVER_ERROR)
@action(methods=["PATCH"], detail=True)
......@@ -96,8 +96,7 @@ class NotificationsViewset(meviewsets.ModelViewSet):
models.Notification.objects.filter(account_no=account_no,
id__in=request.data['ids']).update(
is_read=True,
modified=datetime.now(),
modifiedby=account_no)
modified=datetime.now())
message = status_message_response(
200, 'success',
......@@ -124,8 +123,7 @@ class NotificationsViewset(meviewsets.ModelViewSet):
models.Notification.objects.filter(account_no=account_no).update(
is_read=True,
modified=datetime.now(),
modifiedby=account_no)
modified=datetime.now())
message = status_message_response(
200, 'success',
......@@ -147,9 +145,7 @@ class NotificationsViewset(meviewsets.ModelViewSet):
serializer = serializers.NotificationSerializer(data=request.data)
try:
if serializer.is_valid():
x = serializer.save()
x.created = datetime.now()
x.save()
serializer.save()
message = {
'code': 201,
......@@ -159,7 +155,6 @@ class NotificationsViewset(meviewsets.ModelViewSet):
}
ROOM = serializer.data['account_no']
SENDER = serializer.data['sender_account_no']
send_broadcast_message(
......
config/settings/dev.py
View file @ d6c43522
......@@ -27,3 +27,4 @@ SESSION_TIMEOUT = config['DEV']['SESSION_TIMEOUT']
FRONT_END_URL = config['DEV']['FRONT_END_URL']
AUTH_ACCESSS_TOKEN_TIMEOUT = config['DEV']['AUTH_ACCESSS_TOKEN_TIMEOUT']
USER_DEFAULT_PASSWORD = config['DEV']['USER_DEFAULT_PASSWORD']
REALTIMESERVER_IP = config['NOTIFICATION']['REALTIMESERVER_IP']
\ No newline at end of file
config/settings/local.py
View file @ d6c43522
......@@ -25,5 +25,4 @@ SESSION_TIMEOUT = config['LOCAL']['SESSION_TIMEOUT']
FRONT_END_URL = config['LOCAL']['FRONT_END_URL']
AUTH_ACCESSS_TOKEN_TIMEOUT = config['LOCAL']['AUTH_ACCESSS_TOKEN_TIMEOUT']
USER_DEFAULT_PASSWORD = config['LOCAL']['USER_DEFAULT_PASSWORD']
REALTIMESERVER_IP = config['NOTIFICATION']['REALTIMESERVER_IP']
\ No newline at end of file
config/settings/production.py
View file @ d6c43522
......@@ -27,3 +27,4 @@ SESSION_TIMEOUT = config['PRODUCTION']['SESSION_TIMEOUT']
FRONT_END_URL = config['PRODUCTION']['FRONT_END_URL']
AUTH_ACCESSS_TOKEN_TIMEOUT = config['PRODUCTION']['AUTH_ACCESSS_TOKEN_TIMEOUT']
USER_DEFAULT_PASSWORD = config['PRODUCTION']['USER_DEFAULT_PASSWORD']
REALTIMESERVER_IP = config['NOTIFICATION']['REALTIMESERVER_IP']
\ No newline at end of file
config/settings/uat.py
View file @ d6c43522
......@@ -27,3 +27,4 @@ SESSION_TIMEOUT = config['UAT']['SESSION_TIMEOUT']
FRONT_END_URL = config['UAT']['FRONT_END_URL']
AUTH_ACCESSS_TOKEN_TIMEOUT = config['UAT']['AUTH_ACCESSS_TOKEN_TIMEOUT']
USER_DEFAULT_PASSWORD = config['UAT']['USER_DEFAULT_PASSWORD']
REALTIMESERVER_IP = config['NOTIFICATION']['REALTIMESERVER_IP']
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment