modification in create task api

modified create task api, added badge count in notification list

account/admin.py

@@ -2,7 +2,7 @@
 from django.contrib import admin
 
 """Import django app"""
-from .models import UserEmailOtp, DefaultTaskImages, UserNotification, UserDelete, UserDeviceDetails
+from .models import UserEmailOtp, DefaultTaskImages, UserNotification, UserDelete, UserDeviceDetails, ForceUpdate
 # Register your models here.
 
 @admin.register(UserDelete)
@@ -39,6 +39,19 @@ class UserEmailOtpAdmin(admin.ModelAdmin):
         """Return object in email and otp format"""
         return self.email + '-' + self.otp
 
+@admin.register(ForceUpdate)
+class ForceUpdateAdmin(admin.ModelAdmin):
+    """Force update"""
+    list_display = ['version', 'device_type']
+    readonly_fields = ('device_type',)
+
+    def has_add_permission(self, request):
+        count = ForceUpdate.objects.all().count()
+        if count < 2:
+            return True
+        return False
+    def has_delete_permission(self, request, obj=None):
+        return False
 @admin.register(UserDeviceDetails)
 class UserDeviceDetailsAdmin(admin.ModelAdmin):
     """User profile admin"""

account/custom_middleware.py

@@ -5,7 +5,7 @@ from rest_framework.response import Response
 from rest_framework.renderers import JSONRenderer
 """App django"""
 from account.utils import custom_error_response
-from account.models import UserDeviceDetails
+from account.models import UserDeviceDetails, ForceUpdate
 from base.messages import ERROR_CODE, SUCCESS_CODE
 from base.constants import NUMBER
 from junior.models import Junior
@@ -17,10 +17,12 @@ from guardian.models import Guardian
 # multiple devices only
 # user can login in single
 # device at a time"""
+# force update
+# use 308 status code for force update
 
-def custom_response(custom_error):
+def custom_response(custom_error, response_status = status.HTTP_404_NOT_FOUND):
     """custom response"""
-    response = Response(custom_error.data, status=status.HTTP_404_NOT_FOUND)
+    response = Response(custom_error.data, status=response_status)
     # Set content type header to "application/json"
     response['Content-Type'] = 'application/json'
     # Render the response as JSON
@@ -39,10 +41,18 @@ class CustomMiddleware(object):
         # Code to be executed after the view is called
         device_id = request.META.get('HTTP_DEVICE_ID')
         user_type = request.META.get('HTTP_USER_TYPE')
+        version = request.META.get('HTTP_VERSION')
+        device_type = str(request.META.get('HTTP_TYPE'))
+
         api_endpoint = request.path
+        unrestricted_api = ('/api/v1/user/login/', '/api/v1/logout/', '/api/v1/generate-token/')
         if request.user.is_authenticated:
             # device details
-            device_details = UserDeviceDetails.objects.filter(user=request.user, device_id=device_id).last()
+            if device_id:
+                device_details = UserDeviceDetails.objects.filter(user=request.user, device_id=device_id).last()
+                if not device_details and api_endpoint not in unrestricted_api:
+                    custom_error = custom_error_response(ERROR_CODE['2037'], response_status=status.HTTP_404_NOT_FOUND)
+                    response = custom_response(custom_error)
             if user_type and str(user_type) == str(NUMBER['one']):
                 junior = Junior.objects.filter(auth=request.user, is_active=False).last()
                 if junior:
@@ -53,7 +63,11 @@ class CustomMiddleware(object):
                 if guardian:
                     custom_error = custom_error_response(ERROR_CODE['2075'], response_status=status.HTTP_404_NOT_FOUND)
                     response = custom_response(custom_error)
-            if device_id and not device_details and api_endpoint != '/api/v1/user/login/':
+
-                custom_error = custom_error_response(ERROR_CODE['2037'], response_status=status.HTTP_404_NOT_FOUND)
+            if version and device_type:
-                response = custom_response(custom_error)
+                force_update = ForceUpdate.objects.filter(version=version, device_type=device_type).last()
+                if not force_update:
+                    custom_error = custom_error_response(ERROR_CODE['2079'],
+                                                         response_status=status.HTTP_308_PERMANENT_REDIRECT)
+                    response = custom_response(custom_error, status.HTTP_308_PERMANENT_REDIRECT)
         return response

account/migrations/0010_forceupdate.py

@@ -0,0 +1,28 @@
+# Generated by Django 4.2.2 on 2023-08-22 07:39
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('account', '0009_alter_userdevicedetails_device_id'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ForceUpdate',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('version', models.CharField(blank=True, max_length=50, null=True)),
+                ('device_type', models.CharField(blank=True, choices=[('1', 'android'), ('2', 'ios')], default=None, max_length=15, null=True)),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+            ],
+            options={
+                'verbose_name': 'Force Update Version',
+                'verbose_name_plural': 'Force Update Version',
+                'db_table': 'force_update',
+            },
+        ),
+    ]

account/models.py

@@ -2,8 +2,9 @@
 """Django import"""
 from django.db import models
 from django.contrib.auth.models import User
+from django.core.exceptions import ValidationError
 """App import"""
-from base.constants import USER_TYPE
+from base.constants import USER_TYPE, DEVICE_TYPE
 # Create your models here.
 
 class UserProfile(models.Model):
@@ -165,3 +166,25 @@ class UserDeviceDetails(models.Model):
 
     def __str__(self):
         return self.user.email
+
+
+
+
+class ForceUpdate(models.Model):
+    """
+    Force update
+    """
+    """Version ID"""
+    version = models.CharField(max_length=50, null=True, blank=True)
+    device_type = models.CharField(max_length=15, choices=DEVICE_TYPE, null=True, blank=True, default=None)
+    created_at = models.DateTimeField(auto_now_add=True)
+    updated_at = models.DateTimeField(auto_now=True)
+
+    class Meta(object):
+        """ Meta information """
+        db_table = 'force_update'
+        verbose_name = 'Force Update Version'
+        verbose_name_plural = 'Force Update Version'
+
+    def __str__(self):
+        return self.version

account/serializers.py

@@ -18,7 +18,7 @@ import secrets
 
 from guardian.models import Guardian
 from junior.models import Junior
-from account.models import UserEmailOtp, DefaultTaskImages, UserDelete, UserNotification, UserPhoneOtp
+from account.models import UserEmailOtp, DefaultTaskImages, UserDelete, UserNotification, UserPhoneOtp, ForceUpdate
 from base.constants import GUARDIAN, JUNIOR, SUPERUSER, NUMBER
 from base.messages import ERROR_CODE, SUCCESS_CODE, STATUS_CODE_ERROR
 from .utils import delete_user_account_condition_social, delete_user_account_condition
@@ -123,7 +123,7 @@ class ChangePasswordSerializer(serializers.Serializer):
 
     def create(self, validated_data):
         """
-
+        change password
         """
         new_password = validated_data.pop('new_password')
         current_password = validated_data.pop('current_password')
@@ -308,7 +308,7 @@ class EmailVerificationSerializer(serializers.ModelSerializer):
     class Meta(object):
         """Meta info"""
         model = UserEmailOtp
-        fields = '__all__'
+        fields = ('email',)
 
 
 
@@ -390,3 +390,12 @@ class UserPhoneOtpSerializer(serializers.ModelSerializer):
         """Meta info"""
         model = UserPhoneOtp
         fields = '__all__'
+
+class ForceUpdateSerializer(serializers.ModelSerializer):
+    """ ForceUpdate Serializer
+    """
+
+    class Meta(object):
+        """ meta info """
+        model = ForceUpdate
+        fields = ('id', 'version', 'device_type')

account/templates/templated_email/support_mail.email

@@ -1,7 +1,7 @@
 {% extends "templated_email/email_base.email" %}
 
 {% block subject %}
-    {{subject}}
+    Support Mail
 {% endblock %}
 
 {% block plain %}

account/templates/templated_email/user_deactivate.email

@@ -0,0 +1,22 @@
+{% extends "templated_email/email_base.email" %}
+
+{% block subject %}
+    Account Deactivated
+{% endblock %}
+
+{% block plain %}
+    <tr>
+        <td style="padding: 0 27px 15px;">
+            <p style="margin: 0; font-size: 16px; line-height: 20px; padding: 36px 0 0; font-weight: 500; color: #1f2532;">
+                Hi User,
+            </p>
+        </td>
+    </tr>
+    <tr>
+        <td style="padding: 0 27px 22px;">
+            <p style="margin: 0;font-size: 14px; font-weight: 400; line-height: 21px; color: #1f2532;">
+                Your account has been deactivated by admin. Please reach out to the admin for assistance.
+            </p>
+        </td>
+    </tr>
+{% endblock %}

account/urls.py

@@ -29,7 +29,7 @@ from .views import (UserLogin, SendPhoneOtp, UserPhoneVerification, UserEmailVer
                     GoogleLoginViewSet, SigninWithApple, ProfileAPIViewSet, UploadImageAPIViewSet,
                     DefaultImageAPIViewSet, DeleteUserProfileAPIViewSet, UserNotificationAPIViewSet,
                     UpdateUserNotificationAPIViewSet, SendSupportEmail, LogoutAPIView, AccessTokenAPIView,
-                    AdminLoginViewSet)
+                    AdminLoginViewSet, ForceUpdateViewSet)
 """Router"""
 router = routers.SimpleRouter()
 
@@ -39,8 +39,6 @@ router.register('user', UserLogin, basename='user')
 router.register('admin', AdminLoginViewSet, basename='admin')
 """google login end point"""
 router.register('google-login', GoogleLoginViewSet, basename='admin')
-router.register('send-phone-otp', SendPhoneOtp, basename='send-phone-otp')
-router.register('user-phone-verification', UserPhoneVerification, basename='user-phone-verification')
 """email verification end point"""
 router.register('user-email-verification', UserEmailVerification, basename='user-email-verification')
 """Resend email otp end point"""
@@ -57,6 +55,8 @@ router.register('delete', DeleteUserProfileAPIViewSet, basename='delete')
 router.register('user-notification', UserNotificationAPIViewSet, basename='user-notification')
 """update user account notification"""
 router.register('update-user-notification', UpdateUserNotificationAPIViewSet, basename='update-user-notification')
+# Force update entry API
+router.register('force-update', ForceUpdateViewSet, basename='force-update')
 """Define url pattern"""
 urlpatterns = [
     path('api/v1/', include(router.urls)),

account/utils.py

@@ -1,6 +1,6 @@
 """Account utils"""
 from celery import shared_task
-
+import random
 """Import django"""
 from django.conf import settings
 from rest_framework import viewsets, status
@@ -93,8 +93,8 @@ def junior_account_update(user_tb):
         # Update junior account
         junior_data.is_active = False
         junior_data.is_verified = False
-        junior_data.guardian_code = '{}'
+        junior_data.guardian_code = None
-        junior_data.guardian_code_status = str(NUMBER['one'])
+        junior_data.guardian_code_status = None
         junior_data.is_deleted = True
         junior_data.save()
         JuniorPoints.objects.filter(junior=junior_data).delete()
@@ -167,7 +167,7 @@ def user_device_details(user, device_id):
     return False
 
 
-def send_support_email(name, sender, subject, message):
+def send_support_email(name, sender, message):
     """Send otp on email with template"""
     to_email = [settings.EMAIL_FROM_ADDRESS]
     from_email = settings.DEFAULT_ADDRESS
@@ -179,7 +179,6 @@ def send_support_email(name, sender, subject, message):
         context={
             'name': name.title(),
             'sender': sender,
-            'subject': subject,
             'message': message
         }
     )
