user notification issue

Qa

account/views.py

@@ -7,7 +7,6 @@ from notifications.utils import remove_fcm_token
 from datetime import datetime, timedelta
 from rest_framework import viewsets, status, views
 from rest_framework.decorators import action
-import random
 import logging
 from django.utils import timezone
 import jwt
@@ -295,7 +294,7 @@ class UserLogin(viewsets.ViewSet):
         try:
             if user is not None:
                 login(request, user)
-                if user_type == USER_TYPE_FLAG["TWO"]:
+                if str(user_type) == USER_TYPE_FLAG["TWO"]:
                     guardian_data = Guardian.objects.filter(user__username=username, is_verified=True).last()
                     if guardian_data:
                         serializer = GuardianSerializer(
@@ -306,7 +305,7 @@ class UserLogin(viewsets.ViewSet):
                             ERROR_CODE["2070"],
                             response_status=status.HTTP_401_UNAUTHORIZED
                         )
-                elif user_type == USER_TYPE_FLAG["FIRST"]:
+                elif str(user_type) == USER_TYPE_FLAG["FIRST"]:
                     junior_data = Junior.objects.filter(auth__username=username, is_verified=True).last()
                     if junior_data:
                         serializer = JuniorSerializer(
@@ -536,7 +535,7 @@ class UserNotificationAPIViewSet(viewsets.ModelViewSet):
     permission_classes = [IsAuthenticated]
     def list(self, request, *args, **kwargs):
         """profile view"""
-        queryset = self.queryset.filter(user=request.user)
+        queryset = UserNotification.objects.filter(user=request.user)
         serializer = UserNotificationSerializer(queryset, many=True)
         return custom_response(None, serializer.data, response_status=status.HTTP_200_OK)
 

junior/serializers.py

@@ -320,7 +320,7 @@ class RemoveJuniorSerializer(serializers.ModelSerializer):
         if instance:
             instance.is_invited = False
             instance.guardian_code = '{}'
-            instance.guardian_code_status = str(NUMBER['1'])
+            instance.guardian_code_status = str(NUMBER['one'])
             instance.save()
             return instance