@@ -191,7 +190,8 @@ def custom_response(detail, data=None, response_status=status.HTTP_200_OK, count
     if not data:
         """when data is none"""
         data = None
-    return Response({"data": data, "message": detail, "status": "success", "code": response_status, "count": count})
+    return Response({"data": data, "message": detail, "status": "success",
+                     "code": response_status, "count": count})
 
 
 def custom_error_response(detail, response_status):
@@ -204,8 +204,12 @@ def custom_error_response(detail, response_status):
     if not detail:
         """when details is empty"""
         detail = {}
-    return Response({"error": detail, "status": "failed", "code": response_status})
+    if response_status == 406:
-
+        return Response({"error": detail, "status": "failed", "code": response_status,},
+                        status=status.HTTP_308_PERMANENT_REDIRECT)
+    else:
+        return Response({"error": detail, "status": "failed", "code": response_status},
+                        status=status.HTTP_400_BAD_REQUEST)
 
 def get_user_data(attrs):
     """
@@ -278,8 +282,48 @@ def generate_code(value, user_id):
 
 OTP_EXPIRY = timezone.now() + timezone.timedelta(days=1)
 
+
 def get_user_full_name(user_obj):
     """
     to get user's full name
     """
-    return f"{user_obj.first_name} {user_obj.last_name}" if user_obj.last_name else user_obj.first_name
+    return f"{user_obj.first_name} {user_obj.last_name}" if user_obj.first_name or user_obj.last_name else "User"
+
+
+def make_special_password(length=10):
+    """
+    to make secured password
+    :param length:
+    :return:
+    """
+    # Define character sets
+    lowercase_letters = string.ascii_lowercase
+    uppercase_letters = string.ascii_uppercase
+    digits = string.digits
+    special_characters = '!@#$%^&*()_-+=<>?/[]{}|'
+
+    # Combine character sets
+    all_characters = lowercase_letters + uppercase_letters + digits + special_characters
+
+    # Create a password with random characters
+    password = (
+        secrets.choice(lowercase_letters) +
+        secrets.choice(uppercase_letters) +
+        secrets.choice(digits) +
+        secrets.choice(special_characters) +
+        ''.join(secrets.choice(all_characters) for _ in range(length - 4))
+    )
+
+    # Shuffle the characters to make it more random
+    password_list = list(password)
+    random.shuffle(password_list)
+    return ''.join(password_list)
+
+def task_status_fun(status_value):
+    """task status"""
+    task_status_value = ['1']
+    if str(status_value) == '2':
+        task_status_value = ['2', '4']
+    elif str(status_value) == '3':
+        task_status_value = ['3', '5', '6']
+    return task_status_value

account/views.py

@@ -4,6 +4,7 @@ import threading
 from notifications.utils import remove_fcm_token
 
 # django imports
+from rest_framework.viewsets import GenericViewSet, mixins
 from datetime import datetime, timedelta
 from rest_framework import viewsets, status, views
 from rest_framework.decorators import action
@@ -26,14 +27,15 @@ from django.conf import settings
 from guardian.models import Guardian
 from junior.models import Junior, JuniorPoints
 from guardian.utils import upload_image_to_alibaba
-from account.models import UserDeviceDetails, UserPhoneOtp, UserEmailOtp, DefaultTaskImages, UserNotification
+from account.models import (UserDeviceDetails, UserPhoneOtp, UserEmailOtp, DefaultTaskImages, UserNotification,
+                            ForceUpdate)
 from django.contrib.auth.models import User
 from .serializers import (SuperUserSerializer, GuardianSerializer, JuniorSerializer, EmailVerificationSerializer,
                           ForgotPasswordSerializer, ResetPasswordSerializer, ChangePasswordSerializer,
                           GoogleLoginSerializer, UpdateGuardianImageSerializer, UpdateJuniorProfileImageSerializer,
                           DefaultTaskImagesSerializer, DefaultTaskImagesDetailsSerializer, UserDeleteSerializer,
                           UserNotificationSerializer, UpdateUserNotificationSerializer, UserPhoneOtpSerializer,
-                          AdminLoginSerializer)
+                          AdminLoginSerializer, ForceUpdateSerializer)
 from rest_framework_simplejwt.tokens import RefreshToken
 from base.messages import ERROR_CODE, SUCCESS_CODE
 from base.constants import NUMBER, ZOD, JUN, GRD, USER_TYPE_FLAG
@@ -49,7 +51,8 @@ class GoogleLoginMixin(object):
     def google_login(request):
         """google login function"""
         access_token = request.data.get('access_token')
-        user_type = request.data.get('user_type')
+        user_type = request.META.get('HTTP_USER_TYPE')
+        device_id = request.META.get('HTTP_DEVICE_ID')
         if not access_token:
             return Response({'error': 'Access token is required.'}, status=status.HTTP_400_BAD_REQUEST)
 
@@ -82,14 +85,29 @@ class GoogleLoginMixin(object):
         if user_data.exists():
             if str(user_type) == '1':
                 junior_query = Junior.objects.filter(auth=user_data.last()).last()
+                if not junior_query:
+                    return custom_error_response(
+                        ERROR_CODE["2071"],
+                        response_status=status.HTTP_400_BAD_REQUEST
+                    )
                 serializer = JuniorSerializer(junior_query)
-            if str(user_type) == '2':
+            elif str(user_type) == '2':
                 guardian_query = Guardian.objects.filter(user=user_data.last()).last()
+                if not guardian_query:
+                    return custom_error_response(
+                        ERROR_CODE["2070"],
+                        response_status=status.HTTP_400_BAD_REQUEST
+                    )
                 serializer = GuardianSerializer(guardian_query)
+            else:
+                return custom_error_response(
+                    ERROR_CODE["2069"],
+                    response_status=status.HTTP_400_BAD_REQUEST
+                )
             return custom_response(SUCCESS_CODE['3003'], serializer.data,
                                    response_status=status.HTTP_200_OK)
 
-        if not User.objects.filter(email__iexact=email).exists():
+        else:
             user_obj = User.objects.create(username=email, email=email, first_name=first_name, last_name=last_name)
             if str(user_type) == '1':
                 junior_query = Junior.objects.create(auth=user_obj, is_verified=True, is_active=True,
@@ -100,13 +118,23 @@ class GoogleLoginMixin(object):
                 serializer = JuniorSerializer(junior_query)
                 position = Junior.objects.all().count()
                 JuniorPoints.objects.create(junior=junior_query, position=position)
-            if str(user_type) == '2':
+            elif str(user_type) == '2':
                 guardian_query = Guardian.objects.create(user=user_obj, is_verified=True, is_active=True,
                                                          image=profile_picture,signup_method='2',
                                                          guardian_code=generate_code(GRD, user_obj.id),
                                                          referral_code=generate_code(ZOD, user_obj.id)
                                                          )
                 serializer = GuardianSerializer(guardian_query)
+            else:
+                user_obj.delete()
+                return custom_error_response(
+                    ERROR_CODE["2069"],
+                    response_status=status.HTTP_400_BAD_REQUEST
+                )
+            device_detail, created = UserDeviceDetails.objects.get_or_create(user=user_obj)
+            if device_detail:
+                device_detail.device_id = device_id
+                device_detail.save()
         # Return a JSON response with the user's email and name
         return custom_response(SUCCESS_CODE['3003'], serializer.data,
                                response_status=status.HTTP_200_OK)
@@ -117,16 +145,26 @@ class GoogleLoginViewSet(GoogleLoginMixin, viewsets.GenericViewSet):
     serializer_class = GoogleLoginSerializer
 
     def create(self, request):
-        """create method"""
+        """Payload
+    {
+        "access_token",
+        "user_type": "1"
+        }"""
         serializer = self.get_serializer(data=request.data)
         serializer.is_valid(raise_exception=True)
         return self.google_login(request)
 
 class SigninWithApple(views.APIView):
-    """This API is for sign in with Apple for app."""
+    """This API is for sign in with Apple for app.
+    Payload
+    {
+        "access_token",
+        "user_type": "1"
+        }"""
     def post(self, request):
         token = request.data.get("access_token")
-        user_type = request.data.get("user_type")
+        user_type = request.META.get('HTTP_USER_TYPE')
+        device_id = request.META.get('HTTP_DEVICE_ID')
         try:
             decoded_data = jwt.decode(token, options={"verify_signature": False})
             user_data = {"email": decoded_data.get('email'), "username": decoded_data.get('email'), "is_active": True}
@@ -134,11 +172,26 @@ class SigninWithApple(views.APIView):
                 try:
                     user = User.objects.get(email=decoded_data.get("email"))
                     if str(user_type) == '1':
-                        junior_query = Junior.objects.filter(auth=user).last()
+                        junior_data = Junior.objects.filter(auth=user).last()
-                        serializer = JuniorSerializer(junior_query)
+                        if not junior_data:
-                    if str(user_type) == '2':
+                            return custom_error_response(
-                        guardian_query = Guardian.objects.filter(user=user).last()
+                                ERROR_CODE["2071"],
-                        serializer = GuardianSerializer(guardian_query)
+                                response_status=status.HTTP_400_BAD_REQUEST
+                            )
+                        serializer = JuniorSerializer(junior_data)
+                    elif str(user_type) == '2':
+                        guardian_data = Guardian.objects.filter(user=user).last()
+                        if not guardian_data:
+                            return custom_error_response(
+                                ERROR_CODE["2070"],
+                                response_status=status.HTTP_400_BAD_REQUEST
+                            )
+                        serializer = GuardianSerializer(guardian_data)
+                    else:
+                        return custom_error_response(
+                            ERROR_CODE["2069"],
+                            response_status=status.HTTP_400_BAD_REQUEST
+                        )
                     return custom_response(SUCCESS_CODE['3003'], serializer.data,
                                            response_status=status.HTTP_200_OK)
 
@@ -152,12 +205,22 @@ class SigninWithApple(views.APIView):
                         serializer = JuniorSerializer(junior_query)
                         position = Junior.objects.all().count()
                         JuniorPoints.objects.create(junior=junior_query, position=position)
-                    if str(user_type) == '2':
+                    elif str(user_type) == '2':
                         guardian_query = Guardian.objects.create(user=user, is_verified=True, is_active=True,
                                                                  signup_method='3',
                                                                  guardian_code=generate_code(GRD, user.id),
                                                                  referral_code=generate_code(ZOD, user.id))
                         serializer = GuardianSerializer(guardian_query)
+                    else:
+                        user.delete()
+                        return custom_error_response(
+                            ERROR_CODE["2069"],
+                            response_status=status.HTTP_400_BAD_REQUEST
+                        )
+                    device_detail, created = UserDeviceDetails.objects.get_or_create(user=user)
+                    if device_detail:
+                        device_detail.device_id = device_id
+                        device_detail.save()
                     return custom_response(SUCCESS_CODE['3003'], serializer.data,
                                            response_status=status.HTTP_200_OK)
         except Exception as e:
@@ -202,6 +265,10 @@ class ChangePasswordAPIView(views.APIView):
     def post(self, request):
         """
         POST request to change current login user password
+        Payload
+        {   "current_password":"Demo@123",
+            "new_password":"Demo@123"
+            }
         """
         serializer = ChangePasswordSerializer(
             context=request.user,
@@ -219,7 +286,12 @@ class ChangePasswordAPIView(views.APIView):
         )
 
 class ResetPasswordAPIView(views.APIView):
-    """Reset password"""
+    """Reset password
+    Payload
+    {
+    "verification_code":"373770",
+    "password":"Demo@1323"
+    }"""
     def post(self, request):
         serializer = ResetPasswordSerializer(data=request.data)
         if serializer.is_valid():
@@ -236,7 +308,10 @@ class ForgotPasswordAPIView(views.APIView):
     def post(self, request):
 
         """
-        Post method to validate serializer
+        Payload
+        {
+        "email": "abc@yopmail.com"
+        }
         """
         serializer = self.serializer_class(data=request.data)
         serializer.is_valid(raise_exception=True)
@@ -247,7 +322,7 @@ class ForgotPasswordAPIView(views.APIView):
         send_all_email.delay(
             'email_reset_verification.email', email, verification_code
         )
-        expiry = OTP_EXPIRY
+        expiry = timezone.now() + timezone.timedelta(days=1)
         user_data, created = UserEmailOtp.objects.get_or_create(
             email=email
         )
@@ -420,7 +495,12 @@ class AdminLoginViewSet(viewsets.GenericViewSet):
 
 
 class UserEmailVerification(viewsets.ModelViewSet):
-    """User Email verification"""
+    """User Email verification
+    Payload
+    {
+    "email":"ramu@yopmail.com",
+    "otp":"361123"
+    }"""
     serializer_class = EmailVerificationSerializer
     http_method_names = ('post',)
 
@@ -466,9 +546,11 @@ class UserEmailVerification(viewsets.ModelViewSet):
 class ReSendEmailOtp(viewsets.ModelViewSet):
     """Send otp on phone"""
     serializer_class = EmailVerificationSerializer
-    permission_classes = [IsAuthenticated]
+    http_method_names = ('post',)
-
     def create(self, request, *args, **kwargs):
+        """Param
+        {"email":"ashok@yopmail.com"}
+        """
         otp = generate_otp()
         if User.objects.filter(email=request.data['email']):
             expiry = timezone.now() + timezone.timedelta(days=1)
@@ -480,7 +562,7 @@ class ReSendEmailOtp(viewsets.ModelViewSet):
                 email_data.otp = otp
                 email_data.expired_at = expiry
                 email_data.save()
-                send_otp_email(request.data['email'], otp)
+                send_otp_email.delay(request.data['email'], otp)
             return custom_response(SUCCESS_CODE['3016'], response_status=status.HTTP_200_OK)
         else:
             return custom_error_response(ERROR_CODE["2023"], response_status=status.HTTP_400_BAD_REQUEST)
@@ -489,23 +571,28 @@ class ProfileAPIViewSet(viewsets.ModelViewSet):
     """Profile viewset"""
     serializer_class = JuniorProfileSerializer
     permission_classes = [IsAuthenticated]
+    http_method_names = ('get',)
 
     def list(self, request, *args, **kwargs):
-        """profile view"""
+        """profile view
-        if str(self.request.GET.get('user_type')) == '1':
+        Params
+        user_type"""
+        user_type = request.META.get('HTTP_USER_TYPE')
+        if str(user_type) == '1':
             junior_data = Junior.objects.filter(auth=self.request.user).last()
             if junior_data:
                 serializer = JuniorProfileSerializer(junior_data)
                 return custom_response(None, serializer.data, response_status=status.HTTP_200_OK)
-        elif str(self.request.GET.get('user_type')) == '2':
+        elif str(user_type) == '2':
             guardian_data = Guardian.objects.filter(user=self.request.user).last()
             if guardian_data:
                 serializer = GuardianProfileSerializer(guardian_data)
                 return custom_response(None, serializer.data, response_status=status.HTTP_200_OK)
-
+        return custom_error_response(None, response_status=status.HTTP_400_BAD_REQUEST)
 class UploadImageAPIViewSet(viewsets.ModelViewSet):
     """upload  task image"""
     serializer_class = DefaultTaskImagesSerializer
+    http_method_names = ('post',)
     def create(self, request, *args, **kwargs):
         """upload images"""
         image_data = request.data['image_url']
@@ -525,6 +612,7 @@ class DefaultImageAPIViewSet(viewsets.ModelViewSet):
     """Profile viewset"""
     serializer_class = DefaultTaskImagesDetailsSerializer
     permission_classes = [IsAuthenticated]
+    http_method_names = ('get',)
     def list(self, request, *args, **kwargs):
         """profile view"""
         queryset = DefaultTaskImages.objects.all()
@@ -533,7 +621,13 @@ class DefaultImageAPIViewSet(viewsets.ModelViewSet):
 
 
 class DeleteUserProfileAPIViewSet(viewsets.GenericViewSet):
-    """ Delete user API view set """
+    """ Delete user API view set
+     {"user_type":1,
+      "signup_method":"1",
+      "password":"Demo@123"}
+      signup_method 1 for manual
+      2 for google login
+      3 for apple login"""
 
     @action(detail=False, methods=['POST'], url_path='user-account',serializer_class=UserDeleteSerializer,
             permission_classes=[IsAuthenticated])
@@ -555,8 +649,9 @@ class UserNotificationAPIViewSet(viewsets.ModelViewSet):
     """notification viewset"""
     serializer_class = UserNotificationSerializer
     permission_classes = [IsAuthenticated]
+    http_method_names = ('get',)
     def list(self, request, *args, **kwargs):
-        """profile view"""
+        """notification view"""
         queryset = UserNotification.objects.filter(user=request.user)
         serializer = UserNotificationSerializer(queryset, many=True)
         return custom_response(None, serializer.data, response_status=status.HTTP_200_OK)
@@ -566,9 +661,14 @@ class UpdateUserNotificationAPIViewSet(viewsets.ModelViewSet):
     """Update notification viewset"""
     serializer_class = UpdateUserNotificationSerializer
     permission_classes = [IsAuthenticated]
+    http_method_names = ('post',)
 
     def create(self, request, *args, **kwargs):
-        """profile view"""
+        """Payload
+        {"email_notification": false,
+        "sms_notification": false,
+        "push_notification": false}
+        """
         serializer = UpdateUserNotificationSerializer(data=request.data,
                                                       context=request.user)
         if serializer.is_valid():
@@ -578,17 +678,21 @@ class UpdateUserNotificationAPIViewSet(viewsets.ModelViewSet):
 
 
 class SendSupportEmail(views.APIView):
-    """support email api"""
+    """support email api
+    payload
+    name
+    email
+    message
+    """
     permission_classes = (IsAuthenticated,)
 
     def post(self, request):
         name = request.data.get('name')
         sender = request.data.get('email')
-        subject = request.data.get('subject')
         message = request.data.get('message')
-        if name and sender and subject and message:
+        if name and sender and message:
             try:
-                send_support_email(name, sender, subject, message)
+                send_support_email(name, sender, message)
                 return custom_response(SUCCESS_CODE['3019'], response_status=status.HTTP_200_OK)
             except Exception as e:
                 return custom_error_response(str(e), response_status=status.HTTP_400_BAD_REQUEST)
@@ -622,3 +726,27 @@ class AccessTokenAPIView(views.APIView):
         data = {"auth_token": access_token}
         return custom_response(None, data, response_status=status.HTTP_200_OK)
 
+
+class ForceUpdateViewSet(GenericViewSet, mixins.CreateModelMixin):
+    """FAQ view set"""
+
+    serializer_class = ForceUpdateSerializer
+    http_method_names = ['post']
+
+
+    def create(self, request, *args, **kwargs):
+        """
+        faq create api method
+        :param request:
+        :param args: version, device type
+        :param kwargs:
+        :return: success message
+        """
+        if ForceUpdate.objects.all().count() >= 2:
+            return custom_error_response(ERROR_CODE['2080'], response_status=status.HTTP_400_BAD_REQUEST)
+        obj_data = [ForceUpdate(**item) for item in request.data]
+        try:
+            ForceUpdate.objects.bulk_create(obj_data)
+            return custom_response(SUCCESS_CODE["3046"], response_status=status.HTTP_200_OK)
+        except Exception as e:
+            return custom_error_response(str(e), response_status=status.HTTP_400_BAD_REQUEST)

base/constants.py

@@ -43,14 +43,18 @@ FILE_SIZE = 5 * 1024 * 1024
 
 # String constant for configurable date for allocation lock period
 ALLOCATION_LOCK_DATE = 1
-
+# guardian code status tuple
+guardian_code_tuple = ('1','3')
 """user type"""
 USER_TYPE = (
     ('1', 'junior'),
     ('2', 'guardian'),
     ('3', 'superuser')
 )
-
+DEVICE_TYPE = (
+    ('1', 'android'),
+    ('2', 'ios')
+)
 USER_TYPE_FLAG = {
     "FIRST" : "1",
     "TWO" : "2",

base/messages.py

@@ -101,10 +101,20 @@ ERROR_CODE = {
     "2072": "You can not approve or reject this task because junior does not exist in the system",
     "2073": "You can not approve or reject this junior because junior does not exist in the system",
     "2074": "You can not complete this task because you does not exist in the system",
+    # deactivate account
     "2075": "Your account is deactivated. Please contact with admin",
     "2076": "This junior already associate with you",
     "2077": "You can not add guardian",
     "2078": "This junior is not associate with you",
+    # force update
+    "2079": "Please update your app version for enjoying uninterrupted services",
+    "2080": "Can not add App version",
+    "2081": "A junior can only be associated with a maximum of 3 guardian",
+    # guardian code not exist
+    "2082": "Guardian code does not exist",
+    "2083": "You can not start this task because guardian is not associate with you",
+    "2084": "You can not complete this task because guardian is not associate with you",
+    "2085": "You can not take action on this task because junior is not associate with you"
 
 }
 """Success message code"""
@@ -115,11 +125,11 @@ SUCCESS_CODE = {
     # Success code for Thank you
     "3002": "Thank you for contacting us! Our Consumer Experience Team will reach out to you shortly.",
     # Success code for account activation
-    "3003": "Log in successful",
+    "3003": "Log in successful.",
     # Success code for password reset
-    "3004": "Password reset link has been sent to your email address",
+    "3004": "Password reset link has been sent to your email address.",
     # Success code for link verified
-    "3005": "Your account is deleted successfully.",
+    "3005": "Your account has been deleted successfully.",
     # Success code for password reset
     "3006": "Password reset successful. You can now log in with your new password.",
     # Success code for password update
@@ -127,11 +137,11 @@ SUCCESS_CODE = {
     # Success code for valid link
     "3008": "You have a valid link.",
     # Success code for logged out
-    "3009": "You have successfully logged out!",
+    "3009": "You have successfully logged out.",
     # Success code for check all fields
-    "3010": "All fields are valid",
+    "3010": "All fields are valid.",
-    "3011": "Email OTP Verified successfully",
+    "3011": "Email OTP has been verified successfully.",
-    "3012": "Phone OTP Verified successfully",
+    "3012": "Phone OTP has been verified successfully.",
     "3013": "Valid Guardian code",
     "3014": "Password has been updated successfully.",
     "3015": "Verification code has been sent on your email.",
@@ -140,38 +150,39 @@ SUCCESS_CODE = {
     "3018": "Task created successfully",
     "3019": "Support Email sent successfully",
     "3020": "Logged out successfully.",
-    "3021": "Add junior successfully",
+    "3021": "Junior has been added successfully.",
-    "3022": "Remove junior successfully",
+    "3022": "Junior has been removed successfully.",
-    "3023": "Junior is approved successfully",
+    "3023": "Junior has been approved successfully.",
-    "3024": "Junior request is rejected successfully",
+    "3024": "Junior request is rejected successfully.",
-    "3025": "Task is approved successfully",
+    "3025": "Task is approved successfully.",
-    "3026": "Task is rejected successfully",
+    "3026": "Task is rejected successfully.",
     "3027": "Article has been created successfully.",
     "3028": "Article has been updated successfully.",
     "3029": "Article has been deleted successfully.",
     "3030": "Article Card has been removed successfully.",
     "3031": "Article Survey has been removed successfully.",
-    "3032": "Task request sent successfully",
+    "3032": "Task request sent successfully.",
-    "3033": "Valid Referral code",
+    "3033": "Valid Referral code.",
-    "3034": "Invite guardian successfully",
+    "3034": "Invite guardian successfully.",
-    "3035": "Task started successfully",
+    "3035": "Task started successfully.",
-    "3036": "Task reassign successfully",
+    "3036": "Task reassign successfully.",
     "3037": "Profile has been updated successfully.",
     "3038": "Status has been changed successfully.",
     # notification read
-    "3039": "Notification read successfully",
+    "3039": "Notification read successfully.",
     # start article
-    "3040": "Start article successfully",
+    "3040": "Start article successfully.",
     # complete article
-    "3041": "Article completed successfully",
+    "3041": "Article completed successfully.",
     # submit assessment successfully
-    "3042": "Assessment completed successfully",
+    "3042": "Assessment completed successfully.",
     # read article
-    "3043": "Read article card successfully",
+    "3043": "Read article card successfully.",
     # remove guardian code request
-    "3044": "Remove guardian code request successfully",
+    "3044": "Remove guardian code request successfully.",
     # create faq
-    "3045": "Create FAQ data"
+    "3045": "Create FAQ data.",
+    "3046": "Add App version successfully."
 
 }
 """status code error"""

base/pagination.py

@@ -0,0 +1,46 @@
+"""
+web_admin pagination file
+"""
+# third party imports
+from collections import OrderedDict
+from rest_framework.pagination import PageNumberPagination
+
+from account.utils import custom_response
+from base.constants import NUMBER
+
+
+class CustomPageNumberPagination(PageNumberPagination):
+    """
+    custom paginator class
+    """
+    # Set the desired page size
+    page_size = NUMBER['ten']
+    page_size_query_param = 'page_size'
+    # Set a maximum page size if needed
+    max_page_size = NUMBER['hundred']
+
+    def get_paginated_response(self, data):
+        """
+        :param data: queryset to be paginated
+        :return: return a OrderedDict
+        """
+        return custom_response(None, OrderedDict([
+            ('count', self.page.paginator.count),
+            ('data', data),
+            ('current_page', self.page.number),
+            ('total_pages', self.page.paginator.num_pages),
+
+
+        ]))
+
+    def get_paginated_dict_response(self, data):
+        """
+        :param data: queryset to be paginated
+        :return: return a simple dict obj
+        """
+        return {
+            'count': self.page.paginator.count,
+            'data': data,
+            'current_page': self.page.number,
+            'total_pages': self.page.paginator.num_pages,
+        }

base/tasks.py

@@ -1,29 +1,88 @@
 """
 web_admin tasks file
 """
+import datetime
+
 # third party imports
 from celery import shared_task
 from templated_email import send_templated_mail
 
 # django imports
 from django.conf import settings
+from django.db.models import F, Window
+from django.db.models.functions.window import Rank
+
+# local imports
+from base.constants import PENDING, IN_PROGRESS, JUNIOR
+from guardian.models import JuniorTask
+from junior.models import JuniorPoints
+from notifications.constants import PENDING_TASK_EXPIRING, IN_PROGRESS_TASK_EXPIRING, NOTIFICATION_DICT, TOP_JUNIOR
+from notifications.models import Notification
+from notifications.utils import send_notification, get_from_user_details, send_notification_multiple_user
 
 
 @shared_task
-def send_email_otp(email, verification_code):
+def send_email(recipient_list, template, context: dict = None):
     """
     used to send otp on email
-    :param email: e-mail
+    :param context:
-    :param verification_code: otp
+    :param recipient_list: e-mail list
+    :param template: email template
     """
+    if context is None:
+        context = {}
     from_email = settings.EMAIL_FROM_ADDRESS
-    recipient_list = [email]
     send_templated_mail(
-        template_name='email_reset_verification.email',
+        template_name=template,
         from_email=from_email,
         recipient_list=recipient_list,
-        context={
+        context=context
-            'verification_code': verification_code
-        }
     )
     return True
+
+
+@shared_task()
+def notify_task_expiry():
+    """
+    task to send notification for those task which expiring soon
+    :return:
+    """
+    all_pending_tasks = JuniorTask.objects.filter(
+        task_status__in=[PENDING, IN_PROGRESS],
+        due_date__range=[datetime.datetime.now().date(),
+                         (datetime.datetime.now().date() + datetime.timedelta(days=1))])
+    if pending_tasks := all_pending_tasks.filter(task_status=PENDING):
+        for task in pending_tasks:
+            send_notification(PENDING_TASK_EXPIRING, None, None, task.junior.auth.id,
+                              {'task_id': task.id})
+    if in_progress_tasks := all_pending_tasks.filter(task_status=IN_PROGRESS):
+        for task in in_progress_tasks:
+            send_notification(IN_PROGRESS_TASK_EXPIRING, task.junior.auth.id, JUNIOR, task.guardian.user.id,
+                              {'task_id': task.id})
+    return True
+
+
+@shared_task()
+def notify_top_junior():
+    """
+    task to send notification for top leaderboard junior to all junior's
+    :return:
+    """
+    junior_points_qs = JuniorPoints.objects.filter(
+                                    junior__is_verified=True
+                                    ).select_related(
+                                    'junior', 'junior__auth'
+                                    ).annotate(rank=Window(
+                                            expression=Rank(),
+                                            order_by=[F('total_points').desc(), 'junior__created_at'])
+                                    ).order_by('-total_points', 'junior__created_at')
+
+    prev_top_position = junior_points_qs.filter(position=1).first()
+    new_top_position = junior_points_qs.filter(rank=1).first()
+    if prev_top_position != new_top_position:
+        send_notification_multiple_user(TOP_JUNIOR, new_top_position.junior.auth.id, JUNIOR,
+                                        {'points': new_top_position.total_points})
+    for junior_point in junior_points_qs:
+        junior_point.position = junior_point.rank
+        junior_point.save()
+    return True

docker-compose-prod.yml

@@ -0,0 +1,39 @@
+version: '3'  
+services:  
+  nginx:
+    image: nginx:latest
+    container_name: nginx
+    restart: always
+    ports:
+      - "8000:8000"
+    volumes:
+      - ./nginx:/etc/nginx/conf.d
+      - .:/usr/src/app
+    depends_on:
+      - web
+  web:
+    build: .
+    container_name: prod_django
+    restart: always
+    command: bash -c "pip install -r requirements.txt && python manage.py collectstatic --noinput && python manage.py migrate && gunicorn zod_bank.wsgi -b 0.0.0.0:8000 -t 300 --log-level=info"
+    volumes:
+      - .:/usr/src/app
+
+  broker:
+    image: rabbitmq:3.7
+    container_name: prod_rabbitmq
+    volumes:
+      - .:/usr/src/app
+    ports:
+      - 5673:5673
+
+  worker:
+    build: .
+    image: celery
+    container_name: prod_celery
+    restart: "always"
+    command: bash -c " celery -A zod_bank.celery worker --concurrency=1 -B -l DEBUG -E"
+    volumes:
+      - .:/usr/src/app
+    depends_on:
+      - broker

docker-compose-qa.yml

@@ -0,0 +1,39 @@
+version: '3'  
+services:  
+  nginx:
+    image: nginx:latest
+    container_name: nginx
+    restart: always
+    ports:
+      - "8000:8000"
+    volumes:
+      - ./nginx:/etc/nginx/conf.d
+      - .:/usr/src/app
+    depends_on:
+      - web
+  web:
+    build: .
+    container_name: qa_django
+    restart: always
+    command: bash -c "pip install -r requirements.txt && python manage.py collectstatic --noinput && python manage.py migrate && gunicorn zod_bank.wsgi -b 0.0.0.0:8000 -t 300 --log-level=info"
+    volumes:
+      - .:/usr/src/app
+
+  broker:
+    image: rabbitmq:3.7
+    container_name: qa_rabbitmq
+    volumes:
+      - .:/usr/src/app
+    ports:
+      - 5673:5673
+
+  worker:
+    build: .
+    image: celery
+    container_name: qa_celery
+    restart: "always"
+    command: bash -c " celery -A zod_bank.celery worker --concurrency=1 -B -l DEBUG -E"
+    volumes:
+      - .:/usr/src/app
+    depends_on:
+      - broker

docker-compose-stage.yml

@@ -0,0 +1,39 @@
+version: '3'  
+services:  
+  nginx:
+    image: nginx:latest
+    container_name: nginx
+    restart: always
+    ports:
+      - "8000:8000"
+    volumes:
+      - ./nginx:/etc/nginx/conf.d
+      - .:/usr/src/app
+    depends_on:
+      - web
+  web:
+    build: .
+    container_name: stage_django
+    restart: always
+    command: bash -c "pip install -r requirements.txt && python manage.py collectstatic --noinput && python manage.py migrate && gunicorn zod_bank.wsgi -b 0.0.0.0:8000 -t 300 --log-level=info"
+    volumes:
+      - .:/usr/src/app
+
+  broker:
+    image: rabbitmq:3.7
+    container_name: stage_rabbitmq
+    volumes:
+      - .:/usr/src/app
+    ports:
+      - 5673:5673
+
+  worker:
+    build: .
+    image: celery
+    container_name: stage_celery
+    restart: "always"
+    command: bash -c " celery -A zod_bank.celery worker --concurrency=1 -B -l DEBUG -E"
+    volumes:
+      - .:/usr/src/app
+    depends_on:
+      - broker

guardian/serializers.py

@@ -24,18 +24,19 @@ from account.models import UserProfile, UserEmailOtp, UserNotification
 from account.utils import generate_code
 from junior.serializers import JuniorDetailSerializer
 from base.messages import ERROR_CODE, SUCCESS_CODE
-from base.constants import NUMBER, JUN, ZOD, GRD, Already_register_user
+from base.constants import NUMBER, JUN, ZOD, GRD, Already_register_user, GUARDIAN
 from junior.models import Junior, JuniorPoints, JuniorGuardianRelationship
 from .utils import real_time, convert_timedelta_into_datetime, update_referral_points
 # notification's constant
-from notifications.constants import TASK_POINTS, TASK_REJECTED
+from notifications.constants import TASK_APPROVED, TASK_REJECTED, TASK_ASSIGNED
 # send notification function
-from notifications.utils import send_notification, send_notification_to_junior
+from notifications.utils import send_notification
 from django.core.exceptions import ValidationError
 from django.utils.translation import gettext as _
 
 # In this serializer file
 # define user serializer,
+# define password validation
 # create guardian serializer,
 # task serializer,
 # guardian serializer,
@@ -47,6 +48,7 @@ from django.utils.translation import gettext as _
 from rest_framework import serializers
 
 class PasswordValidator:
+    """Password validation"""
     def __init__(self, min_length=8, max_length=None, require_uppercase=True, require_numbers=True):
         self.min_length = min_length
         self.max_length = max_length
@@ -57,6 +59,7 @@ class PasswordValidator:
         self.enforce_password_policy(value)
 
     def enforce_password_policy(self, password):
+        # add validation for password
         special_characters = "!@#$%^&*()_-+=<>?/[]{}|"
         if len(password) < self.min_length:
             raise serializers.ValidationError(
@@ -64,16 +67,20 @@ class PasswordValidator:
             )
 
         if self.max_length is not None and len(password) > self.max_length:
+            # must be 8 character
             raise serializers.ValidationError(
                 _("Password must be at most %(max_length)d characters long.") % {'max_length': self.max_length}
             )
 
         if self.require_uppercase and not any(char.isupper() for char in password):
+            # must contain upper case letter
             raise serializers.ValidationError(_("Password must contain at least one uppercase letter."))
 
         if self.require_numbers and not any(char.isdigit() for char in password):
+            # must contain digit
             raise serializers.ValidationError(_("Password must contain at least one digit."))
         if self.require_numbers and not any(char in special_characters for char in password):
+            # must contain special character
             raise serializers.ValidationError(_("Password must contain at least one special character."))
 
 
@@ -211,7 +218,7 @@ class TaskSerializer(serializers.ModelSerializer):
     class Meta(object):
         """Meta info"""
         model = JuniorTask
-        fields = ['id', 'task_name','task_description','points', 'due_date', 'junior', 'default_image']
+        fields = ['id', 'task_name','task_description','points', 'due_date','default_image']
 
     def validate_due_date(self, value):
         """validation on due date"""
@@ -222,11 +229,22 @@ class TaskSerializer(serializers.ModelSerializer):
         return value
     def create(self, validated_data):
         """create default task image data"""
-        validated_data['guardian'] = Guardian.objects.filter(user=self.context['user']).last()
+        guardian = self.context['guardian']
         # update image of the task
         images = self.context['image']
-        validated_data['default_image'] = images
+        junior_data = self.context['junior_data']
-        instance = JuniorTask.objects.create(**validated_data)
+        tasks_created = []
+
+        for junior in junior_data:
+            # create task
+            task_data = validated_data.copy()
+            task_data['guardian'] = guardian
+            task_data['default_image'] = images
+            task_data['junior'] = junior
+            instance = JuniorTask.objects.create(**task_data)
+            tasks_created.append(instance)
+            send_notification.delay(TASK_ASSIGNED, guardian.user.id, GUARDIAN,
+                                    junior.auth.id, {'task_id': instance.id})
         return instance
 
 class GuardianDetailSerializer(serializers.ModelSerializer):
@@ -316,10 +334,11 @@ class TaskDetailsjuniorSerializer(serializers.ModelSerializer):
                   'requested_on', 'rejected_on', 'completed_on',
                   'junior', 'task_status', 'is_active', 'remaining_time', 'created_at','updated_at']
 
+
 class TopJuniorSerializer(serializers.ModelSerializer):
     """Top junior serializer"""
     junior = JuniorDetailSerializer()
-    position = serializers.IntegerField()
+    position = serializers.SerializerMethodField()
 
     class Meta(object):
         """Meta info"""
@@ -329,9 +348,13 @@ class TopJuniorSerializer(serializers.ModelSerializer):
     def to_representation(self, instance):
         """Convert instance to representation"""
         representation = super().to_representation(instance)
-        representation['position'] = instance.position
         return representation
 
+    @staticmethod
+    def get_position(obj):
+        """ get position/rank """
+        return obj.rank
+
 
 class GuardianProfileSerializer(serializers.ModelSerializer):
     """junior serializer"""
@@ -390,9 +413,9 @@ class ApproveJuniorSerializer(serializers.ModelSerializer):
     def create(self, validated_data):
         """update guardian code"""
         instance = self.context['junior']
-        instance.guardian_code = [self.context['guardian_code']]
+        guardian_code = self.context['guardian_code']
-        instance.guardian_code_approved = True
+        index = instance.guardian_code.index(guardian_code)
-        instance.guardian_code_status = str(NUMBER['two'])
+        instance.guardian_code_status[index] = str(NUMBER['two'])
         instance.save()
         return instance
 
@@ -420,8 +443,8 @@ class ApproveTaskSerializer(serializers.ModelSerializer):
                 # update complete time of task
                 # instance.completed_on = real_time()
                 instance.completed_on = timezone.now().astimezone(pytz.utc)
-                send_notification_to_junior.delay(TASK_POINTS, None, junior_details.auth.id,
+                send_notification.delay(TASK_APPROVED, instance.guardian.user.id, GUARDIAN,
-                                                  {'task_id': instance.id})
+                                        junior_details.auth.id, {'task_id': instance.id})
             else:
                 # reject the task
                 instance.task_status = str(NUMBER['three'])
@@ -429,8 +452,8 @@ class ApproveTaskSerializer(serializers.ModelSerializer):
                 # update reject time of task
                 # instance.rejected_on = real_time()
                 instance.rejected_on = timezone.now().astimezone(pytz.utc)
-                send_notification_to_junior.delay(TASK_REJECTED, None, junior_details.auth.id,
+                send_notification.delay(TASK_REJECTED, instance.guardian.user.id, GUARDIAN,
-                                                  {'task_id': instance.id})
+                                        junior_details.auth.id, {'task_id': instance.id})
             instance.save()
             junior_data.save()
             return junior_details
@@ -500,4 +523,7 @@ class GuardianDetailListSerializer(serializers.ModelSerializer):
 
     def get_guardian_code_status(self,obj):
         """guardian code status"""
-        return obj.junior.guardian_code_status
+        if obj.guardian.guardian_code in obj.junior.guardian_code:
+            index = obj.junior.guardian_code.index(obj.guardian.guardian_code)
+            data = obj.junior.guardian_code_status[index]
+            return data

guardian/urls.py

@@ -1,7 +1,7 @@
 """ Urls files"""
 """Django import"""
 from django.urls import path, include
-from .views import (SignupViewset, UpdateGuardianProfile, AllTaskListAPIView, CreateTaskAPIView, TaskListAPIView,
+from .views import (SignupViewset, UpdateGuardianProfile, CreateTaskAPIView, TaskListAPIView,
                     SearchTaskListAPIView, TopJuniorListAPIView, ApproveJuniorAPIView, ApproveTaskAPIView,
                     GuardianListAPIView)
 """Third party import"""
@@ -25,8 +25,6 @@ router.register('sign-up', SignupViewset, basename='sign-up')
 router.register('create-guardian-profile', UpdateGuardianProfile, basename='update-guardian-profile')
 # Create Task  API"""
 router.register('create-task', CreateTaskAPIView, basename='create-task')
-# All Task list API"""
-router.register('all-task-list', AllTaskListAPIView, basename='all-task-list')
 # Task list bases on the status API"""
 router.register('task-list', TaskListAPIView, basename='task-list')
 # Leaderboard API"""

guardian/utils.py

@@ -21,7 +21,7 @@ from zod_bank.celery import app
 # notification's constant
 from notifications.constants import REFERRAL_POINTS
 # send notification function
-from notifications.utils import send_notification, send_notification_to_junior
+from notifications.utils import send_notification
 
 
 # Define upload image on
@@ -117,7 +117,7 @@ def update_referral_points(referral_code, referral_code_used):
             junior_query.total_points = junior_query.total_points + NUMBER['five']
             junior_query.referral_points = junior_query.referral_points + NUMBER['five']
             junior_query.save()
-            send_notification_to_junior.delay(REFERRAL_POINTS, None, junior_queryset.auth.id, {})
+            send_notification.delay(REFERRAL_POINTS, None, None, junior_queryset.auth.id, {})
 
 
 
@@ -127,7 +127,7 @@ def update_expired_task_status(data=None):
     Update task of the status if due date is in past
     """
     try:
-        task_status = [str(NUMBER['one']), str(NUMBER['two']), str(NUMBER['four'])]
+        task_status = [str(NUMBER['one']), str(NUMBER['two'])]
         JuniorTask.objects.filter(due_date__lt=datetime.today().date(),
                                   task_status__in=task_status).update(task_status=str(NUMBER['six']))
     except ObjectDoesNotExist as e:

guardian/views.py

@@ -1,4 +1,5 @@
 """Views of Guardian"""
+import math
 
 # django imports
 # Import IsAuthenticated
@@ -6,14 +7,17 @@
 # Import PageNumberPagination
 # Import User
 # Import timezone
+from django.db.models import F, Window
+from django.db.models.functions.window import Rank
 from rest_framework.permissions import IsAuthenticated
 from rest_framework import viewsets, status
 from rest_framework.pagination import PageNumberPagination
 from django.contrib.auth.models import User
-
+from base.constants import guardian_code_tuple
 from rest_framework.filters import SearchFilter
 from django.utils import timezone
 
+from base.pagination import CustomPageNumberPagination
 # Import guardian's model,
 # Import junior's model,
 # Import account's model,
@@ -32,14 +36,14 @@ from .serializers import (UserSerializer, CreateGuardianSerializer, TaskSerializ
                           GuardianDetailListSerializer)
 from .models import Guardian, JuniorTask
 from junior.models import Junior, JuniorPoints, JuniorGuardianRelationship
-from account.models import UserEmailOtp, UserNotification
+from account.models import UserEmailOtp, UserNotification, UserDeviceDetails
 from .tasks import generate_otp
-from account.utils import custom_response, custom_error_response, OTP_EXPIRY, send_otp_email
+from account.utils import custom_response, custom_error_response, send_otp_email, task_status_fun
 from base.messages import ERROR_CODE, SUCCESS_CODE
-from base.constants import NUMBER, GUARDIAN_CODE_STATUS
+from base.constants import NUMBER, GUARDIAN_CODE_STATUS, GUARDIAN
 from .utils import upload_image_to_alibaba
-from notifications.constants import REGISTRATION, TASK_ASSIGNED, LEADERBOARD_RANKING
+from notifications.constants import REGISTRATION, TASK_ASSIGNED, ASSOCIATE_APPROVED, ASSOCIATE_REJECTED
-from notifications.utils import send_notification_to_junior
+from notifications.utils import send_notification
 
 """ Define APIs """
 # Define Signup API,
@@ -57,12 +61,14 @@ class SignupViewset(viewsets.ModelViewSet):
     """Signup view set"""
     queryset = User.objects.all()
     serializer_class = UserSerializer
+    http_method_names = ('post',)
     def create(self, request, *args, **kwargs):
         """Create user profile"""
+        device_id = request.META.get('HTTP_DEVICE_ID')
         if request.data['user_type'] in [str(NUMBER['one']), str(NUMBER['two'])]:
             serializer = UserSerializer(context=request.data['user_type'], data=request.data)
             if serializer.is_valid():
-                serializer.save()
+                user = serializer.save()
                 """Generate otp"""
                 otp = generate_otp()
                 # expire otp after 1 day
@@ -71,19 +77,20 @@ class SignupViewset(viewsets.ModelViewSet):
                 UserEmailOtp.objects.create(email=request.data['email'], otp=otp,
                                             user_type=str(request.data['user_type']), expired_at=expiry)
                 """Send email to the register user"""
-                send_otp_email(request.data['email'], otp)
+                send_otp_email.delay(request.data['email'], otp)
+                UserDeviceDetails.objects.create(user=user, device_id=device_id)
                 return custom_response(SUCCESS_CODE['3001'],
                                        response_status=status.HTTP_200_OK)
             return custom_error_response(serializer.errors, response_status=status.HTTP_400_BAD_REQUEST)
         else:
             return custom_error_response(ERROR_CODE['2028'], response_status=status.HTTP_400_BAD_REQUEST)
 
-class UpdateGuardianProfile(viewsets.ViewSet):
+
-    """
+class UpdateGuardianProfile(viewsets.ModelViewSet):
-    Update guardian profile
+    """Update guardian profile"""
-    """
     serializer_class = CreateGuardianSerializer
     permission_classes = [IsAuthenticated]
+    http_method_names = ('post',)
 
     def create(self, request, *args, **kwargs):
         """Create guardian profile"""
@@ -126,7 +133,12 @@ class AllTaskListAPIView(viewsets.ModelViewSet):
 
 
 class TaskListAPIView(viewsets.ModelViewSet):
-    """Update guardian profile"""
+    """Task list
+    Params
+    status
+    search
+    page
+    junior"""
     serializer_class = TaskDetailsSerializer
     permission_classes = [IsAuthenticated]
     filter_backends = (SearchFilter,)
@@ -136,8 +148,8 @@ class TaskListAPIView(viewsets.ModelViewSet):
 
     def get_queryset(self):
         queryset = JuniorTask.objects.filter(guardian__user=self.request.user
-                                             ).prefetch_related('junior', 'junior__auth'
+                                             ).select_related('junior', 'junior__auth'
-                                                                ).order_by('due_date', 'created_at')
+                                                              ).order_by('due_date', 'created_at')
 
         queryset = self.filter_queryset(queryset)
         return queryset
@@ -145,15 +157,19 @@ class TaskListAPIView(viewsets.ModelViewSet):
     def list(self, request, *args, **kwargs):
         """Create guardian profile"""
         status_value = self.request.GET.get('status')
+        junior = self.request.GET.get('junior')
         queryset = self.get_queryset()
-        if status_value and status_value != '0':
+        task_status = task_status_fun(status_value)
-            queryset = queryset.filter(task_status=status_value)
+        if status_value:
-        paginator = self.pagination_class()
+            queryset = queryset.filter(task_status__in=task_status)
+        if junior:
+            queryset = queryset.filter(junior=int(junior))
+        paginator = CustomPageNumberPagination()
         # use Pagination
         paginated_queryset = paginator.paginate_queryset(queryset, request)
         # use TaskDetailsSerializer serializer
         serializer = self.serializer_class(paginated_queryset, many=True)
-        return custom_response(None, serializer.data, response_status=status.HTTP_200_OK)
+        return paginator.get_paginated_response(serializer.data)
 
 
 class CreateTaskAPIView(viewsets.ModelViewSet):
@@ -163,47 +179,63 @@ class CreateTaskAPIView(viewsets.ModelViewSet):
     http_method_names = ('post', )
 
     def create(self, request, *args, **kwargs):
+        """
+        image should be in form data
+        """
         try:
             image = request.data['default_image']
-            junior = request.data['junior']
+            junior_ids = request.data['junior'].split(',')
-            junior_id = Junior.objects.filter(id=junior).last()
+
-            guardian_data = Guardian.objects.filter(user=request.user).last()
+            invalid_junior_ids = [junior_id for junior_id in junior_ids if not junior_id.isnumeric()]
-            if guardian_data.guardian_code in junior_id.guardian_code:
+            if invalid_junior_ids:
-                return custom_error_response(ERROR_CODE['2078'], response_status=status.HTTP_400_BAD_REQUEST)
+                # At least one junior value is not an integer
+                return custom_error_response(ERROR_CODE['2047'], response_status=status.HTTP_400_BAD_REQUEST)
+
             allowed_extensions = ['.jpg', '.jpeg', '.png']
             if not any(extension in str(image) for extension in allowed_extensions):
                 return custom_error_response(ERROR_CODE['2048'], response_status=status.HTTP_400_BAD_REQUEST)
-            if not junior.isnumeric():
-                """junior value must be integer"""
-                return custom_error_response(ERROR_CODE['2047'], response_status=status.HTTP_400_BAD_REQUEST)
-            data = request.data
             if 'https' in str(image):
                 image_data = image
             else:
                 filename = f"images/{image}"
                 if image and image.size == NUMBER['zero']:
-                    return custom_error_response(ERROR_CODE['2035'], response_status=status.HTTP_400_BAD_REQUEST)
+                    return custom_error_response(ERROR_CODE['2035'],
-                image_url = upload_image_to_alibaba(image, filename)
+                                                 response_status=status.HTTP_400_BAD_REQUEST)
-                image_data = image_url
+                image_data = upload_image_to_alibaba(image, filename)
-                data.pop('default_image')
+                request.data.pop('default_image')
+
+            guardian = Guardian.objects.filter(user=request.user).select_related('user').last()
+            junior_data = Junior.objects.filter(id__in=junior_ids,
+                                                guardian_code__contains=[guardian.guardian_code]
+                                                ).select_related('auth')
+            if junior_data:
+                for junior in junior_data:
+                    index = junior.guardian_code.index(guardian.guardian_code)
+                    status_index = junior.guardian_code_status[index]
+                    if status_index == str(NUMBER['three']):
+                        return custom_error_response(ERROR_CODE['2078'], response_status=status.HTTP_400_BAD_REQUEST)
+            else:
+                return custom_error_response(ERROR_CODE['2047'], response_status=status.HTTP_400_BAD_REQUEST)
+
             # use TaskSerializer serializer
-            serializer = TaskSerializer(context={"user":request.user, "image":image_data}, data=data)
+            serializer = TaskSerializer(context={"guardian": guardian, "image": image_data,
+                                                 "junior_data": junior_data}, data=request.data)
             if serializer.is_valid():
                 # save serializer
-                task = serializer.save()
+                serializer.save()
-
+                # removed send notification method and used in serializer
-                send_notification_to_junior.delay(TASK_ASSIGNED, request.auth.payload['user_id'],
+                return custom_response(SUCCESS_CODE['3018'], response_status=status.HTTP_200_OK)
-                                                  junior_id.auth.id, {'task_id': task.id})
-                return custom_response(SUCCESS_CODE['3018'], serializer.data, response_status=status.HTTP_200_OK)
             return custom_error_response(serializer.errors, response_status=status.HTTP_400_BAD_REQUEST)
         except Exception as e:
             return custom_error_response(str(e), response_status=status.HTTP_400_BAD_REQUEST)
 
+
 class SearchTaskListAPIView(viewsets.ModelViewSet):
-    """Update guardian profile"""
+    """Filter task"""
     serializer_class = TaskDetailsSerializer
     permission_classes = [IsAuthenticated]
     pagination_class = PageNumberPagination
+    http_method_names = ('get',)
 
     def get_queryset(self):
         """Get the queryset for the view"""
@@ -214,7 +246,7 @@ class SearchTaskListAPIView(viewsets.ModelViewSet):
         return junior_queryset
 
     def list(self, request, *args, **kwargs):
-        """Create guardian profile"""
+        """Filter task"""
         try:
             queryset = self.get_queryset()
             paginator = self.pagination_class()
@@ -228,10 +260,11 @@ class SearchTaskListAPIView(viewsets.ModelViewSet):
 
 
 class TopJuniorListAPIView(viewsets.ModelViewSet):
-    """Top juniors list"""
+    """Top juniors list
-    queryset = JuniorPoints.objects.all()
+    No Params"""
     serializer_class = TopJuniorSerializer
     permission_classes = [IsAuthenticated]
+    http_method_names = ('get',)
 
     def get_serializer_context(self):
         # context list
@@ -239,29 +272,38 @@ class TopJuniorListAPIView(viewsets.ModelViewSet):
         context.update({'view': self})
         return context
 
+    def get_queryset(self):
+        queryset = JuniorPoints.objects.filter(
+                                junior__is_verified=True
+                                ).select_related(
+                                'junior', 'junior__auth'
+                                ).annotate(rank=Window(
+                                    expression=Rank(),
+                                    order_by=[F('total_points').desc(), 'junior__created_at'])
+                                ).order_by('-total_points', 'junior__created_at')
+        return queryset
+
     def list(self, request, *args, **kwargs):
         """Fetch junior list of those who complete their tasks"""
         try:
-            junior_total_points = self.get_queryset().order_by('-total_points')
+            junior_total_points = self.get_queryset()[:15]
-            # Update the position field for each JuniorPoints object
+            serializer = self.get_serializer(junior_total_points, many=True)
-            for index, junior in enumerate(junior_total_points):
-                junior.position = index + 1
-                # send_notification_to_junior.delay(LEADERBOARD_RANKING, None, junior.junior.auth.id, {})
-                junior.save()
-            serializer = self.get_serializer(junior_total_points[:NUMBER['fifteen']], many=True)
             return custom_response(None, serializer.data, response_status=status.HTTP_200_OK)
         except Exception as e:
             return custom_error_response(str(e), response_status=status.HTTP_400_BAD_REQUEST)
 
 
-class ApproveJuniorAPIView(viewsets.ViewSet):
+class ApproveJuniorAPIView(viewsets.ModelViewSet):
     """approve junior by guardian"""
     serializer_class = ApproveJuniorSerializer
     permission_classes = [IsAuthenticated]
-
+    http_method_names = ('post',)
 
     def create(self, request, *args, **kwargs):
-        """ junior list"""
+        """ Use below param
+        {"junior_id":"75",
+        "action":"1"}
+        """
         try:
             guardian = Guardian.objects.filter(user__email=self.request.user).last()
             # fetch junior query
@@ -272,28 +314,43 @@ class ApproveJuniorAPIView(viewsets.ViewSet):
             if request.data['action'] == '1':
                 # use ApproveJuniorSerializer serializer
                 serializer = ApproveJuniorSerializer(context={"guardian_code": guardian.guardian_code,
-                                                              "junior": junior_queryset, "action": request.data['action']},
+                                                              "junior": junior_queryset,
+                                                              "action": request.data['action']},
                                                      data=request.data)
                 if serializer.is_valid():
                     # save serializer
                     serializer.save()
+                    send_notification.delay(ASSOCIATE_APPROVED, guardian.user.id, GUARDIAN,
+                                            junior_queryset.auth.id, {})
                     return custom_response(SUCCESS_CODE['3023'], serializer.data, response_status=status.HTTP_200_OK)
             else:
-                junior_queryset.guardian_code = None
+                if junior_queryset.guardian_code and ('-' in junior_queryset.guardian_code):
-                junior_queryset.guardian_code_status = str(NUMBER['one'])
+                    junior_queryset.guardian_code.remove('-')
+                if junior_queryset.guardian_code_status and ('-' in junior_queryset.guardian_code_status):
+                    junior_queryset.guardian_code_status.remove('-')
+                index = junior_queryset.guardian_code.index(guardian.guardian_code)
+                junior_queryset.guardian_code.remove(guardian.guardian_code)
+                junior_queryset.guardian_code_status.pop(index)
                 junior_queryset.save()
+                send_notification.delay(ASSOCIATE_REJECTED, guardian.user.id, GUARDIAN, junior_queryset.auth.id, {})
                 return custom_response(SUCCESS_CODE['3024'], response_status=status.HTTP_200_OK)
         except Exception as e:
             return custom_error_response(str(e), response_status=status.HTTP_400_BAD_REQUEST)
 
 
-class ApproveTaskAPIView(viewsets.ViewSet):
+class ApproveTaskAPIView(viewsets.ModelViewSet):
     """approve junior by guardian"""
     serializer_class = ApproveTaskSerializer
     permission_classes = [IsAuthenticated]
-
+    http_method_names = ('post',)
     def create(self, request, *args, **kwargs):
-        """ junior list"""
+        """ Params
+        {"junior_id":"82",
+        "task_id":"43",
+        "action":"1"}
+        action 1 for approve
+        2 for reject
+        """
         # action 1 is use for approve and 2 for reject
         try:
             guardian = Guardian.objects.filter(user__email=self.request.user).last()
@@ -301,6 +358,8 @@ class ApproveTaskAPIView(viewsets.ViewSet):
             task_queryset = JuniorTask.objects.filter(id=self.request.data.get('task_id'),
                                                       guardian=guardian,
                                                       junior=self.request.data.get('junior_id')).last()
+            if task_queryset and guardian.guardian_code not in task_queryset.junior.guardian_code:
+                return custom_error_response(ERROR_CODE['2084'], response_status=status.HTTP_400_BAD_REQUEST)
             if task_queryset and (task_queryset.junior.is_deleted or not task_queryset.junior.is_active):
                 return custom_error_response(ERROR_CODE['2072'], response_status=status.HTTP_400_BAD_REQUEST)
             # use ApproveJuniorSerializer serializer
@@ -321,10 +380,10 @@ class ApproveTaskAPIView(viewsets.ViewSet):
                 serializer.save()
                 return custom_response(SUCCESS_CODE['3026'], response_status=status.HTTP_200_OK)
             else:
-                return custom_response(ERROR_CODE['2038'], response_status=status.HTTP_400_BAD_REQUEST)
+                return custom_error_response(ERROR_CODE['2038'], response_status=status.HTTP_400_BAD_REQUEST)
         except Exception as e:
             return custom_error_response(str(e), response_status=status.HTTP_400_BAD_REQUEST)
-
+#
 class GuardianListAPIView(viewsets.ModelViewSet):
     """Guardian list of assosicated junior"""
 
@@ -333,7 +392,8 @@ class GuardianListAPIView(viewsets.ModelViewSet):
     http_method_names = ('get',)
 
     def list(self, request, *args, **kwargs):
-        """ junior list"""
+        """ Guardian list of assosicated junior
+        No Params"""
         try:
             guardian_data = JuniorGuardianRelationship.objects.filter(junior__auth__email=self.request.user)
             # fetch junior object

junior/migrations/0030_remove_junior_guardian_code_status.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.2.2 on 2023-08-26 08:59
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('junior', '0029_junior_is_deleted'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='junior',
+            name='guardian_code_status',
+        ),
+    ]

junior/migrations/0031_junior_guardian_code_status.py

@@ -0,0 +1,19 @@
+# Generated by Django 4.2.2 on 2023-08-26 08:59
+
+import django.contrib.postgres.fields
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('junior', '0030_remove_junior_guardian_code_status'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='junior',
+            name='guardian_code_status',
+            field=django.contrib.postgres.fields.ArrayField(base_field=models.CharField(blank=True, default=None, max_length=10, null=True), null=True, size=None),
+        ),
+    ]

junior/models.py

@@ -76,9 +76,9 @@ class Junior(models.Model):
     is_verified = models.BooleanField(default=False)
     """guardian code is approved or not"""
     guardian_code_approved = models.BooleanField(default=False)
-    # guardian code status"""
+    # # guardian code status"""
-    guardian_code_status = models.CharField(max_length=31, choices=GUARDIAN_CODE_STATUS, default='1',
+    guardian_code_status = ArrayField(models.CharField(max_length=10, null=True, blank=True, default=None), null=True,
-                                            null=True, blank=True)
+                                      )
     # Profile created and updated time"""
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)

junior/serializers.py

@@ -11,20 +11,20 @@ from django.utils import timezone
 from rest_framework_simplejwt.tokens import RefreshToken
 
 # local imports
-from account.utils import send_otp_email, generate_code
+from account.utils import send_otp_email, generate_code, make_special_password
 from junior.models import Junior, JuniorPoints, JuniorGuardianRelationship, JuniorArticlePoints, FAQ
 from guardian.tasks import generate_otp
 from base.messages import ERROR_CODE, SUCCESS_CODE
 from base.constants import (PENDING, IN_PROGRESS, REJECTED, REQUESTED, COMPLETED, NUMBER, JUN, ZOD, EXPIRED,
-                            GUARDIAN_CODE_STATUS)
+                            GUARDIAN_CODE_STATUS, JUNIOR)
 from guardian.models import Guardian, JuniorTask
 from account.models import UserEmailOtp, UserNotification
-from junior.utils import junior_notification_email, junior_approval_mail
+from junior.utils import junior_notification_email, junior_approval_mail, get_junior_leaderboard_rank
 from guardian.utils import real_time, update_referral_points, convert_timedelta_into_datetime
-from notifications.utils import send_notification, send_notification_to_junior, send_notification_to_guardian
+from notifications.utils import send_notification
-from notifications.constants import (INVITED_GUARDIAN, APPROVED_JUNIOR, SKIPPED_PROFILE_SETUP, TASK_ACTION,
+from notifications.constants import (ASSOCIATE_REQUEST, ASSOCIATE_JUNIOR, TASK_ACTION,
-                                     TASK_SUBMITTED)
+                                     )
-
+from web_admin.models import ArticleCard
 
 class ListCharField(serializers.ListField):
     """Serializer for Array field"""
@@ -88,17 +88,27 @@ class CreateJuniorSerializer(serializers.ModelSerializer):
         if junior:
             """update details according to the data get from request"""
             junior.gender = validated_data.get('gender',junior.gender)
-            """Update guardian code"""
+            # Update guardian code"""
-            junior.guardian_code = validated_data.get('guardian_code', junior.guardian_code)
+            # condition for guardian code
-            """condition for guardian code"""
             if guardian_code:
-                junior.guardian_code = guardian_code
+                if junior.guardian_code and guardian_code:
+                    if guardian_code[0] in junior.guardian_code:
+                        raise serializers.ValidationError({"error":ERROR_CODE['2076'],"code":"400", "status":"failed"})
+                if not junior.guardian_code:
+                    junior.guardian_code = []
+                    junior.guardian_code_status = []
+                    junior.guardian_code.extend(guardian_code)
+                    junior.guardian_code_status.extend(str(NUMBER['three']))
+                elif len(junior.guardian_code) < 3 and len(guardian_code) < 3:
+                    junior.guardian_code.extend(guardian_code)
+                    junior.guardian_code_status.extend(str(NUMBER['three']))
+                else:
+                    raise serializers.ValidationError({"error":ERROR_CODE['2081'],"code":"400", "status":"failed"})
                 guardian_data = Guardian.objects.filter(guardian_code=guardian_code[0]).last()
                 if guardian_data:
                     JuniorGuardianRelationship.objects.get_or_create(guardian=guardian_data, junior=junior)
-                junior.guardian_code_status = str(NUMBER['three'])
+                    send_notification.delay(ASSOCIATE_REQUEST, junior.auth.id, JUNIOR, guardian_data.user.id, {})
-                junior_approval_mail(user.email, user.first_name)
+                junior_approval_mail.delay(user.email, user.first_name)
-                send_notification_to_guardian.delay(APPROVED_JUNIOR, junior.auth.id, guardian_data.user.id, {})
             junior.dob = validated_data.get('dob', junior.dob)
             junior.passcode = validated_data.get('passcode', junior.passcode)
             junior.country_name = validated_data.get('country_name', junior.country_name)
@@ -163,6 +173,7 @@ class JuniorDetailListSerializer(serializers.ModelSerializer):
     rejected_task = serializers.SerializerMethodField('get_rejected_task')
     pending_task = serializers.SerializerMethodField('get_pending_task')
     position = serializers.SerializerMethodField('get_position')
+    guardian_code_status = serializers.SerializerMethodField('get_guardian_code_status')
 
 
     def get_auth(self, obj):
@@ -179,9 +190,8 @@ class JuniorDetailListSerializer(serializers.ModelSerializer):
         return data
 
     def get_position(self, obj):
-        data = JuniorPoints.objects.filter(junior=obj).last()
+        return get_junior_leaderboard_rank(obj)
-        if data:
+
-            return data.position
     def get_points(self, obj):
         data = JuniorPoints.objects.filter(junior=obj).last()
         if data:
@@ -208,6 +218,13 @@ class JuniorDetailListSerializer(serializers.ModelSerializer):
     def get_pending_task(self, obj):
         data = JuniorTask.objects.filter(junior=obj, task_status=PENDING).count()
         return data
+
+    def get_guardian_code_status(self, obj):
+        if self.context['guardian_code'] in obj.guardian_code:
+            index = obj.guardian_code.index(self.context['guardian_code'])
+            if obj.guardian_code_status:
+                data = obj.guardian_code_status[index]
+                return data
     class Meta(object):
         """Meta info"""
         model = Junior
@@ -280,8 +297,8 @@ class AddJuniorSerializer(serializers.ModelSerializer):
             user_data = User.objects.create(username=email, email=email,
                                             first_name=self.context['first_name'],
                                             last_name=self.context['last_name'])
-            password = User.objects.make_random_password()
+            special_password = make_special_password()
-            user_data.set_password(password)
+            user_data.set_password(special_password)
             user_data.save()
             junior_data = Junior.objects.create(auth=user_data, gender=validated_data.get('gender'),
                                                 image=profile_image,
@@ -291,7 +308,7 @@ class AddJuniorSerializer(serializers.ModelSerializer):
                                                 referral_code=generate_code(ZOD, user_data.id),
                                                 referral_code_used=guardian_data.referral_code,
                                                 is_password_set=False, is_verified=True,
-                                                guardian_code_status=GUARDIAN_CODE_STATUS[1][0])
+                                                guardian_code_status=[str(NUMBER['two'])])
             JuniorGuardianRelationship.objects.create(guardian=guardian_data, junior=junior_data,
                                                       relationship=relationship)
             total_junior = Junior.objects.all().count()
@@ -304,9 +321,9 @@ class AddJuniorSerializer(serializers.ModelSerializer):
             # add push notification
             UserNotification.objects.get_or_create(user=user_data)
             """Notification email"""
-            junior_notification_email(email, full_name, email, password)
+            junior_notification_email.delay(email, full_name, email, special_password)
             # push notification
-            send_notification_to_junior.delay(SKIPPED_PROFILE_SETUP, None, junior_data.auth.id, {})
+            send_notification.delay(ASSOCIATE_JUNIOR, None, None, junior_data.auth.id, {})
             return junior_data
 
 
@@ -319,9 +336,13 @@ class RemoveJuniorSerializer(serializers.ModelSerializer):
         fields = ('id', 'is_invited')
     def update(self, instance, validated_data):
         if instance:
+            guardian_code = self.context['guardian_code']
             instance.is_invited = False
-            instance.guardian_code = '{}'
+            if instance.guardian_code and ('-' in instance.guardian_code):
-            instance.guardian_code_status = str(NUMBER['one'])
+                instance.guardian_code.remove('-')
+            index = instance.guardian_code.index(guardian_code)
+            instance.guardian_code.remove(guardian_code)
+            instance.guardian_code_status.pop(index)
             instance.save()
             return instance
 
@@ -338,10 +359,8 @@ class CompleteTaskSerializer(serializers.ModelSerializer):
         instance.task_status = str(NUMBER['four'])
         instance.is_approved = False
         instance.save()
-        send_notification_to_junior.delay(TASK_SUBMITTED, instance.guardian.user.id,
+        send_notification.delay(TASK_ACTION, instance.junior.auth.id, JUNIOR,
-                                          instance.junior.auth.id, {'task_id': instance.id})
+                                instance.guardian.user.id, {'task_id': instance.id})
-        send_notification_to_guardian.delay(TASK_ACTION, instance.junior.auth.id,
-                                            instance.guardian.user.id, {'task_id': instance.id})
         return instance
 
 class JuniorPointsSerializer(serializers.ModelSerializer):
@@ -361,10 +380,7 @@ class JuniorPointsSerializer(serializers.ModelSerializer):
         return obj.junior.id
 
     def get_position(self, obj):
-        data = JuniorPoints.objects.filter(junior=obj.junior).last()
+        return get_junior_leaderboard_rank(obj.junior)
-        if data:
-            return data.position
-        return 99999
     def get_points(self, obj):
         """total points"""
         points = JuniorPoints.objects.filter(junior=obj.junior).last()
@@ -450,9 +466,8 @@ class AddGuardianSerializer(serializers.ModelSerializer):
 
             """Notification email"""
             junior_notification_email(email, full_name, email, password)
-            junior_approval_mail(email, full_name)
+            junior_approval_mail.delay(email, full_name)
-            send_notification_to_junior.delay(INVITED_GUARDIAN, guardian_data.user.id, junior_data.auth.id, {})
+            send_notification.delay(ASSOCIATE_REQUEST, junior_data.auth.id, JUNIOR, guardian_data.user.id, {})
-            send_notification_to_guardian.delay(APPROVED_JUNIOR, junior_data.auth.id, guardian_data.user.id, {})
             return guardian_data
 
 class StartTaskSerializer(serializers.ModelSerializer):
@@ -496,8 +511,6 @@ class ReAssignTaskSerializer(serializers.ModelSerializer):
         instance.save()
         return instance
 
-
-
 class RemoveGuardianCodeSerializer(serializers.ModelSerializer):
     """User task Serializer"""
     class Meta(object):
@@ -505,16 +518,33 @@ class RemoveGuardianCodeSerializer(serializers.ModelSerializer):
         model = Junior
         fields = ('id', )
     def update(self, instance, validated_data):
-        instance.guardian_code = None
+        guardian_code = self.context['guardian_code']
-        instance.guardian_code_status = str(NUMBER['one'])
+        if guardian_code in instance.guardian_code:
+            if instance.guardian_code and ('-' in instance.guardian_code):
+                instance.guardian_code.remove('-')
+            if instance.guardian_code_status and ('-' in instance.guardian_code_status):
+                instance.guardian_code_status.remove('-')
+            index = instance.guardian_code.index(guardian_code)
+            instance.guardian_code.remove(guardian_code)
+            instance.guardian_code_status.pop(index)
+        else:
+            raise serializers.ValidationError({"error":ERROR_CODE['2082'],"code":"400", "status":"failed"})
         instance.save()
         return instance
 
 class FAQSerializer(serializers.ModelSerializer):
-    # FAQ Serializer
+    """FAQ Serializer"""
 
     class Meta(object):
-        # meta info
+        """meta info"""
         model = FAQ
         fields = ('id', 'question', 'description')
 
+class CreateArticleCardSerializer(serializers.ModelSerializer):
+    """Article card Serializer"""
+
+    class Meta(object):
+        """meta info"""
+        model = ArticleCard
+        fields = ('id', 'article')
+

junior/urls.py

@@ -62,5 +62,5 @@ urlpatterns = [
     path('api/v1/reassign-task/', ReAssignJuniorTaskAPIView.as_view()),
     path('api/v1/complete-article/', CompleteArticleAPIView.as_view()),
     path('api/v1/read-article-card/', ReadArticleCardAPIView.as_view()),
-    path('api/v1/remove-guardian-code-request/', RemoveGuardianCodeAPIView.as_view()),
+    path('api/v1/remove-guardian-code-request/', RemoveGuardianCodeAPIView.as_view())
 ]

junior/utils.py

@@ -5,7 +5,8 @@ from django.conf import settings
 from templated_email import send_templated_mail
 from .models import JuniorPoints
 from base.constants import NUMBER
-from django.db.models import F
+from django.db.models import F, Window
+from django.db.models.functions.window import Rank
 # junior notification
 # email for sending email
 # when guardian create junior profile
@@ -14,6 +15,8 @@ from django.db.models import F
 # being part of the zod bank and access the platform
 # define junior notification email
 # junior approval email
+from celery import shared_task
+@shared_task()
 def junior_notification_email(recipient_email, full_name, email, password):
     """Notification email"""
     from_email = settings.EMAIL_FROM_ADDRESS
@@ -32,7 +35,7 @@ def junior_notification_email(recipient_email, full_name, email, password):
         }
     )
     return full_name
-
+@shared_task()
 def junior_approval_mail(guardian, full_name):
     """junior approval mail"""
     from_email = settings.EMAIL_FROM_ADDRESS
@@ -59,3 +62,21 @@ def update_positions_based_on_points():
         junior_point.position = position
         junior_point.save()
         position += NUMBER['one']
+
+
+def get_junior_leaderboard_rank(junior_obj):
+    """
+    to get junior's position/rank
+    :param junior_obj:
+    :return: junior's position/rank
+    """
+    queryset = JuniorPoints.objects.filter(
+                                    junior__is_verified=True
+                                    ).select_related('junior', 'junior__auth').annotate(rank=Window(
+                                        expression=Rank(),
+                                        order_by=[F('total_points').desc(), 'junior__created_at']
+                                    )).order_by('-total_points', 'junior__created_at')
+
+    junior = next((query for query in queryset if query.junior == junior_obj), None)
+
+    return junior.rank if junior else None

junior/views.py

@@ -12,8 +12,14 @@ import datetime
 import requests
 
 from rest_framework.viewsets import GenericViewSet, mixins
-"""Django app import"""
+import math
 
+from base.pagination import CustomPageNumberPagination
+
+"""Django app import"""
+from drf_yasg.utils import swagger_auto_schema
+from drf_yasg import openapi
+from drf_yasg.views import get_schema_view
 # Import guardian's model,
 # Import junior's model,
 # Import account's model,
@@ -36,16 +42,16 @@ from junior.models import (Junior, JuniorPoints, JuniorGuardianRelationship, Jun
 from .serializers import (CreateJuniorSerializer, JuniorDetailListSerializer, AddJuniorSerializer,
                           RemoveJuniorSerializer, CompleteTaskSerializer, JuniorPointsSerializer,
                           AddGuardianSerializer, StartTaskSerializer, ReAssignTaskSerializer,
-                          RemoveGuardianCodeSerializer, FAQSerializer)
+                          RemoveGuardianCodeSerializer, FAQSerializer, CreateArticleCardSerializer)
 from guardian.models import Guardian, JuniorTask
 from guardian.serializers import TaskDetailsSerializer, TaskDetailsjuniorSerializer
 from base.messages import ERROR_CODE, SUCCESS_CODE
-from base.constants import NUMBER, ARTICLE_STATUS, none
+from base.constants import NUMBER, ARTICLE_STATUS, none, GUARDIAN
-from account.utils import custom_response, custom_error_response
+from account.utils import custom_response, custom_error_response, task_status_fun
 from guardian.utils import upload_image_to_alibaba
 from .utils import update_positions_based_on_points
-from notifications.utils import send_notification, send_notification_to_junior
+from notifications.utils import send_notification
-from notifications.constants import REMOVE_JUNIOR
+from notifications.constants import REMOVE_JUNIOR, ARTICLE_REWARD_POINTS, ASSOCIATE_EXISTING_JUNIOR
 from web_admin.models import Article, ArticleSurvey, SurveyOption, ArticleCard
 from web_admin.serializers.article_serializer import (ArticleSerializer, ArticleListSerializer,
                                                       StartAssessmentSerializer)
@@ -65,13 +71,14 @@ from web_admin.serializers.article_serializer import (ArticleSerializer, Article
 # Start task
 # by junior API
 # Create your views here.
-class UpdateJuniorProfile(viewsets.ViewSet):
+class UpdateJuniorProfile(viewsets.ModelViewSet):
     """Update junior profile"""
     serializer_class = CreateJuniorSerializer
     permission_classes = [IsAuthenticated]
+    http_method_names = ('post',)
 
     def create(self, request, *args, **kwargs):
-        """Use CreateJuniorSerializer"""
+        """Create Junior Profile"""
         try:
             request_data = request.data
             image = request.data.get('image')
@@ -96,14 +103,22 @@ class UpdateJuniorProfile(viewsets.ViewSet):
                 return custom_response(None, serializer.data, response_status=status.HTTP_200_OK)
             return custom_error_response(serializer.errors, response_status=status.HTTP_400_BAD_REQUEST)
         except Exception as e:
-            return custom_error_response(str(e), response_status=status.HTTP_400_BAD_REQUEST)
+            if e.detail:
+                error_detail = e.detail.get('error', None)
+            else:
+                error_detail = str(e)
+            return custom_error_response(error_detail, response_status=status.HTTP_400_BAD_REQUEST)
 
-class ValidateGuardianCode(viewsets.ViewSet):
+class ValidateGuardianCode(viewsets.ModelViewSet):
     """Check guardian code exist or not"""
     permission_classes = [IsAuthenticated]
+    http_method_names = ('get',)
 
     def list(self, request, *args, **kwargs):
-        """check guardian code"""
+        """check guardian code
+        Params
+        "guardian_code"
+        """
         try:
             guardian_code = self.request.GET.get('guardian_code').split(',')
             for code in guardian_code:
@@ -134,14 +149,15 @@ class JuniorListAPIView(viewsets.ModelViewSet):
     def list(self, request, *args, **kwargs):
         """ junior list"""
         try:
-            update_positions_based_on_points()
+            # update_positions_based_on_points, function removed
             guardian_data = Guardian.objects.filter(user__email=request.user).last()
             # fetch junior object
             if guardian_data:
                 queryset = self.get_queryset()
                 queryset = queryset.filter(guardian_code__icontains=str(guardian_data.guardian_code))
                 # use JuniorDetailListSerializer serializer
-                serializer = JuniorDetailListSerializer(queryset, many=True)
+                serializer = JuniorDetailListSerializer(queryset, context={"guardian_code":
+                                                                           guardian_data.guardian_code}, many=True)
                 return custom_response(None, serializer.data, response_status=status.HTTP_200_OK)
             return custom_error_response(ERROR_CODE['2045'], response_status=status.HTTP_200_OK)
         except Exception as e:
@@ -155,7 +171,14 @@ class AddJuniorAPIView(viewsets.ModelViewSet):
     http_method_names = ('post',)
 
     def create(self, request, *args, **kwargs):
-        """ junior list"""
+        """ add junior
+        {   "gender":"1",
+            "first_name":"abc",
+            "last_name":"xyz",
+            "dob":"2023-12-12",
+            "relationship":"2",
+            "email":"abc@yopmail.com"
+        }"""
         try:
             info_data = {'user': request.user, 'relationship': str(request.data['relationship']),
                          'email': request.data['email'], 'first_name': request.data['first_name'],
@@ -176,6 +199,8 @@ class AddJuniorAPIView(viewsets.ModelViewSet):
                     return custom_error_response(ERROR_CODE['2077'], response_status=status.HTTP_400_BAD_REQUEST)
                 elif not data:
                     return custom_error_response(ERROR_CODE['2076'], response_status=status.HTTP_400_BAD_REQUEST)
+                elif data == "Max":
+                    return custom_error_response(ERROR_CODE['2081'], response_status=status.HTTP_400_BAD_REQUEST)
                 return custom_response(SUCCESS_CODE['3021'], response_status=status.HTTP_200_OK)
             # use AddJuniorSerializer serializer
             serializer = AddJuniorSerializer(data=request.data, context=info_data)
@@ -190,23 +215,35 @@ class AddJuniorAPIView(viewsets.ModelViewSet):
     def associate_guardian(self, user):
         junior = Junior.objects.filter(auth__email=self.request.data['email']).first()
         guardian = Guardian.objects.filter(user=self.request.user).first()
-        if not junior:
+        if junior is None:
             return none
-        if guardian.guardian_code in junior.guardian_code:
+        if junior.guardian_code and (guardian.guardian_code in junior.guardian_code):
             return False
-        if type(junior.guardian_code) is list:
+        if junior.guardian_code and ('-' in junior.guardian_code):
+            junior.guardian_code.remove('-')
+        if not junior.guardian_code:
+            junior.guardian_code = [guardian.guardian_code]
+        elif type(junior.guardian_code) is list and len(junior.guardian_code) < 3:
             junior.guardian_code.append(guardian.guardian_code)
         else:
-            junior.guardian_code = [guardian.guardian_code]
+            return "Max"
-        junior.guardian_code_status = str(NUMBER['two'])
+        if junior.guardian_code_status and ('-' in junior.guardian_code_status):
+            junior.guardian_code_status.remove('-')
+        if not junior.guardian_code_status:
+            junior.guardian_code_status = [str(NUMBER['two'])]
+        else:
+            junior.guardian_code_status.append(str(NUMBER['two']))
         junior.save()
-        JuniorGuardianRelationship.objects.get_or_create(guardian=guardian, junior=junior,
+        jun_data, created = JuniorGuardianRelationship.objects.get_or_create(guardian=guardian, junior=junior)
-                                                         relationship=str(self.request.data['relationship']))
+        if jun_data:
+            jun_data.relationship = str(self.request.data['relationship'])
+            jun_data.save()
+        send_notification.delay(ASSOCIATE_EXISTING_JUNIOR, self.request.user.id, GUARDIAN, junior.auth.id, {})
         return True
 
 
 class InvitedJuniorAPIView(viewsets.ModelViewSet):
-    """Junior list of assosicated guardian"""
+    """Invited Junior list of assosicated guardian"""
 
     serializer_class = JuniorDetailListSerializer
     permission_classes = [IsAuthenticated]
@@ -220,7 +257,8 @@ class InvitedJuniorAPIView(viewsets.ModelViewSet):
                                                 is_invited=True)
         return junior_queryset
     def list(self, request, *args, **kwargs):
-        """ junior list"""
+        """ Invited Junior list of assosicated guardian
+        No Params"""
         try:
             queryset = self.get_queryset()
             paginator = self.pagination_class()
@@ -234,12 +272,25 @@ class InvitedJuniorAPIView(viewsets.ModelViewSet):
 
 
 class FilterJuniorAPIView(viewsets.ModelViewSet):
-    """Update guardian profile"""
+    """filter junior profile"""
     serializer_class = JuniorDetailListSerializer
     permission_classes = [IsAuthenticated]
     pagination_class = PageNumberPagination
     http_method_names = ('get',)
 
+    @swagger_auto_schema(
+        manual_parameters=[
+            # Example of a query parameter
+            openapi.Parameter(
+                'title',
+                openapi.IN_QUERY,
+                description='title of the name',
+                type=openapi.TYPE_STRING,
+            ),
+            # Add more parameters as needed
+        ]
+    )
+
     def get_queryset(self):
         """Get the queryset for the view"""
         title = self.request.GET.get('title')
@@ -250,7 +301,7 @@ class FilterJuniorAPIView(viewsets.ModelViewSet):
         return queryset
 
     def list(self, request, *args, **kwargs):
-        """Create guardian profile"""
+        """Filter junior"""
         try:
             queryset = self.get_queryset()
             paginator = self.pagination_class()
@@ -264,7 +315,9 @@ class FilterJuniorAPIView(viewsets.ModelViewSet):
 
 
 class RemoveJuniorAPIView(views.APIView):
-    """Remove junior API"""
+    """Remove junior API
+    Params
+    id=37"""
     serializer_class = RemoveJuniorSerializer
     model = Junior
     permission_classes = [IsAuthenticated]
@@ -278,11 +331,13 @@ class RemoveJuniorAPIView(views.APIView):
                                                     guardian_code__icontains=str(guardian.guardian_code)).last()
             if junior_queryset:
                 # use RemoveJuniorSerializer serializer
-                serializer = RemoveJuniorSerializer(junior_queryset, data=request.data, partial=True)
+                serializer = RemoveJuniorSerializer(junior_queryset, context={"guardian_code":guardian.guardian_code},
+                                                    data=request.data, partial=True)
                 if serializer.is_valid():
                     # save serializer
                     serializer.save()
-                    send_notification_to_junior.delay(REMOVE_JUNIOR, None, junior_queryset.auth.id, {})
+                    JuniorGuardianRelationship.objects.filter(guardian=guardian, junior=junior_queryset).delete()
+                    send_notification.delay(REMOVE_JUNIOR, None, None, junior_queryset.auth.id, {})
                     return custom_response(SUCCESS_CODE['3022'], serializer.data, response_status=status.HTTP_200_OK)
                 return custom_error_response(serializer.errors, response_status=status.HTTP_400_BAD_REQUEST)
             else:
@@ -292,44 +347,47 @@ class RemoveJuniorAPIView(views.APIView):
 
 
 class JuniorTaskListAPIView(viewsets.ModelViewSet):
-    """Update guardian profile"""
+    """Junior task list"""
     serializer_class = TaskDetailsjuniorSerializer
     permission_classes = [IsAuthenticated]
+    filter_backends = (SearchFilter,)
+    search_fields = ['task_name', ]
     pagination_class = PageNumberPagination
     http_method_names = ('get',)
 
+    def get_queryset(self):
+        queryset = JuniorTask.objects.filter(junior__auth=self.request.user
+                                             ).select_related('junior', 'junior__auth'
+                                                              ).order_by('due_date', 'created_at')
+
+        queryset = self.filter_queryset(queryset)
+        return queryset
+
     def list(self, request, *args, **kwargs):
-        """Create guardian profile"""
+        """Junior task list
+        status=0
+        search='title'
+        page=1"""
         try:
             status_value = self.request.GET.get('status')
-            search = self.request.GET.get('search')
+            queryset = self.get_queryset()
-            if search and str(status_value) == '0':
+            task_status = task_status_fun(status_value)
-                # search with title and for all task list
+            if status_value:
-                queryset = JuniorTask.objects.filter(junior__auth=request.user,
+                queryset = queryset.filter(task_status__in=task_status)
-                                                     task_name__icontains=search).order_by('due_date', 'created_at')
+            paginator = CustomPageNumberPagination()
-            elif search and str(status_value) != '0':
-                # search with title and fetch task list with status wise
-                queryset = JuniorTask.objects.filter(junior__auth=request.user, task_name__icontains=search,
-                                                     task_status=status_value).order_by('due_date', 'created_at')
-            if search is None and str(status_value) == '0':
-                # fetch all task list
-                queryset = JuniorTask.objects.filter(junior__auth=request.user).order_by('due_date', 'created_at')
-            elif search is None and str(status_value) != '0':
-                # fetch task list with status wise
-                queryset = JuniorTask.objects.filter(junior__auth=request.user,
-                                                     task_status=status_value).order_by('due_date','created_at')
-            paginator = self.pagination_class()
             # use Pagination
             paginated_queryset = paginator.paginate_queryset(queryset, request)
-            # use TaskDetailsSerializer serializer
+            # use TaskDetails juniorSerializer serializer
-            serializer = TaskDetailsjuniorSerializer(paginated_queryset, many=True)
+            serializer = self.serializer_class(paginated_queryset, many=True)
-            return custom_response(None, serializer.data, response_status=status.HTTP_200_OK)
+            return paginator.get_paginated_response(serializer.data)
         except Exception as e:
             return custom_error_response(str(e), response_status=status.HTTP_400_BAD_REQUEST)
 
 
 class CompleteJuniorTaskAPIView(views.APIView):
-    """Update junior task API"""
+    """Payload
+    task_id
+    image"""
     serializer_class = CompleteTaskSerializer
     model = JuniorTask
     permission_classes = [IsAuthenticated]
@@ -350,10 +408,12 @@ class CompleteJuniorTaskAPIView(views.APIView):
             task_queryset = JuniorTask.objects.filter(id=task_id, junior__auth__email=self.request.user
                                                       ).select_related('guardian', 'junior').last()
             if task_queryset:
-                if task_queryset.junior.is_deleted or not task_queryset.junior.is_active:
+                if task_queryset.guardian.guardian_code not in task_queryset.junior.guardian_code:
+                    return custom_error_response(ERROR_CODE['2085'], response_status=status.HTTP_400_BAD_REQUEST)
+                elif task_queryset.junior.is_deleted or not task_queryset.junior.is_active:
                     return custom_error_response(ERROR_CODE['2074'], response_status=status.HTTP_400_BAD_REQUEST)
                 # use CompleteTaskSerializer serializer
-                if task_queryset.task_status in [str(NUMBER['four']), str(NUMBER['five'])]:
+                elif task_queryset.task_status in [str(NUMBER['four']), str(NUMBER['five'])]:
                     """Already request send """
                     return custom_error_response(ERROR_CODE['2049'], response_status=status.HTTP_400_BAD_REQUEST)
                 serializer = CompleteTaskSerializer(task_queryset, data={'image': image_url}, partial=True)
@@ -374,9 +434,10 @@ class JuniorPointsListAPIView(viewsets.ModelViewSet):
     http_method_names = ('get',)
 
     def list(self, request, *args, **kwargs):
-        """profile view"""
+        """Junior Points
+        No Params"""
         try:
-            update_positions_based_on_points()
+            # update_positions_based_on_points, function removed
             queryset = JuniorPoints.objects.filter(junior__auth__email=self.request.user).last()
             # update position of junior
             serializer = JuniorPointsSerializer(queryset)
@@ -385,7 +446,7 @@ class JuniorPointsListAPIView(viewsets.ModelViewSet):
             return custom_error_response(str(e), response_status=status.HTTP_400_BAD_REQUEST)
 
 
-class ValidateReferralCode(viewsets.ViewSet):
+class ValidateReferralCode(viewsets.ModelViewSet):
     """Check guardian code exist or not"""
     permission_classes = [IsAuthenticated]
     http_method_names = ('get',)
@@ -420,7 +481,13 @@ class InviteGuardianAPIView(viewsets.ModelViewSet):
     permission_classes = [IsAuthenticated]
     http_method_names = ('post',)
     def create(self, request, *args, **kwargs):
-        """ junior list"""
+        """ add guardian
+        {
+            "first_name":"abc",
+            "last_name":"xyz",
+            "email":"abc@yopmail.com",
+            "relationship":2
+        }"""
         try:
             if request.data['email'] == '':
                 return custom_error_response(ERROR_CODE['2062'], response_status=status.HTTP_400_BAD_REQUEST)
@@ -438,7 +505,11 @@ class InviteGuardianAPIView(viewsets.ModelViewSet):
 
 
 class StartTaskAPIView(views.APIView):
-    """Update junior task API"""
+    """Update junior task API
+    Paylod
+    {
+    "task_id":28
+    }"""
     serializer_class = StartTaskSerializer
     model = JuniorTask
     permission_classes = [IsAuthenticated]
@@ -447,7 +518,10 @@ class StartTaskAPIView(views.APIView):
         try:
             task_id = self.request.data.get('task_id')
             task_queryset = JuniorTask.objects.filter(id=task_id, junior__auth__email=self.request.user).last()
+            print("task_queryset==>",task_queryset)
             if task_queryset and task_queryset.task_status == str(NUMBER['one']):
+                if task_queryset.guardian.guardian_code not in task_queryset.junior.guardian_code:
+                    return custom_error_response(ERROR_CODE['2083'], response_status=status.HTTP_400_BAD_REQUEST)
                 # use StartTaskSerializer serializer
                 serializer = StartTaskSerializer(task_queryset, data=request.data, partial=True)
                 if serializer.is_valid():
@@ -462,7 +536,13 @@ class StartTaskAPIView(views.APIView):
             return custom_error_response(str(e), response_status=status.HTTP_400_BAD_REQUEST)
 
 class ReAssignJuniorTaskAPIView(views.APIView):
-    """Update junior task API"""
+    """Update junior task API
+    Payload
+    {
+    "task_id":34,
+    "due_date":"2023-08-22"
+    }
+    """
     serializer_class = ReAssignTaskSerializer
     model = JuniorTask
     permission_classes = [IsAuthenticated]
@@ -491,7 +571,10 @@ class StartArticleAPIView(viewsets.ModelViewSet):
     http_method_names = ('post',)
 
     def create(self, request, *args, **kwargs):
-        """ junior list"""
+        """ Payload
+        {
+        "article_id":"2"
+        }"""
         try:
             junior_instance = Junior.objects.filter(auth=self.request.user).last()
             article_id = request.data.get('article_id')
@@ -513,7 +596,7 @@ class StartArticleAPIView(viewsets.ModelViewSet):
             return custom_error_response(str(e), response_status=status.HTTP_400_BAD_REQUEST)
 
 class StartAssessmentAPIView(viewsets.ModelViewSet):
-    """Junior Points viewset"""
+    """Question answer viewset"""
     serializer_class = StartAssessmentSerializer
     permission_classes = [IsAuthenticated]
     http_method_names = ('get',)
@@ -522,11 +605,13 @@ class StartAssessmentAPIView(viewsets.ModelViewSet):
         article_id = self.request.GET.get('article_id')
         # if referral_code:
         article = Article.objects.filter(id=article_id, is_deleted=False).prefetch_related(
-            'article_cards', 'article_survey', 'article_survey__options'
+            'article_survey'
-        ).order_by('-created_at')
+        )
         return article
     def list(self, request, *args, **kwargs):
-        """profile view"""
+        """Params
+        article_id
+        """
 
         try:
             queryset = self.get_queryset()
@@ -538,7 +623,9 @@ class StartAssessmentAPIView(viewsets.ModelViewSet):
             return custom_error_response(str(e), response_status=status.HTTP_400_BAD_REQUEST)
 
 class CheckAnswerAPIView(viewsets.ModelViewSet):
-    """Junior Points viewset"""
+    """Params
+    question_id=1
+    answer_id=1"""
     permission_classes = [IsAuthenticated]
     http_method_names = ('get',)
 
@@ -547,13 +634,16 @@ class CheckAnswerAPIView(viewsets.ModelViewSet):
         article = ArticleSurvey.objects.filter(id=question_id).last()
         return article
     def list(self, request, *args, **kwargs):
-        """profile view"""
+        """ Params
+            question_id=1
+            answer_id=1
+        """
 
         try:
             answer_id = self.request.GET.get('answer_id')
             current_page = self.request.GET.get('current_page')
             queryset = self.get_queryset()
-            submit_ans = SurveyOption.objects.filter(id=answer_id, is_answer=True).last()
+            submit_ans = SurveyOption.objects.filter(id=answer_id).last()
             junior_article_points = JuniorArticlePoints.objects.filter(junior__auth=self.request.user,
                                                                        question=queryset)
             if submit_ans:
@@ -571,7 +661,9 @@ class CheckAnswerAPIView(viewsets.ModelViewSet):
             return custom_error_response(str(e), response_status=status.HTTP_400_BAD_REQUEST)
 
 class CompleteArticleAPIView(views.APIView):
-    """Remove junior API"""
+    """Params
+    article_id
+    """
     permission_classes = [IsAuthenticated]
     http_method_names = ('put', 'get',)
     def put(self, request, format=None):
@@ -585,7 +677,8 @@ class CompleteArticleAPIView(views.APIView):
             return custom_error_response(str(e), response_status=status.HTTP_400_BAD_REQUEST)
 
     def get(self, request, *args, **kwargs):
-        """ junior list"""
+        """ Params
+        article_id=1"""
         try:
             article_id = self.request.GET.get('article_id')
             total_earn_points = JuniorArticlePoints.objects.filter(junior__auth=request.user,
@@ -593,18 +686,24 @@ class CompleteArticleAPIView(views.APIView):
                                                        is_answer_correct=True).aggregate(
                 total_earn_points=Sum('earn_points'))['total_earn_points']
             data = {"total_earn_points":total_earn_points}
+            send_notification.delay(ARTICLE_REWARD_POINTS, None, None,
+                                    request.user.id, {'points': total_earn_points})
             return custom_response(SUCCESS_CODE['3042'], data, response_status=status.HTTP_200_OK)
         except Exception as e:
             return custom_error_response(str(e), response_status=status.HTTP_400_BAD_REQUEST)
 
 
 class ReadArticleCardAPIView(views.APIView):
-    """Remove junior API"""
+    """Read article card API"""
     permission_classes = [IsAuthenticated]
     http_method_names = ('put',)
 
     def put(self, request, *args, **kwargs):
-        """ junior list"""
+        """ Read article card
+        Payload
+        {"article_id":"1",
+        "article_card":"2",
+        "current_page":"2"}"""
         try:
             junior_instance = Junior.objects.filter(auth=self.request.user).last()
             article = self.request.data.get('article_id')
@@ -622,11 +721,14 @@ class ReadArticleCardAPIView(views.APIView):
 
 class CreateArticleCardAPIView(viewsets.ModelViewSet):
     """Start article"""
+    serializer_class = CreateArticleCardSerializer
     permission_classes = [IsAuthenticated]
     http_method_names = ('post',)
 
     def create(self, request, *args, **kwargs):
-        """ junior list"""
+        """ create article card
+        Params
+        {"article_id":1}"""
         try:
             junior_instance = Junior.objects.filter(auth=self.request.user).last()
             article_id = request.data.get('article_id')
@@ -645,26 +747,35 @@ class CreateArticleCardAPIView(viewsets.ModelViewSet):
             return custom_error_response(str(e), response_status=status.HTTP_400_BAD_REQUEST)
 
 class RemoveGuardianCodeAPIView(views.APIView):
-    """Update junior task API"""
+    """Remove guardian code request API
+    Payload
+    {"guardian_code"
+    :"GRD037"
+    }"""
     serializer_class = RemoveGuardianCodeSerializer
     permission_classes = [IsAuthenticated]
 
     def put(self, request, format=None):
         try:
+            guardian_code = self.request.data.get("guardian_code")
+            guardian_data = Guardian.objects.filter(guardian_code=guardian_code).last()
             junior_queryset = Junior.objects.filter(auth=self.request.user).last()
             if junior_queryset:
                 # use RemoveGuardianCodeSerializer serializer
-                serializer = RemoveGuardianCodeSerializer(junior_queryset, data=request.data, partial=True)
+                serializer = RemoveGuardianCodeSerializer(junior_queryset, context = {"guardian_code":guardian_code},
+                                                          data=request.data, partial=True)
                 if serializer.is_valid():
                     # save serializer
                     serializer.save()
+                    JuniorGuardianRelationship.objects.filter(guardian=guardian_data, junior=junior_queryset).delete()
                     return custom_response(SUCCESS_CODE['3044'], response_status=status.HTTP_200_OK)
                 return custom_error_response(serializer.errors, response_status=status.HTTP_400_BAD_REQUEST)
             else:
                 # task in another state
                 return custom_error_response(ERROR_CODE['2047'], response_status=status.HTTP_400_BAD_REQUEST)
         except Exception as e:
-            return custom_error_response(str(e), response_status=status.HTTP_400_BAD_REQUEST)
+            error_detail = e.detail.get('error', None)
+            return custom_error_response(error_detail, response_status=status.HTTP_400_BAD_REQUEST)
 
 
 class FAQViewSet(GenericViewSet, mixins.CreateModelMixin,
@@ -682,7 +793,7 @@ class FAQViewSet(GenericViewSet, mixins.CreateModelMixin,
         """
         faq create api method
         :param request:
-        :param args:
+        :param args: question, description
         :param kwargs:
         :return: success message
         """
@@ -708,6 +819,3 @@ class FAQViewSet(GenericViewSet, mixins.CreateModelMixin,
         serializer = self.serializer_class(paginated_queryset, many=True)
         return custom_response(None, data=serializer.data, response_status=status.HTTP_200_OK)
 
-
-
-

notifications/admin.py

@@ -10,3 +10,4 @@ from notifications.models import Notification
 class NotificationAdmin(admin.ModelAdmin):
     """Notification Admin"""
     list_display = ['id', 'notification_type', 'notification_to', 'data', 'is_read']
+    list_filter = ['notification_type']

notifications/constants.py

@@ -1,70 +1,127 @@
 """
 notification constants file
 """
-from base.constants import NUMBER
+REGISTRATION = 1
-REGISTRATION = NUMBER['one']
+ASSOCIATE_REQUEST = 3
-TASK_ASSIGNED = NUMBER['two']
+ASSOCIATE_REJECTED = 4
-INVITED_GUARDIAN = NUMBER['three']
+ASSOCIATE_APPROVED = 5
-APPROVED_JUNIOR = NUMBER['four']
+REFERRAL_POINTS = 6
-REFERRAL_POINTS = NUMBER['five']
+ASSOCIATE_JUNIOR = 7
-TASK_POINTS = NUMBER['six']
+ASSOCIATE_EXISTING_JUNIOR = 8
-TASK_REJECTED = NUMBER['seven']
-SKIPPED_PROFILE_SETUP = NUMBER['eight']
-TASK_SUBMITTED = NUMBER['nine']
-TASK_ACTION = NUMBER['ten']
-LEADERBOARD_RANKING = NUMBER['eleven']
-REMOVE_JUNIOR = NUMBER['twelve']
-TEST_NOTIFICATION = 99
 
+TASK_ASSIGNED = 9
+TASK_ACTION = 10
+TASK_REJECTED = 11
+TASK_APPROVED = 12
+PENDING_TASK_EXPIRING = 13
+IN_PROGRESS_TASK_EXPIRING = 14
+TOP_JUNIOR = 15
+
+NEW_ARTICLE_PUBLISHED = 16
+ARTICLE_REWARD_POINTS = 17
+REMOVE_JUNIOR = 18
+
+TEST_NOTIFICATION = 99
+# notification dictionary
 NOTIFICATION_DICT = {
     REGISTRATION: {
         "title": "Successfully registered!",
         "body": "You have registered successfully. Now login and complete your profile."
     },
-    TASK_ASSIGNED: {
+    # user will receive notification as soon junior
-        "title": "New task assigned !!",
+    # sign up application using their guardian code for association
-        "body": "{from_user} has assigned you a new task."
+    ASSOCIATE_REQUEST: {
-    },
+        "title": "Associate request!",
-    INVITED_GUARDIAN: {
-        "title": "Invite guardian",
-        "body": "Invite guardian successfully"
-    },
-    APPROVED_JUNIOR: {
-        "title": "Approve junior !",
         "body": "You have request from {from_user} to associate with you."
     },
+    # Juniors will receive notification when
+    # custodians reject their request for associate
+    ASSOCIATE_REJECTED: {
+        "title": "Associate request rejected!",
+        "body": "Your request to associate has been rejected by {from_user}."
+    },
+    # Juniors will receive notification when
+    # custodians approve their request for associate
+    ASSOCIATE_APPROVED: {
+        "title": "Associate request approved!",
+        "body": "Your request to associate has been approved by {from_user}."
+    },
+    # Juniors will receive Notifications
+    # for every Points earned by referrals
     REFERRAL_POINTS: {
-        "title": "Earn Referral points",
+        "title": "Earn Referral points!",
         "body": "You earn 5 points for referral."
     },
-    TASK_POINTS: {
+    # Juniors will receive notification
-        "title": "Earn Task points!",
+    # once any custodians add them in their account
-        "body": "You earn 5 points for task."
+    ASSOCIATE_JUNIOR: {
+        "title": "Profile already setup!",
+        "body": "Your guardian has already setup your profile."
     },
-    TASK_REJECTED: {
+    ASSOCIATE_EXISTING_JUNIOR: {
-        "title": "Task rejected!",
+        "title": "Associated to guardian",
-        "body": "Your task has been rejected."
+        "body": "Your are associated to your guardian {from_user}."
     },
-    SKIPPED_PROFILE_SETUP: {
+    # Juniors will receive Notification
-        "title": "Skipped profile setup!",
+    # for every Task Assign by Custodians
-        "body": "Your guardian {from_user} has setup your profile."
+    TASK_ASSIGNED: {
-    },
+        "title": "New task assigned!",
-    TASK_SUBMITTED: {
+        "body": "{from_user} has assigned you a new task."
-        "title": "Task submitted!",
-        "body": "Your task has been submitted successfully."
     },
+    # Guardian will receive notification as soon
+    # as junior send task for approval
     TASK_ACTION: {
         "title": "Task completion approval!",
-        "body": "You have request from {from_user} for task approval."
+        "body": "{from_user} completed their task {task_name}."
     },
-    LEADERBOARD_RANKING: {
+    # Juniors will receive notification as soon
-        "title": "Leader board rank!",
+    # as their task is rejected by custodians
-        "body": "Your rank is ."
+    TASK_REJECTED: {
+        "title": "Task completion rejected!",
+        "body": "Your task completion request has been rejected by {from_user}."
     },
+    # Juniors will receive notification as soon as their task is approved by custodians
+    # and for every Points earned by Task completion
+    TASK_APPROVED: {
+        "title": "Task completion approved!",
+        "body": "Your task completion request has been approved by {from_user}. "
+                "Also you earned 5 points for successful completion."
+    },
+    # Juniors will receive notification when their task end date about to end
+    PENDING_TASK_EXPIRING: {
+        "title": "Task expiring soon!",
+        "body": "Your task {task_name} is expiring soon. Please complete it."
+    },
+    # User will receive notification when their assigned task is about to end
+    # and juniors have not performed any action
+    IN_PROGRESS_TASK_EXPIRING: {
+        "title": "Task expiring soon!",
+        "body": "{from_user} didn't take any action on assigned task {task_name} and it's expiring soon. "
+                "Please assist to complete it."
+    },
+    # Juniors will receive Notification
+    # related to Leaderboard progress
+    TOP_JUNIOR: {
+        "title": "Leaderboard topper!",
+        "body": "{from_user} is on top in leaderboard with {points} points."
+    },
+    # Juniors will receive  notification
+    # when admin add any new financial learnings
+    NEW_ARTICLE_PUBLISHED: {
+        "title": "Time to read!",
+        "body": "A new article has been published."
+    },
+    # Juniors will receive notification when they earn points by reading financial Learning
+    ARTICLE_REWARD_POINTS: {
+        "title": "Article reward points!",
+        "body": "You are rewarded with {points} points for reading article and answering questions. "
+    },
+    # Juniors will receive notification as soon as their custodians remove them from account
     REMOVE_JUNIOR: {
         "title": "Disassociate by guardian!",
-        "body": "Your guardian disassociate you ."
+        "body": "Your guardian has disassociated you."
     },
+    # Test notification
     TEST_NOTIFICATION: {
         "title": "Test Notification",
         "body": "This notification is for testing purpose from {from_user}."

notifications/serializers.py

@@ -31,15 +31,22 @@ class RegisterDevice(serializers.Serializer):
 
 class NotificationListSerializer(serializers.ModelSerializer):
     """List of notification"""
+    badge = serializers.SerializerMethodField()
 
     class Meta(object):
         """meta info"""
         model = Notification
-        fields = ['id', 'data', 'is_read', 'created_at']
+        fields = ['id', 'data', 'badge', 'is_read', 'created_at']
+
+    @staticmethod
+    def get_badge(obj):
+        return Notification.objects.filter(notification_to=obj.notification_to, is_read=False).count()
 
 
 class ReadNotificationSerializer(serializers.ModelSerializer):
     """User task Serializer"""
+    id = serializers.ListSerializer(child=serializers.IntegerField())
+
     class Meta(object):
         """Meta class"""
         model = Notification

notifications/urls.py

@@ -6,7 +6,7 @@ from django.urls import path, include
 from rest_framework import routers
 
 # local imports
-from notifications.views import NotificationViewSet, ReadNotification
+from notifications.views import NotificationViewSet
 
 # initiate router
 router = routers.SimpleRouter()
@@ -15,5 +15,4 @@ router.register('notifications', NotificationViewSet, basename='notifications')
 
 urlpatterns = [
     path('api/v1/', include(router.urls)),
-    path('api/v1/read-notification/', ReadNotification.as_view()),
 ]

notifications/utils.py

@@ -8,24 +8,24 @@ from firebase_admin.messaging import Message, Notification as FirebaseNotificati
 
 # django imports
 from django.contrib.auth import get_user_model
+from django.db.models import Q
 
+# local imports
 from account.models import UserNotification
 from account.utils import get_user_full_name
-from guardian.models import Guardian
+from base.constants import GUARDIAN, JUNIOR
+from guardian.models import Guardian, JuniorTask
 from junior.models import Junior
 from notifications.constants import NOTIFICATION_DICT
 from notifications.models import Notification
 
-# local imports
-
-
 User = get_user_model()
 
 
 def register_fcm_token(user_id, registration_id, device_id, device_type):
     """ used to register the fcm device token"""
-    device, _ = FCMDevice.objects.update_or_create(device_id=device_id,
+    device, _ = FCMDevice.objects.update_or_create(user_id=user_id,
-                                                   defaults={'user_id': user_id, 'type': device_type,
+                                                   defaults={'device_id': device_id, 'type': device_type,
                                                              'active': True,
                                                              'registration_id': registration_id})
     return device
@@ -42,49 +42,72 @@ def remove_fcm_token(user_id: int, access_token: str, registration_id) -> None:
         print(e)
 
 
-def get_basic_detail(from_user_id, to_user_id):
+def get_from_user_details(from_user_id, from_user_type):
     """
-    used to get the basic details
+    used to get from user details
     """
-    from_user = User.objects.get(id=from_user_id) if from_user_id else None
+    from_user = None
-    to_user = User.objects.get(id=to_user_id)
+    from_user_name = None
-    return from_user, to_user
+    from_user_image = None
+    if from_user_id:
+        if from_user_type == GUARDIAN:
+            guardian = Guardian.objects.filter(user_id=from_user_id).select_related('user').first()
+            from_user = guardian.user
+            from_user_name = get_user_full_name(from_user)
+            from_user_image = guardian.image
+        elif from_user_type == JUNIOR:
+            junior = Junior.objects.filter(auth_id=from_user_id).select_related('auth').first()
+            from_user = junior.auth
+            from_user_name = get_user_full_name(from_user)
+            from_user_image = junior.image
+    return from_user_name, from_user_image, from_user
 
 
-def get_notification_data(notification_type, from_user, to_user, extra_data):
+def get_notification_data(notification_type, from_user_id, from_user_type, to_user_id, extra_data):
     """
     get notification and push data
+    :param from_user_type: GUARDIAN or JUNIOR
     :param notification_type: notification_type
-    :param from_user: from_user obj
+    :param from_user_id: from_user obj
-    :param to_user: to_user obj
+    :param to_user_id: to_user obj
     :param extra_data: any extra data provided
     :return: notification and push data
     """
     push_data = NOTIFICATION_DICT[notification_type].copy()
     notification_data = push_data.copy()
-    notification_data['to_user'] = get_user_full_name(to_user)
+    task_name = None
-    if from_user:
+    points = extra_data.get('points', None)
-        from_user_name = get_user_full_name(from_user)
+    if 'task_id' in extra_data:
-        push_data['body'] = push_data['body'].format(from_user=from_user_name)
+        task = JuniorTask.objects.filter(id=extra_data.get('task_id')).first()
-        notification_data['body'] = notification_data['body'].format(from_user=from_user_name)
+        task_name = task.task_name
-        notification_data['from_user'] = from_user_name
+        extra_data['task_name'] = task_name
+        extra_data['task_image'] = task.image if task.image else task.default_image
+
+    from_user_name, from_user_image, from_user = get_from_user_details(from_user_id, from_user_type)
+
+    push_data['body'] = push_data['body'].format(from_user=from_user_name, task_name=task_name, points=points)
+    notification_data['body'] = notification_data['body'].format(from_user=from_user_name,
+                                                                 task_name=task_name, points=points)
+    notification_data['from_user'] = from_user_name
+    notification_data['from_user_image'] = from_user_image
 
     notification_data.update(extra_data)
-
+    to_user = User.objects.filter(id=to_user_id).first()
-    return notification_data, push_data
+    return notification_data, push_data, from_user, to_user
 
 
-def send_notification(notification_type, from_user, to_user, extra_data):
+@shared_task()
+def send_notification(notification_type, from_user_id, from_user_type, to_user_id, extra_data):
     """
     used to send the push for the given notification type
     """
-    # (from_user, to_user) = get_basic_detail(from_user_id, to_user_id)
+    notification_data, push_data, from_user, to_user = get_notification_data(notification_type, from_user_id,
-    notification_data, push_data = get_notification_data(notification_type, from_user, to_user, extra_data)
+                                                                             from_user_type, to_user_id, extra_data)
     user_notification_type = UserNotification.objects.filter(user=to_user).first()
     notification_data.update({'badge': Notification.objects.filter(notification_to=to_user, is_read=False).count()})
     Notification.objects.create(notification_type=notification_type, notification_from=from_user,
                                 notification_to=to_user, data=notification_data)
-    if user_notification_type.push_notification:
+    if user_notification_type and user_notification_type.push_notification:
         send_push(to_user, push_data)
 
 
@@ -95,27 +118,64 @@ def send_push(user, data):
     )
 
 
+def send_multiple_push(queryset, data):
+    """ used to send same notification to multiple users """
+    FCMDevice.objects.filter(user__in=queryset, active=True).send_message(
+        Message(notification=FirebaseNotification(data['title'], data['body']), data=data)
+    )
+
+
+@shared_task()
+def send_notification_multiple_user(notification_type, from_user_id, from_user_type,
+                                    extra_data: dict = {}):
+    """
+    used to send notification to multiple user for the given notification type
+    """
+    to_user_list = User.objects.filter(junior_profile__is_verified=True, is_superuser=False
+                                       ).exclude(junior_profile__isnull=True, guardian_profile__isnull=True)
+
+    notification_data, push_data, from_user, _ = get_notification_data(notification_type, from_user_id,
+                                                                       from_user_type, None, extra_data)
+
+    notification_list = []
+    for user in to_user_list:
+        notification_copy_data = notification_data.copy()
+        notification_copy_data.update(
+            {'badge': Notification.objects.filter(notification_to=user, is_read=False).count()})
+        notification_list.append(Notification(notification_type=notification_type,
+                                              notification_to=user,
+                                              notification_from=from_user,
+                                              data=notification_copy_data))
+    Notification.objects.bulk_create(notification_list)
+    to_user_list = to_user_list.filter(user_notification__push_notification=True)
+    send_multiple_push(to_user_list, push_data)
+
+
 @shared_task()
 def send_notification_to_guardian(notification_type, from_user_id, to_user_id, extra_data):
-    from_user = None
+    """
+    :param notification_type:
+    :param from_user_id:
+    :param to_user_id:
+    :param extra_data:
+    :return:
+    """
     if from_user_id:
-        from_user = Junior.objects.filter(auth_id=from_user_id).select_related('auth').first()
+        from_user = Junior.objects.filter(auth_id=from_user_id).first()
         extra_data['from_user_image'] = from_user.image
-        from_user = from_user.auth
+    send_notification(notification_type, from_user_id, to_user_id, extra_data)
-    to_user = Guardian.objects.filter(user_id=to_user_id).select_related('user').first()
-    extra_data['to_user_image'] = to_user.image
-    send_notification(notification_type, from_user, to_user.user, extra_data)
 
 
 @shared_task()
 def send_notification_to_junior(notification_type, from_user_id, to_user_id, extra_data):
-    from_user = None
+    """
+    :param notification_type:
+    :param from_user_id:
+    :param to_user_id:
+    :param extra_data:
+    :return:
+    """
     if from_user_id:
-        from_user = Guardian.objects.filter(user_id=from_user_id).select_related('user').first()
+        from_user = Guardian.objects.filter(user_id=from_user_id).first()
         extra_data['from_user_image'] = from_user.image
-        from_user = from_user.user
+    send_notification(notification_type, from_user_id, to_user_id, extra_data)
-    to_user = Junior.objects.filter(auth_id=to_user_id).select_related('auth').first()
-    extra_data['to_user_image'] = to_user.image
-    send_notification(notification_type, from_user, to_user.auth, extra_data)
-
-

notifications/views.py

@@ -4,40 +4,40 @@ notifications views file
 # django imports
 from django.db.models import Q
 from rest_framework.decorators import action
-from rest_framework.permissions import IsAuthenticated
+from rest_framework.permissions import IsAuthenticated, AllowAny
 from rest_framework.response import Response
 from rest_framework import viewsets, status, views
+
 # local imports
 from account.utils import custom_response, custom_error_response
 from base.messages import SUCCESS_CODE, ERROR_CODE
+from base.pagination import CustomPageNumberPagination
+from base.tasks import notify_task_expiry, notify_top_junior
 from notifications.constants import TEST_NOTIFICATION
-# Import serializer
 from notifications.serializers import RegisterDevice, NotificationListSerializer, ReadNotificationSerializer
-from notifications.utils import send_notification, send_notification_to_guardian, send_notification_to_junior
+from notifications.utils import send_notification
-# Import model
 from notifications.models import Notification
 
 
 class NotificationViewSet(viewsets.GenericViewSet):
-    """ used to do the notification actions """
+    """
+    used to do the notification actions
+    """
     serializer_class = NotificationListSerializer
     permission_classes = [IsAuthenticated, ]
 
     def list(self, request, *args, **kwargs) -> Response:
-        """ list the notifications """
+        """
+        to list user's notifications
+        :param request:
+        :return:
+        """
         queryset = Notification.objects.filter(notification_to_id=request.auth.payload['user_id']
                                                ).select_related('notification_to').order_by('-id')
-        paginator = self.pagination_class()
+        paginator = CustomPageNumberPagination()
         paginated_queryset = paginator.paginate_queryset(queryset, request)
         serializer = self.serializer_class(paginated_queryset, many=True)
-        self.mark_notifications_as_read(serializer.data)
+        return paginator.get_paginated_response(serializer.data)
-        return custom_response(None, serializer.data)
-
-    @staticmethod
-    def mark_notifications_as_read(data):
-        """ used to mark notification queryset as read """
-        ids = [obj['id'] for obj in data]
-        Notification.objects.filter(id__in=ids).update(is_read=True)
 
     @action(methods=['post'], detail=False, url_path='device', url_name='device', serializer_class=RegisterDevice)
     def fcm_registration(self, request):
@@ -53,41 +53,20 @@ class NotificationViewSet(viewsets.GenericViewSet):
     @action(methods=['get'], detail=False, url_path='test', url_name='test')
     def send_test_notification(self, request):
         """
-        to send test notification
+        to test send notification, task expiry, top junior
         :return:
         """
-        send_notification_to_guardian.delay(TEST_NOTIFICATION, None, request.auth.payload['user_id'],
+        notify_task_expiry()
-                                            {'task_id': None})
+        notify_top_junior()
-        send_notification_to_junior.delay(TEST_NOTIFICATION, None, request.auth.payload['user_id'],
+        send_notification(TEST_NOTIFICATION, None, None, request.auth.payload['user_id'],
-                                          {'task_id': None})
+                          {})
         return custom_response(SUCCESS_CODE["3000"])
 
-    @action(methods=['get'], detail=False, url_path='list', url_name='list',
+    @action(methods=['patch'], url_path='mark-as-read', url_name='mark-as-read', detail=False,
-            serializer_class=NotificationListSerializer)
+            serializer_class=ReadNotificationSerializer)
-    def notification_list(self, request):
+    def mark_as_read(self, request, *args, **kwargs):
         """
         notification list
         """
-        try:
+        Notification.objects.filter(id__in=request.data.get('id')).update(is_read=True)
-            queryset = Notification.objects.filter(notification_to=request.user)
+        return custom_response(SUCCESS_CODE['3039'], response_status=status.HTTP_200_OK)
-            serializer = NotificationListSerializer(queryset, many=True)
-            return custom_response(None, serializer.data, response_status=status.HTTP_200_OK)
-        except Exception as e:
-            return custom_error_response(str(e), response_status=status.HTTP_400_BAD_REQUEST)
-
-
-class ReadNotification(views.APIView):
-    """Update notification API"""
-    serializer_class = ReadNotificationSerializer
-    model = Notification
-    permission_classes = [IsAuthenticated]
-
-    def put(self, request, format=None):
-        try:
-            notification_id = self.request.data.get('notification_id')
-            notification_queryset = Notification.objects.filter(id__in=notification_id,
-                                                                notification_to=self.request.user).update(is_read=True)
-            if notification_queryset:
-                return custom_response(SUCCESS_CODE['3039'], response_status=status.HTTP_200_OK)
-        except Exception as e:
-            return custom_error_response(str(e), response_status=status.HTTP_400_BAD_REQUEST)

web_admin/pagination.py

@@ -1,18 +0,0 @@
-"""
-web_admin pagination file
-"""
-# third party imports
-from rest_framework.pagination import PageNumberPagination
-
-from base.constants import NUMBER
-
-
-class CustomPageNumberPagination(PageNumberPagination):
-    """
-    custom paginator class
-    """
-    # Set the desired page size
-    page_size = NUMBER['ten']
-    page_size_query_param = 'page_size'
-    # Set a maximum page size if needed
-    max_page_size = NUMBER['hundred']

web_admin/serializers/analytics_serializer.py

@@ -7,8 +7,9 @@ from rest_framework import serializers
 # django imports
 from django.contrib.auth import get_user_model
 
+from account.utils import get_user_full_name
 # local imports
-from base.constants import USER_TYPE
+from base.constants import USER_TYPE, JUNIOR
 
 from junior.models import JuniorPoints, Junior
 
@@ -36,7 +37,7 @@ class JuniorLeaderboardSerializer(serializers.ModelSerializer):
         :param obj: junior object
         :return: full name
         """
-        return f"{obj.auth.first_name} {obj.auth.last_name}" if obj.auth.last_name else obj.auth.first_name
+        return get_user_full_name(obj.auth)
 
     @staticmethod
     def get_first_name(obj):
@@ -59,6 +60,8 @@ class LeaderboardSerializer(serializers.ModelSerializer):
     """
     leaderboard serializer
     """
+    user_id = serializers.SerializerMethodField()
+    user_type = serializers.SerializerMethodField()
     junior = JuniorLeaderboardSerializer()
     rank = serializers.IntegerField()
 
@@ -67,13 +70,22 @@ class LeaderboardSerializer(serializers.ModelSerializer):
         meta class
         """
         model = JuniorPoints
-        fields = ('total_points', 'rank', 'junior')
+        fields = ('user_id', 'user_type', 'total_points', 'rank', 'junior')
+
+    @staticmethod
+    def get_user_id(obj):
+        return obj.junior.auth.id
+
+    @staticmethod
+    def get_user_type(obj):
+        return JUNIOR
 
 
 class UserCSVReportSerializer(serializers.ModelSerializer):
     """
     user csv/xls report serializer
     """
+    name = serializers.SerializerMethodField()
     phone_number = serializers.SerializerMethodField()
     user_type = serializers.SerializerMethodField()
     is_active = serializers.SerializerMethodField()
@@ -84,7 +96,15 @@ class UserCSVReportSerializer(serializers.ModelSerializer):
         meta class
         """
         model = USER
-        fields = ('first_name', 'last_name', 'email', 'phone_number', 'user_type', 'is_active', 'date_joined')
+        fields = ('name', 'email', 'phone_number', 'user_type', 'is_active', 'date_joined')
+
+    @staticmethod
+    def get_name(obj):
+        """
+        :param obj: user object
+        :return: full name
+        """
+        return get_user_full_name(obj)
 
     @staticmethod
     def get_phone_number(obj):

web_admin/serializers/article_serializer.py

@@ -10,9 +10,12 @@ from base.constants import (ARTICLE_SURVEY_POINTS, MAX_ARTICLE_CARD, MIN_ARTICLE
 # local imports
 from base.messages import ERROR_CODE
 from guardian.utils import upload_image_to_alibaba
+from notifications.constants import NEW_ARTICLE_PUBLISHED
+from notifications.utils import send_notification_multiple_user
 from web_admin.models import Article, ArticleCard, SurveyOption, ArticleSurvey, DefaultArticleCardImage
 from web_admin.utils import pop_id, get_image_url
 from junior.models import JuniorArticlePoints, JuniorArticle
+
 USER = get_user_model()
 
 
@@ -79,7 +82,7 @@ class ArticleSerializer(serializers.ModelSerializer):
         meta class
         """
         model = Article
-        fields = ('id', 'title', 'description', 'article_cards', 'article_survey')
+        fields = ('id', 'title', 'description', 'is_published', 'article_cards', 'article_survey')
 
     def validate(self, attrs):
         """
@@ -88,10 +91,9 @@ class ArticleSerializer(serializers.ModelSerializer):
         """
         article_cards = attrs.get('article_cards', None)
         article_survey = attrs.get('article_survey', None)
-        if article_cards is None or len(article_cards) > int(MAX_ARTICLE_CARD):
+        if not 0 < len(article_cards) <= int(MAX_ARTICLE_CARD):
             raise serializers.ValidationError({'details': ERROR_CODE['2039']})
-        if article_survey is None or len(article_survey) < int(MIN_ARTICLE_SURVEY) or int(
+        if not int(MIN_ARTICLE_SURVEY) <= len(article_survey) <= int(MAX_ARTICLE_SURVEY):
-                MAX_ARTICLE_SURVEY) < len(article_survey):
             raise serializers.ValidationError({'details': ERROR_CODE['2040']})
         return attrs
 
@@ -119,11 +121,15 @@ class ArticleSerializer(serializers.ModelSerializer):
                 option = pop_id(option)
                 SurveyOption.objects.create(survey=survey_obj, **option)
 
+        # All juniors will receive  notification  when admin add any new financial learnings/article
+        send_notification_multiple_user.delay(NEW_ARTICLE_PUBLISHED, None, None, {})
+
         return article
 
     def update(self, instance, validated_data):
         """
         to update article and related table
+        :param validated_data:
         :param instance: article object,
         :return: article object
         """
@@ -179,6 +185,28 @@ class ArticleSerializer(serializers.ModelSerializer):
         return instance
 
 
+class ArticleStatusChangeSerializer(serializers.ModelSerializer):
+    """
+    Article status change serializer
+    """
+    class Meta:
+        """
+        meta class
+        """
+        model = Article
+        fields = ('is_published', )
+
+    def update(self, instance, validated_data):
+        """
+        :param instance: article object
+        :param validated_data:
+        :return:
+        """
+        instance.is_published = validated_data['is_published']
+        instance.save()
+        return instance
+
+
 class DefaultArticleCardImageSerializer(serializers.ModelSerializer):
     """
     Article Card serializer
@@ -215,12 +243,12 @@ class DefaultArticleCardImageSerializer(serializers.ModelSerializer):
         card_image = DefaultArticleCardImage.objects.create(**validated_data)
         return card_image
 
+
 class ArticleListSerializer(serializers.ModelSerializer):
     """
     serializer for article API
     """
-    article_cards = ArticleCardSerializer(many=True)
+    image = serializers.SerializerMethodField('get_image')
-    article_survey = ArticleSurveySerializer(many=True)
     total_points = serializers.SerializerMethodField('get_total_points')
     is_completed = serializers.SerializerMethodField('get_is_completed')
 
@@ -229,12 +257,17 @@ class ArticleListSerializer(serializers.ModelSerializer):
         meta class
         """
         model = Article
-        fields = ('id', 'title', 'description', 'article_cards', 'article_survey', 'total_points', 'is_completed')
+        fields = ('id', 'title', 'description', 'image', 'total_points', 'is_completed')
+
+    def get_image(self, obj):
+        """article image"""
+        if obj.article_cards.first():
+            return obj.article_cards.first().image_url
+        return None
 
     def get_total_points(self, obj):
         """total points of article"""
-        total_question = ArticleSurvey.objects.filter(article=obj).count()
+        return obj.article_survey.all().count() * NUMBER['five']
-        return total_question * NUMBER['five']
 
     def get_is_completed(self, obj):
         """complete all question"""
@@ -244,6 +277,7 @@ class ArticleListSerializer(serializers.ModelSerializer):
             return junior_article.is_completed
         return False
 
+
 class ArticleQuestionSerializer(serializers.ModelSerializer):
     """
     article survey serializer
@@ -254,7 +288,6 @@ class ArticleQuestionSerializer(serializers.ModelSerializer):
     correct_answer = serializers.SerializerMethodField('get_correct_answer')
     attempted_answer = serializers.SerializerMethodField('get_attempted_answer')
 
-
     def get_is_attempt(self, obj):
         """attempt question or not"""
         context_data = self.context.get('user')
@@ -268,14 +301,14 @@ class ArticleQuestionSerializer(serializers.ModelSerializer):
         ans_obj = SurveyOption.objects.filter(survey=obj, is_answer=True).last()
         if ans_obj:
             return ans_obj.id
-        return str("None")
+        return None
 
     def get_attempted_answer(self, obj):
         """attempt question or not"""
         context_data = self.context.get('user')
         junior_article_obj = JuniorArticlePoints.objects.filter(junior__auth=context_data,
-                                                                question=obj, is_answer_correct=True).last()
+                                                                question=obj).last()
-        if junior_article_obj:
+        if junior_article_obj and junior_article_obj.submitted_answer:
             return junior_article_obj.submitted_answer.id
         return None
 
@@ -286,6 +319,7 @@ class ArticleQuestionSerializer(serializers.ModelSerializer):
         model = ArticleSurvey
         fields = ('id', 'question', 'options', 'points', 'is_attempt', 'correct_answer', 'attempted_answer')
 
+
 class StartAssessmentSerializer(serializers.ModelSerializer):
     """
     serializer for article API
@@ -297,9 +331,11 @@ class StartAssessmentSerializer(serializers.ModelSerializer):
         """current page"""
         context_data = self.context.get('user')
         data = JuniorArticle.objects.filter(junior__auth=context_data, article=obj).last()
+        total_count = obj.article_survey.all().count()
         if data:
-            return data.current_que_page
+            return data.current_que_page if data.current_que_page < total_count else data.current_que_page - 1
         return NUMBER['zero']
+
     class Meta(object):
         """
         meta class
@@ -308,7 +344,6 @@ class StartAssessmentSerializer(serializers.ModelSerializer):
         fields = ('article_survey', 'current_page')
 
 
-
 class ArticleCardlistSerializer(serializers.ModelSerializer):
     """
     Article Card serializer

web_admin/serializers/auth_serializer.py

@@ -14,7 +14,7 @@ from account.models import UserEmailOtp
 from base.constants import USER_TYPE
 from base.messages import ERROR_CODE
 from guardian.tasks import generate_otp
-from base.tasks import send_email_otp
+from base.tasks import send_email
 
 USER = get_user_model()
 
@@ -48,11 +48,13 @@ class AdminOTPSerializer(serializers.ModelSerializer):
         :return: user_data
         """
         email = validated_data['email']
-
         verification_code = generate_otp()
-
+        template = 'email_reset_verification.email'
         # Send the verification code to the user's email
-        send_email_otp.delay(email, verification_code)
+        data = {
+            "verification_code": verification_code
+        }
+        send_email.delay([email], template, data)
 
         expiry = timezone.now() + timezone.timedelta(days=1)
         user_data, created = UserEmailOtp.objects.update_or_create(email=email,

web_admin/serializers/user_management_serializer.py

@@ -5,6 +5,7 @@ web_admin user_management serializers file
 from rest_framework import serializers
 from django.contrib.auth import get_user_model
 
+from account.utils import get_user_full_name
 from base.constants import USER_TYPE, GUARDIAN, JUNIOR
 # local imports
 from base.messages import ERROR_CODE, SUCCESS_CODE
@@ -37,7 +38,7 @@ class UserManagementListSerializer(serializers.ModelSerializer):
         :param obj: user object
         :return: full name
         """
-        return f"{obj.first_name} {obj.last_name}" if obj.last_name else obj.first_name
+        return get_user_full_name(obj)
 
     @staticmethod
     def get_country_code(obj):
@@ -144,7 +145,7 @@ class GuardianSerializer(serializers.ModelSerializer):
         :param obj: guardian object
         :return: full name
         """
-        return f"{obj.user.first_name} {obj.user.last_name}" if obj.user.last_name else obj.user.first_name
+        return get_user_full_name(obj.user)
 
     @staticmethod
     def get_first_name(obj):
@@ -222,7 +223,7 @@ class JuniorSerializer(serializers.ModelSerializer):
         :param obj: junior object
         :return: full name
         """
-        return f"{obj.auth.first_name} {obj.auth.last_name}" if obj.auth.last_name else obj.auth.first_name
+        return get_user_full_name(obj.auth)
 
     @staticmethod
     def get_first_name(obj):

web_admin/views/analytics.py

@@ -22,12 +22,12 @@ from django.db.models.functions.window import Rank
 from django.http import HttpResponse
 
 # local imports
-from account.utils import custom_response
+from account.utils import custom_response, get_user_full_name
-from base.constants import PENDING, IN_PROGRESS, REJECTED, REQUESTED, COMPLETED, EXPIRED, DATE_FORMAT, TASK_STATUS
+from base.constants import PENDING, IN_PROGRESS, REJECTED, REQUESTED, COMPLETED, EXPIRED, TASK_STATUS
 from guardian.models import JuniorTask
 from guardian.utils import upload_excel_file_to_alibaba
 from junior.models import JuniorPoints
-from web_admin.pagination import CustomPageNumberPagination
+from base.pagination import CustomPageNumberPagination
 from web_admin.permission import AdminPermission
 from web_admin.serializers.analytics_serializer import LeaderboardSerializer, UserCSVReportSerializer
 from web_admin.utils import get_dates
@@ -107,13 +107,15 @@ class AnalyticsViewSet(GenericViewSet):
 
         assign_tasks = JuniorTask.objects.filter(
                                 created_at__range=[start_date, (end_date + datetime.timedelta(days=1))]
-                                        ).exclude(task_status__in=[PENDING, EXPIRED])
+                                        )
 
         data = {
             'task_completed': assign_tasks.filter(task_status=COMPLETED).count(),
+            'task_pending': assign_tasks.filter(task_status=PENDING).count(),
             'task_in_progress': assign_tasks.filter(task_status=IN_PROGRESS).count(),
             'task_requested': assign_tasks.filter(task_status=REQUESTED).count(),
             'task_rejected': assign_tasks.filter(task_status=REJECTED).count(),
+            'task_expired': assign_tasks.filter(task_status=EXPIRED).count(),
         }
 
         return custom_response(None, data)
@@ -126,10 +128,12 @@ class AnalyticsViewSet(GenericViewSet):
         :param request:
         :return:
         """
-        queryset = JuniorPoints.objects.prefetch_related('junior', 'junior__auth').annotate(rank=Window(
+        queryset = JuniorPoints.objects.filter(
-            expression=Rank(),
+                                    junior__is_verified=True
-            order_by=[F('total_points').desc(), 'junior__created_at']
+                                    ).select_related('junior', 'junior__auth').annotate(rank=Window(
-        )).order_by('-total_points', 'junior__created_at')
+                                        expression=Rank(),
+                                        order_by=[F('total_points').desc(), 'junior__created_at']
+                                    )).order_by('-total_points', 'junior__created_at')
         paginator = CustomPageNumberPagination()
         paginated_queryset = paginator.paginate_queryset(queryset, request)
         serializer = self.serializer_class(paginated_queryset, many=True)
@@ -169,10 +173,9 @@ class AnalyticsViewSet(GenericViewSet):
                 serializer = UserCSVReportSerializer(queryset, many=True)
 
                 df_users = pd.DataFrame([
-                    {'Name': f"{user['first_name']} {user['last_name']}",
+                    {'Name': user['name'], 'Email': user['email'],
-                     'Email': user['email'], 'Phone Number': user['phone_number'],
+                     'Phone Number': user['phone_number'], 'User Type': user['user_type'],
-                     'User Type': user['user_type'], 'Status': user['is_active'],
+                     'Status': user['is_active'], 'Date Joined': user['date_joined']}
-                     'Date Joined': user['date_joined']}
                     for user in serializer.data
                 ])
                 write_excel_worksheet(worksheet, df_users)
@@ -181,10 +184,16 @@ class AnalyticsViewSet(GenericViewSet):
             elif sheet_name == 'Assign Tasks':
                 assign_tasks = JuniorTask.objects.filter(
                     created_at__range=[start_date, (end_date + datetime.timedelta(days=1))]
-                ).exclude(task_status__in=[PENDING, EXPIRED])
+                ).select_related('junior__auth', 'guardian__user').only('task_name', 'task_status',
+                                                                        'junior__auth__first_name',
+                                                                        'junior__auth__last_name',
+                                                                        'guardian__user__first_name',
+                                                                        'guardian__user__last_name',)
 
                 df_tasks = pd.DataFrame([
-                    {'Task Name': task.task_name, 'Task Status': dict(TASK_STATUS).get(task.task_status).capitalize()}
+                    {'Task Name': task.task_name, 'Assign To': get_user_full_name(task.junior.auth),
+                     'Assign By': get_user_full_name(task.guardian.user),
+                     'Task Status': dict(TASK_STATUS).get(task.task_status).capitalize()}
                     for task in assign_tasks
                 ])
 
@@ -192,14 +201,15 @@ class AnalyticsViewSet(GenericViewSet):
 
             # sheet 3 for Juniors Leaderboard and rank
             elif sheet_name == 'Juniors Leaderboard':
-                queryset = JuniorPoints.objects.prefetch_related('junior', 'junior__auth').annotate(rank=Window(
+                queryset = JuniorPoints.objects.filter(
-                    expression=Rank(),
+                                    junior__is_verified=True
-                    order_by=[F('total_points').desc(), 'junior__created_at']
+                                    ).select_related('junior', 'junior__auth').annotate(rank=Window(
-                )).order_by('-total_points', 'junior__created_at')[:15]
+                                        expression=Rank(),
+                                        order_by=[F('total_points').desc(), 'junior__created_at']
+                                    )).order_by('-total_points', 'junior__created_at')[:15]
                 df_leaderboard = pd.DataFrame([
                     {
-                        'Junior Name': f"{junior.junior.auth.first_name} {junior.junior.auth.last_name}"
+                        'Name': get_user_full_name(junior.junior.auth),
-                        if junior.junior.auth.last_name else junior.junior.auth.first_name,
                         'Points': junior.total_points,
                         'Rank': junior.rank
                     }

web_admin/views/article.py

@@ -17,7 +17,7 @@ from web_admin.models import Article, ArticleCard, ArticleSurvey, DefaultArticle
 from web_admin.permission import AdminPermission
 from web_admin.serializers.article_serializer import (ArticleSerializer, ArticleCardSerializer,
                                                       DefaultArticleCardImageSerializer, ArticleListSerializer,
-                                                      ArticleCardlistSerializer)
+                                                      ArticleCardlistSerializer, ArticleStatusChangeSerializer)
 
 USER = get_user_model()
 
@@ -32,7 +32,6 @@ class ArticleViewSet(GenericViewSet, mixins.CreateModelMixin, mixins.UpdateModel
     queryset = Article
     filter_backends = (SearchFilter,)
     search_fields = ['title']
-    http_method_names = ['get', 'post', 'put', 'delete']
 
     def get_queryset(self):
         article = self.queryset.objects.filter(is_deleted=False).prefetch_related(
@@ -130,6 +129,23 @@ class ArticleViewSet(GenericViewSet, mixins.CreateModelMixin, mixins.UpdateModel
             return custom_response(SUCCESS_CODE["3029"])
         return custom_error_response(ERROR_CODE["2041"], status.HTTP_400_BAD_REQUEST)
 
+    @action(methods=['patch'], url_name='status-change', url_path='status-change',
+            detail=True, serializer_class=ArticleStatusChangeSerializer)
+    def article_status_change(self, request, *args, **kwargs):
+        """
+        article un-publish or publish api method
+        :param request: article id and
+                        {
+                          "is_published": true/false
+                        }
+        :return: success message
+        """
+        article = Article.objects.filter(id=kwargs['pk']).first()
+        serializer = self.serializer_class(article, data=request.data)
+        serializer.is_valid(raise_exception=True)
+        serializer.save()
+        return custom_response(SUCCESS_CODE["3038"])
+
     @action(methods=['get'], url_name='remove-card', url_path='remove-card',
             detail=True)
     def remove_article_card(self, request, *args, **kwargs):
@@ -214,7 +230,7 @@ class DefaultArticleCardImagesViewSet(GenericViewSet, mixins.CreateModelMixin, m
         :param request:
         :return: default article card images
         """
-        queryset = self.queryset
+        queryset = self.get_queryset()
         serializer = self.serializer_class(queryset, many=True)
         return custom_response(None, data=serializer.data)
 
@@ -229,10 +245,7 @@ class ArticleListViewSet(GenericViewSet, mixins.ListModelMixin):
     http_method_names = ['get',]
 
     def get_queryset(self):
-        article = self.queryset.objects.filter(is_deleted=False).prefetch_related(
+        queryset = self.queryset.objects.filter(is_deleted=False, is_published=True).order_by('-created_at')
-            'article_cards', 'article_survey', 'article_survey__options'
-        ).order_by('-created_at')
-        queryset = self.filter_queryset(article)
         return queryset
 
     def list(self, request, *args, **kwargs):
@@ -248,7 +261,9 @@ class ArticleListViewSet(GenericViewSet, mixins.ListModelMixin):
         return custom_response(None, data=serializer.data)
 
 class ArticleCardListViewSet(viewsets.ModelViewSet):
-    """Junior Points viewset"""
+    """Article card list
+        use below query param
+        article_id"""
     serializer_class = ArticleCardlistSerializer
     permission_classes = [IsAuthenticated]
     http_method_names = ('get',)
@@ -257,7 +272,9 @@ class ArticleCardListViewSet(viewsets.ModelViewSet):
         """get queryset"""
         return ArticleCard.objects.filter(article=self.request.GET.get('article_id'))
     def list(self, request, *args, **kwargs):
-        """profile view"""
+        """Article card list
+        use below query param
+        article_id"""
 
         try:
             queryset = self.get_queryset()

web_admin/views/user_management.py

@@ -12,8 +12,9 @@ from django.db.models import Q
 
 # local imports
 from account.utils import custom_response, custom_error_response
-from base.constants import USER_TYPE
+from base.constants import USER_TYPE, GUARDIAN, JUNIOR
 from base.messages import SUCCESS_CODE, ERROR_CODE
+from base.tasks import send_email
 from guardian.models import Guardian
 from junior.models import Junior
 from web_admin.permission import AdminPermission
@@ -92,12 +93,14 @@ class UserManagementViewSet(GenericViewSet, mixins.ListModelMixin,
         if self.request.query_params.get('user_type') not in [dict(USER_TYPE).get('1'), dict(USER_TYPE).get('2')]:
             return custom_error_response(ERROR_CODE['2067'], status.HTTP_400_BAD_REQUEST)
         if self.request.query_params.get('user_type') == dict(USER_TYPE).get('2'):
-            guardian = Guardian.objects.filter(user_id=kwargs['pk'], is_verified=True).first()
+            guardian = Guardian.objects.filter(user_id=kwargs['pk'], is_verified=True
+                                               ).select_related('user').first()
             serializer = GuardianSerializer(guardian,
                                             request.data, context={'user_id': kwargs['pk']})
 
         elif self.request.query_params.get('user_type') == dict(USER_TYPE).get('1'):
-            junior = Junior.objects.filter(auth_id=kwargs['pk'], is_verified=True).select_related('auth').first()
+            junior = Junior.objects.filter(auth_id=kwargs['pk'], is_verified=True
+                                           ).select_related('auth').first()
             serializer = JuniorSerializer(junior,
                                           request.data, context={'user_id': kwargs['pk']})
 
@@ -113,17 +116,21 @@ class UserManagementViewSet(GenericViewSet, mixins.ListModelMixin,
         user_type {'guardian' for Guardian, 'junior' for Junior} mandatory
         :return: success message
         """
-        if self.request.query_params.get('user_type') not in [dict(USER_TYPE).get('1'), dict(USER_TYPE).get('2')]:
+        user_type = self.request.query_params.get('user_type')
+        if user_type not in [GUARDIAN, JUNIOR]:
             return custom_error_response(ERROR_CODE['2067'], status.HTTP_400_BAD_REQUEST)
-        queryset = self.queryset
+
-        if self.request.query_params.get('user_type') == dict(USER_TYPE).get('2'):
+        email_template = 'user_deactivate.email'
-            user_obj = queryset.filter(id=kwargs['pk']).first()
+
-            obj = user_obj.guardian_profile.all().first()
+        if user_type == GUARDIAN:
-            obj.is_active = False if obj.is_active else True
+            obj = Guardian.objects.filter(user_id=kwargs['pk'], is_verified=True).select_related('user').first()
-            obj.save()
+        elif user_type == JUNIOR:
-        elif self.request.query_params.get('user_type') == dict(USER_TYPE).get('1'):
+            obj = Junior.objects.filter(auth_id=kwargs['pk'], is_verified=True).select_related('auth').first()
-            user_obj = queryset.filter(id=kwargs['pk']).first()
+
-            obj = user_obj.junior_profile.all().first()
+        if obj.is_active:
-            obj.is_active = False if obj.is_active else True
+            obj.is_active = False
-            obj.save()
+            send_email([obj.user.email if user_type == GUARDIAN else obj.auth.email], email_template)
+        else:
+            obj.is_active = True
+        obj.save()
         return custom_response(SUCCESS_CODE['3038'])

zod_bank/celery.py

@@ -27,19 +27,24 @@ app.config_from_object('django.conf:settings')
 # Load task modules from all registered Django apps.
 app.autodiscover_tasks()
 
+# scheduled task
+app.conf.beat_schedule = {
+    "expired_task": {
+        "task": "guardian.utils.update_expired_task_status",
+        "schedule": crontab(minute=0, hour=0),
+    },
+    'notify_task_expiry': {
+        'task': 'base.tasks.notify_task_expiry',
+        'schedule': crontab(minute='0', hour='18'),
+    },
+    'notify_top_junior': {
+        'task': 'base.tasks.notify_top_junior',
+        'schedule': crontab(minute='0', hour='*/2'),
+    },
+}
+
 
 @app.task(bind=True)
 def debug_task(self):
     """ celery debug task """
     print(f'Request: {self.request!r}')
-
-
-"""cron task"""
-
-
-app.conf.beat_schedule = {
-    "expired_task": {
-            "task": "guardian.utils.update_expired_task_status",
-            "schedule": crontab(minute=0, hour=0),
-    },
-}

zod_bank/settings.py

@@ -35,9 +35,28 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 SECRET_KEY = os.getenv('SECRET_KEY')
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = os.getenv('DEBUG')
+ENV = os.getenv('ENV')
 
 # cors allow setting
-CORS_ORIGIN_ALLOW_ALL = True
+CORS_ORIGIN_ALLOW_ALL = False
+
+# Allow specific origins
+if ENV in ['dev', 'qa', 'stage']:
+    CORS_ALLOWED_ORIGINS = [
+        # backend base url
+        "https://dev-api.zodqaapp.com",
+        "https://qa-api.zodqaapp.com",
+        "https://stage-api.zodqaapp.com",
+
+        # frontend url
+        "http://localhost:3000",
+        "https://zod-dev.zodqaapp.com",
+        "https://zod-qa.zodqaapp.com",
+        "https://zod-stage.zodqaapp.com",
+        # Add more trusted origins as needed
+    ]
+if ENV == "prod":
+    CORS_ALLOWED_ORIGINS = []
 
 # allow all host
 ALLOWED_HOSTS = ['*']
@@ -53,7 +72,7 @@ INSTALLED_APPS = [
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
-    # Add Django rest frame work apps here
+    # Add Django rest framework apps here
     'django_extensions',
     'storages',
     'drf_yasg',

zod_bank/urls.py

@@ -20,12 +20,11 @@ from django.urls import path, include
 from drf_yasg import openapi
 from drf_yasg.views import get_schema_view
 from django.urls import path
-
+from django.conf import settings
 
 schema_view = get_schema_view(openapi.Info(title="Zod Bank API", default_version='v1'), public=True, )
 
 urlpatterns = [
-    path('apidoc/', schema_view.with_ui('swagger', cache_timeout=None), name='schema-swagger-ui'),
     path('admin/', admin.site.urls),
     path('', include(('account.urls', 'account'), namespace='account')),
     path('', include('guardian.urls')),
@@ -33,3 +32,6 @@ urlpatterns = [
     path('', include(('notifications.urls', 'notifications'), namespace='notifications')),
     path('', include(('web_admin.urls', 'web_admin'), namespace='web_admin')),
 ]
+
+if settings.DEBUG:
+    urlpatterns += [(path('apidoc/', schema_view.with_ui('swagger', cache_timeout=None), name='schema-swagger-ui'))]