login api with user type

guardian code chnages

account/serializers.py

@@ -216,10 +216,17 @@ class GuardianSerializer(serializers.ModelSerializer):
 
     def get_user_type(self, obj):
         """user type"""
-        email_verified = UserEmailOtp.objects.filter(email=obj.user.username).last()
-        if email_verified and email_verified.user_type is not None:
-            return email_verified.user_type
-        return str(NUMBER['two'])
+        if self.context.get('user_type', ''):
+            return self.context.get('user_type')
+        # remove the below code once user_type can be passed
+        # from everywhere from where this serializer is being called
+        else:
+            email_verified = UserEmailOtp.objects.filter(
+                email=obj.user.username
+            ).last()
+            if email_verified and email_verified.user_type is not None:
+                return email_verified.user_type
+            return str(NUMBER['two'])
 
     def get_auth(self, obj):
         """user email address"""

account/utils.py

@@ -1,4 +1,6 @@
 """Account utils"""
+from celery import shared_task
+
 """Import django"""
 from django.conf import settings
 from rest_framework import viewsets, status
@@ -20,7 +22,7 @@ from rest_framework import serializers
 # Import messages from base package"""
 from junior.models import Junior
 from guardian.models import Guardian
-from account.models import UserDelete
+from account.models import UserDelete, UserDeviceDetails
 from base.messages import ERROR_CODE
 from django.utils import timezone
 from base.constants import NUMBER
@@ -44,7 +46,7 @@ from junior.models import JuniorPoints
 # referral code,
 # Define function for generating
 # alphanumeric code
-
+# otp expiry
 def delete_user_account_condition(user, user_type_data, user_type, user_tb, data, random_num):
     """delete user account"""
     if user_type == '1' and user_type_data == '1':
@@ -109,6 +111,7 @@ def guardian_account_update(user_tb):
         for data in jun_data:
             data.guardian_code.remove(guardian_data.guardian_code)
             data.save()
+@shared_task()
 def send_otp_email(recipient_email, otp):
     """Send otp on email with template"""
     from_email = settings.EMAIL_FROM_ADDRESS
@@ -124,6 +127,20 @@ def send_otp_email(recipient_email, otp):
     )
     return otp
 
+@shared_task
+def user_device_details(user, device_id):
+    """
+    Used to store the device id of the user
+    user: user object
+    device_id: string
+    return
+    """
+    device_details, created = UserDeviceDetails.objects.get_or_create(user=user)
+    if device_details:
+        device_details.device_id = device_id
+        device_details.save()
+
+
 def send_support_email(name, sender, subject, message):
     """Send otp on email with template"""
     to_email = [settings.EMAIL_FROM_ADDRESS]

account/views.py

@@ -1,11 +1,12 @@
 """Account view """
+import threading
+
 from notifications.utils import remove_fcm_token
 
 # django imports
 from datetime import datetime, timedelta
 from rest_framework import viewsets, status, views
 from rest_framework.decorators import action
-import random
 import logging
 from django.utils import timezone
 import jwt
@@ -35,10 +36,10 @@ from .serializers import (SuperUserSerializer, GuardianSerializer, JuniorSeriali
                           AdminLoginSerializer)
 from rest_framework_simplejwt.tokens import RefreshToken
 from base.messages import ERROR_CODE, SUCCESS_CODE
-from base.constants import NUMBER, ZOD, JUN, GRD
+from base.constants import NUMBER, ZOD, JUN, GRD, USER_TYPE_FLAG
 from guardian.tasks import generate_otp
 from account.utils import (send_otp_email, send_support_email, custom_response, custom_error_response,
-                           generate_code, OTP_EXPIRY)
+                           generate_code, OTP_EXPIRY, user_device_details)
 from junior.serializers import JuniorProfileSerializer
 from guardian.serializers import GuardianProfileSerializer
 
@@ -280,29 +281,48 @@ class UserPhoneVerification(viewsets.ModelViewSet):
             return custom_error_response(ERROR_CODE["2008"], response_status=status.HTTP_400_BAD_REQUEST)
 
 
-
 class UserLogin(viewsets.ViewSet):
     """User login"""
     @action(methods=['post'], detail=False)
     def login(self, request):
         username = request.data.get('username')
         password = request.data.get('password')
+        user_type = request.data.get('user_type')
         device_id = request.META.get('HTTP_DEVICE_ID')
         user = authenticate(request, username=username, password=password)
 
         try:
             if user is not None:
                 login(request, user)
-                guardian_data = Guardian.objects.filter(user__username=username, is_verified=True).last()
-                if guardian_data:
-                    serializer = GuardianSerializer(guardian_data).data
-                junior_data = Junior.objects.filter(auth__username=username, is_verified=True).last()
-                if junior_data:
-                    serializer = JuniorSerializer(junior_data).data
-                device_details, created = UserDeviceDetails.objects.get_or_create(user=user)
-                if device_details:
-                    device_details.device_id = device_id
-                    device_details.save()
+                if user_type == USER_TYPE_FLAG["TWO"]:
+                    guardian_data = Guardian.objects.filter(user__username=username, is_verified=True).last()
+                    if guardian_data:
+                        serializer = GuardianSerializer(
+                            guardian_data, context={'user_type': user_type}
+                        ).data
+                    else:
+                        return custom_error_response(
+                            ERROR_CODE["2070"],
+                            response_status=status.HTTP_401_UNAUTHORIZED
+                        )
+                elif user_type == USER_TYPE_FLAG["FIRST"]:
+                    junior_data = Junior.objects.filter(auth__username=username, is_verified=True).last()
+                    if junior_data:
+                        serializer = JuniorSerializer(
+                            junior_data, context={'user_type': user_type}
+                        ).data
+                    else:
+                        return custom_error_response(
+                            ERROR_CODE["2071"],
+                            response_status=status.HTTP_401_UNAUTHORIZED
+                        )
+                else:
+                    return custom_error_response(
+                        ERROR_CODE["2069"],
+                        response_status=status.HTTP_401_UNAUTHORIZED
+                    )
+                # storing device id in using thread so the time would be reduced
+                threading.Thread(target=user_device_details, args=(user, device_id))
                 return custom_response(SUCCESS_CODE['3003'], serializer, response_status=status.HTTP_200_OK)
             else:
                 return custom_error_response(ERROR_CODE["2002"], response_status=status.HTTP_401_UNAUTHORIZED)
@@ -312,9 +332,12 @@ class UserLogin(viewsets.ViewSet):
             refresh = RefreshToken.for_user(user)
             access_token = str(refresh.access_token)
             refresh_token = str(refresh)
-            data = {"auth_token":access_token, "refresh_token":refresh_token, "is_profile_complete": False,
-                    "user_type": email_verified.user_type,
-                    }
+            data = {
+                "auth_token":access_token,
+                "refresh_token":refresh_token,
+                "is_profile_complete": False,
+                "user_type": user_type,
+            }
             is_verified = False
             if email_verified:
                 is_verified = email_verified.is_verified
@@ -323,11 +346,18 @@ class UserLogin(viewsets.ViewSet):
                 email_verified.otp = otp
                 email_verified.save()
                 data.update({"email_otp":otp})
-                send_otp_email(username, otp)
-                return custom_response(ERROR_CODE['2024'], {"email_otp": otp, "is_email_verified": is_verified},
-                                       response_status=status.HTTP_200_OK)
+                send_otp_email.delay(username, otp)
+                return custom_response(
+                    ERROR_CODE['2024'],
+                    {"email_otp": otp, "is_email_verified": is_verified},
+                    response_status=status.HTTP_200_OK
+                )
             data.update({"is_email_verified": is_verified})
-            return custom_response(SUCCESS_CODE['3003'], data, response_status=status.HTTP_200_OK)
+            return custom_response(
+                SUCCESS_CODE['3003'],
+                data,
+                response_status=status.HTTP_200_OK
+            )
 
     @action(methods=['post'], detail=False)
     def admin_login(self, request):

base/constants.py

@@ -50,6 +50,13 @@ USER_TYPE = (
     ('2', 'guardian'),
     ('3', 'superuser')
 )
+
+USER_TYPE_FLAG = {
+    "FIRST" : "1",
+    "TWO" : "2",
+    "THREE": "3"
+}
+
 """gender"""
 GENDERS = (
     ('1', 'Male'),

base/messages.py

@@ -94,7 +94,10 @@ ERROR_CODE = {
     "2065": "Passwords do not match. Please try again.",
     "2066": "Task does not exist or not in expired state",
     "2067": "Action not allowed. User type missing.",
-    "2068": "No guardian associated with this junior"
+    "2068": "No guardian associated with this junior",
+    "2069": "Invalid user type",
+    "2070": "You did not find as a guardian",
+    "2071": "You did not find as a junior"
 
 }
 """Success message code"""

junior/serializers.py

@@ -146,8 +146,8 @@ class JuniorDetailSerializer(serializers.ModelSerializer):
         """Meta info"""
         model = Junior
         fields = ['id', 'email', 'first_name', 'last_name', 'country_code', 'phone', 'gender', 'dob',
-                  'guardian_code', 'image', 'is_invited', 'referral_code','is_active', 'is_complete_profile', 'created_at',
-                  'image', 'updated_at']
+                  'guardian_code', 'image', 'is_invited', 'referral_code','is_active', 'is_complete_profile',
+                  'created_at', 'image', 'updated_at']
 
 class JuniorDetailListSerializer(serializers.ModelSerializer):
     """junior serializer"""
@@ -502,6 +502,7 @@ class RemoveGuardianCodeSerializer(serializers.ModelSerializer):
         model = Junior
         fields = ('id', )
     def update(self, instance, validated_data):
+        instance.guardian_code = None
         instance.guardian_code_status = str(NUMBER['one'])
         instance.save()
         return instance

notifications/views.py

@@ -11,8 +11,10 @@ from rest_framework import viewsets, status, views
 from account.utils import custom_response, custom_error_response
 from base.messages import SUCCESS_CODE, ERROR_CODE
 from notifications.constants import TEST_NOTIFICATION
+# Import serializer
 from notifications.serializers import RegisterDevice, NotificationListSerializer, ReadNotificationSerializer
 from notifications.utils import send_notification
+# Import model
 from notifications.models import Notification
 
 

requirements.txt

@@ -99,6 +99,3 @@ uritemplate==4.1.1
 urllib3==1.26.16
 vine==5.0.0
 wcwidth==0.2.6
-
-pandas==2.0.3
-XlsxWriter==3.1.2

web_admin/pagination.py

@@ -1,18 +1,13 @@
 """
 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 = 10  # Set the desired page size
     page_size_query_param = 'page_size'
-    # Set a maximum page size if needed
-    max_page_size = NUMBER['hundred']
+    max_page_size = 100  # Set a maximum page size if needed

web_admin/serializers/analytics_serializer.py

@@ -1,24 +1,12 @@
 """
 web_admin analytics serializer file
 """
-# third party imports
 from rest_framework import serializers
 
-# django imports
-from django.contrib.auth import get_user_model
-
-# local imports
-from base.constants import USER_TYPE
-
 from junior.models import JuniorPoints, Junior
 
-USER = get_user_model()
-
 
 class JuniorLeaderboardSerializer(serializers.ModelSerializer):
-    """
-    junior leaderboard serializer
-    """
     name = serializers.SerializerMethodField()
     first_name = serializers.SerializerMethodField()
     last_name = serializers.SerializerMethodField()
@@ -56,75 +44,9 @@ class JuniorLeaderboardSerializer(serializers.ModelSerializer):
 
 
 class LeaderboardSerializer(serializers.ModelSerializer):
-    """
-    leaderboard serializer
-    """
     junior = JuniorLeaderboardSerializer()
     rank = serializers.IntegerField()
 
     class Meta:
-        """
-        meta class
-        """
         model = JuniorPoints
         fields = ('total_points', 'rank', 'junior')
-
-
-class UserCSVReportSerializer(serializers.ModelSerializer):
-    """
-    user csv/xls report serializer
-    """
-    phone_number = serializers.SerializerMethodField()
-    user_type = serializers.SerializerMethodField()
-    is_active = serializers.SerializerMethodField()
-    date_joined = serializers.SerializerMethodField()
-
-    class Meta:
-        """
-        meta class
-        """
-        model = USER
-        fields = ('first_name', 'last_name', 'email', 'phone_number', 'user_type', 'is_active', 'date_joined')
-
-    @staticmethod
-    def get_phone_number(obj):
-        """
-        :param obj: user object
-        :return: user phone number
-        """
-        if profile := (obj.guardian_profile.all().first() or obj.junior_profile.all().first()):
-            return f"+{profile.country_code}{profile.phone}" \
-                if profile.country_code and profile.phone else profile.phone
-        else:
-            return None
-
-    @staticmethod
-    def get_user_type(obj):
-        """
-        :param obj: user object
-        :return: user type
-        """
-        if obj.guardian_profile.all().first():
-            return dict(USER_TYPE).get('2').capitalize()
-        elif obj.junior_profile.all().first():
-            return dict(USER_TYPE).get('1').capitalize()
-        else:
-            return None
-
-    @staticmethod
-    def get_is_active(obj):
-        """
-        :param obj: user object
-        :return: user type
-        """
-        if profile := (obj.guardian_profile.all().first() or obj.junior_profile.all().first()):
-            return "Active" if profile.is_active else "Inactive"
-
-    @staticmethod
-    def get_date_joined(obj):
-        """
-        :param obj: user obj
-        :return: formatted date
-        """
-        date = obj.date_joined.strftime("%d %b %Y")
-        return date

web_admin/serializers/article_serializer.py

@@ -224,7 +224,7 @@ class ArticleListSerializer(serializers.ModelSerializer):
     total_points = serializers.SerializerMethodField('get_total_points')
     is_completed = serializers.SerializerMethodField('get_is_completed')
 
-    class Meta:
+    class Meta(object):
         """
         meta class
         """
@@ -238,7 +238,8 @@ class ArticleListSerializer(serializers.ModelSerializer):
 
     def get_is_completed(self, obj):
         """complete all question"""
-        junior_article = JuniorArticle.objects.filter(article=obj).last()
+        context_data = self.context.get('user')
+        junior_article = JuniorArticle.objects.filter(junior__auth=context_data, article=obj).last()
         if junior_article:
             return junior_article.is_completed
         return False
@@ -278,7 +279,7 @@ class ArticleQuestionSerializer(serializers.ModelSerializer):
             return junior_article_obj.submitted_answer.id
         return None
 
-    class Meta:
+    class Meta(object):
         """
         meta class
         """
@@ -299,7 +300,7 @@ class StartAssessmentSerializer(serializers.ModelSerializer):
         if data:
             return data.current_que_page
         return NUMBER['zero']
-    class Meta:
+    class Meta(object):
         """
         meta class
         """
@@ -325,7 +326,7 @@ class ArticleCardlistSerializer(serializers.ModelSerializer):
             return data.current_card_page
         return NUMBER['zero']
 
-    class Meta:
+    class Meta(object):
         """
         meta class
         """

web_admin/serializers/user_management_serializer.py

@@ -5,7 +5,7 @@ web_admin user_management serializers file
 from rest_framework import serializers
 from django.contrib.auth import get_user_model
 
-from base.constants import USER_TYPE, GUARDIAN, JUNIOR
+from base.constants import USER_TYPE
 # local imports
 from base.messages import ERROR_CODE, SUCCESS_CODE
 from guardian.models import Guardian
@@ -210,10 +210,10 @@ class JuniorSerializer(serializers.ModelSerializer):
         """
         instance.auth.email = self.validated_data.get('email', instance.auth.email)
         instance.auth.username = self.validated_data.get('email', instance.auth.username)
-        instance.auth.save(update_fields=['email', 'username'])
+        instance.auth.save()
         instance.country_code = validated_data.get('country_code', instance.country_code)
         instance.phone = validated_data.get('phone', instance.phone)
-        instance.save(update_fields=['country_code', 'phone'])
+        instance.save()
         return instance
 
     @staticmethod
@@ -265,30 +265,33 @@ class UserManagementDetailSerializer(serializers.ModelSerializer):
         model = USER
         fields = ('id', 'user_type', 'email', 'guardian_profile', 'junior_profile', 'associated_users')
 
-    def get_user_type(self, obj):
+    @staticmethod
+    def get_user_type(obj):
         """
         :param obj: user object
         :return: user type
         """
-        return GUARDIAN if self.context['user_type'] == GUARDIAN else JUNIOR
+        if obj.guardian_profile.all().first():
+            return dict(USER_TYPE).get('2')
+        elif obj.junior_profile.all().first():
+            return dict(USER_TYPE).get('1')
+        else:
+            return None
 
-    def get_associated_users(self, obj):
+    @staticmethod
+    def get_associated_users(obj):
         """
         :param obj: user object
         :return: associated user
         """
-        if self.context['user_type'] == GUARDIAN:
-            profile = obj.guardian_profile.all().only('user_id', 'guardian_code').first()
+        if profile := obj.guardian_profile.all().first():
             if profile.guardian_code:
-                junior = Junior.objects.filter(guardian_code__contains=[profile.guardian_code],
-                                               is_verified=True).select_related('auth')
+                junior = Junior.objects.filter(guardian_code__contains=[profile.guardian_code], is_verified=True)
                 serializer = JuniorSerializer(junior, many=True)
                 return serializer.data
-        elif self.context['user_type'] == JUNIOR:
-            profile = obj.junior_profile.all().only('auth_id', 'guardian_code').first()
+        elif profile := obj.junior_profile.all().first():
             if profile.guardian_code:
-                guardian = Guardian.objects.filter(guardian_code__in=profile.guardian_code,
-                                                   is_verified=True).select_related('user')
+                guardian = Guardian.objects.filter(guardian_code__in=profile.guardian_code, is_verified=True)
                 serializer = GuardianSerializer(guardian, many=True)
                 return serializer.data
         else:

web_admin/views/analytics.py

@@ -3,12 +3,6 @@ web_admin analytics view file
 """
 # python imports
 import datetime
-import io
-import pandas as pd
-import xlsxwriter
-import tempfile
-import oss2
-from django.conf import settings
 
 # third party imports
 from rest_framework.viewsets import GenericViewSet
@@ -22,17 +16,15 @@ from django.db.models import Count
 from django.db.models.functions import TruncDate
 from django.db.models import F, Window
 from django.db.models.functions.window import Rank
-from django.http import HttpResponse
 
 # local imports
 from account.utils import custom_response
-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, DATE_FORMAT
 from guardian.models import JuniorTask
 from junior.models import JuniorPoints
 from web_admin.pagination import CustomPageNumberPagination
 from web_admin.permission import AdminPermission
-from web_admin.serializers.analytics_serializer import LeaderboardSerializer, UserCSVReportSerializer
-from web_admin.serializers.user_management_serializer import UserManagementListSerializer
+from web_admin.serializers.analytics_serializer import LeaderboardSerializer
 
 USER = get_user_model()
 
@@ -149,121 +141,3 @@ class AnalyticsViewSet(GenericViewSet):
         paginated_queryset = paginator.paginate_queryset(queryset, request)
         serializer = self.serializer_class(paginated_queryset, many=True)
         return custom_response(None, serializer.data)
-
-    @action(methods=['get'], url_name='export-excel', url_path='export-excel', detail=False)
-    def export_excel(self, request):
-        """
-        to export users count, task details and top juniors in csv/excel file
-        :param request: start_date: date format (yyyy-mm-dd)
-        :param request: end_date: date format (yyyy-mm-dd)
-        :return:
-        """
-
-        response = HttpResponse(content_type='application/vnd.openxmlformats-officedocument.spreadsheetml.sheet')
-        response['Content-Disposition'] = 'attachment; filename="ZOD_Bank_Analytics.xlsx"'
-
-        end_date = datetime.date.today()
-        start_date = end_date - datetime.timedelta(days=6)
-
-        if request.query_params.get('start_date') and request.query_params.get('end_date'):
-            start_date = datetime.datetime.strptime(request.query_params.get('start_date'), DATE_FORMAT)
-            end_date = datetime.datetime.strptime(request.query_params.get('end_date'), DATE_FORMAT)
-
-        # Use BytesIO for binary data
-        buffer = io.BytesIO()
-
-        # Create an XlsxWriter Workbook object
-        workbook = xlsxwriter.Workbook(buffer)
-
-        # Add sheets
-        sheets = ['Users', 'Assign Tasks', 'Juniors leaderboard']
-
-        for sheet_name in sheets:
-            worksheet = workbook.add_worksheet(name=sheet_name)
-
-            # sheet 1 for Total Users
-            if sheet_name == 'Users':
-                user_qs = self.get_queryset()
-                queryset = user_qs.filter(date_joined__range=(start_date, (end_date + datetime.timedelta(days=1))))
-                serializer = UserCSVReportSerializer(queryset, many=True)
-
-                df_users = pd.DataFrame([
-                    {'Name': f"{user['first_name']} {user['last_name']}",
-                     'Email': user['email'], 'Phone Number': user['phone_number'],
-                     'User Type': user['user_type'], 'Status': user['is_active'],
-                     'Date Joined': user['date_joined']}
-                    for user in serializer.data
-                ])
-                for idx, col in enumerate(df_users.columns):
-                    # Write header
-                    worksheet.write(0, idx, col)
-                for row_num, row in enumerate(df_users.values, start=1):
-                    for col_num, value in enumerate(row):
-                        worksheet.write(row_num, col_num, value)
-
-            # sheet 2 for Assign Task
-            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])
-
-                df_tasks = pd.DataFrame([
-                    {'Task Name': task.task_name, 'Task Status': dict(TASK_STATUS).get(task.task_status).capitalize()}
-                    for task in assign_tasks
-                ])
-
-                for idx, col in enumerate(df_tasks.columns):
-                    # Write header
-                    worksheet.write(0, idx, col)
-                for row_num, row in enumerate(df_tasks.values, start=1):
-                    for col_num, value in enumerate(row):
-                        worksheet.write(row_num, col_num, value)
-
-            # sheet 3 for Juniors Leaderboard and rank
-            elif sheet_name == 'Juniors leaderboard':
-                queryset = JuniorPoints.objects.prefetch_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')
-
-                df_leaderboard = pd.DataFrame([
-                    {
-                        'Junior Name': f"{junior.junior.auth.first_name} {junior.junior.auth.last_name}"
-                        if junior.junior.auth.last_name else junior.junior.auth.first_name,
-                        'Points': junior.total_points,
-                        'Rank': junior.rank
-                    }
-                    for junior in queryset
-                ])
-
-                for idx, col in enumerate(df_leaderboard.columns):
-                    # Write header
-                    worksheet.write(0, idx, col)
-                for row_num, row in enumerate(df_leaderboard.values, start=1):
-                    for col_num, value in enumerate(row):
-                        worksheet.write(row_num, col_num, value)
-
-        # Close the workbook to save the content
-        workbook.close()
-
-        # Reset the buffer position and write the content to the response
-        buffer.seek(0)
-        response.write(buffer.getvalue())
-        buffer.close()
-
-        filename = f"{'analytics'}/{'ZOD_Bank_Analytics.xlsx'}"
-        with tempfile.NamedTemporaryFile(delete=False) as temp_file:
-            """write image in temporary file"""
-            temp_file.write(response.content)
-            """auth of bucket"""
-            auth = oss2.Auth(settings.ALIYUN_OSS_ACCESS_KEY_ID, settings.ALIYUN_OSS_ACCESS_KEY_SECRET)
-            """fetch bucket details"""
-            bucket = oss2.Bucket(auth, settings.ALIYUN_OSS_ENDPOINT, settings.ALIYUN_OSS_BUCKET_NAME)
-            # Upload the temporary file to Alibaba OSS
-            bucket.put_object_from_file(filename, temp_file.name)
-            """create perfect url for image"""
-            new_filename = filename.replace(' ', '%20')
-        link = f"https://{settings.ALIYUN_OSS_BUCKET_NAME}.{settings.ALIYUN_OSS_ENDPOINT}/{new_filename}"
-        print(link)
-        return custom_response(None, link)
-

web_admin/views/article.py

@@ -221,10 +221,7 @@ class ArticleListViewSet(GenericViewSet, mixins.ListModelMixin):
         :return: list of article
         """
         queryset = self.get_queryset()
-        count = queryset.count()
-        paginator = self.pagination_class()
-        paginated_queryset = paginator.paginate_queryset(queryset, request)
-        serializer = self.serializer_class(paginated_queryset, many=True)
+        serializer = self.serializer_class(queryset, context={"user": request.user}, many=True)
         return custom_response(None, data=serializer.data)
 
 class ArticleCardListViewSet(viewsets.ModelViewSet):

web_admin/views/user_management.py

@@ -14,8 +14,6 @@ from django.db.models import Q
 from account.utils import custom_response, custom_error_response
 from base.constants import USER_TYPE
 from base.messages import SUCCESS_CODE, ERROR_CODE
-from guardian.models import Guardian
-from junior.models import Junior
 from web_admin.permission import AdminPermission
 from web_admin.serializers.user_management_serializer import (UserManagementListSerializer,
                                                               UserManagementDetailSerializer, GuardianSerializer,
@@ -72,14 +70,12 @@ 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)
-
         queryset = self.queryset
-        queryset = queryset.filter(id=kwargs['pk'])
-
-        serializer = UserManagementDetailSerializer(
-            queryset, many=True,
-            context={'user_type': self.request.query_params.get('user_type')}
-        )
+        if self.request.query_params.get('user_type') == dict(USER_TYPE).get('2'):
+            queryset = queryset.filter(guardian_profile__user__id=kwargs['pk'])
+        elif self.request.query_params.get('user_type') == dict(USER_TYPE).get('1'):
+            queryset = queryset.filter(junior_profile__auth__id=kwargs['pk'])
+        serializer = UserManagementDetailSerializer(queryset, many=True)
         return custom_response(None, data=serializer.data)
 
     def partial_update(self, request, *args, **kwargs):
@@ -91,14 +87,15 @@ 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)
+        queryset = self.queryset
         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()
-            serializer = GuardianSerializer(guardian,
+            user_obj = queryset.filter(guardian_profile__user__id=kwargs['pk']).first()
+            serializer = GuardianSerializer(user_obj.guardian_profile.all().first(),
                                             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()
-            serializer = JuniorSerializer(junior,
+            user_obj = queryset.filter(junior_profile__auth__id=kwargs['pk']).first()
+            serializer = JuniorSerializer(user_obj.junior_profile.all().first(),
                                           request.data, context={'user_id': kwargs['pk']})
 
         serializer.is_valid(raise_exception=True)
@@ -117,12 +114,12 @@ class UserManagementViewSet(GenericViewSet, mixins.ListModelMixin,
             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'):
-            user_obj = queryset.filter(id=kwargs['pk']).first()
+            user_obj = queryset.filter(guardian_profile__user__id=kwargs['pk']).first()
             obj = user_obj.guardian_profile.all().first()
             obj.is_active = False if obj.is_active else True
             obj.save()
         elif self.request.query_params.get('user_type') == dict(USER_TYPE).get('1'):
-            user_obj = queryset.filter(id=kwargs['pk']).first()
+            user_obj = queryset.filter(junior_profile__auth__id=kwargs['pk']).first()
             obj = user_obj.junior_profile.all().first()
             obj.is_active = False if obj.is_active else True
             obj.save()

zod_bank/settings.py

@@ -125,7 +125,6 @@ SIMPLE_JWT = {
 # Database
 # https://docs.djangoproject.com/en/3.0/ref/settings/#databases
 DATABASES = {
-    # default db setting
     'default': {
         'ENGINE': 'django.contrib.gis.db.backends.postgis',
         'NAME':os.getenv('DB_NAME'),
@@ -178,9 +177,6 @@ AUTH_PASSWORD_VALIDATORS = [
     },
 ]
 
-# database query logs settings
-# Allows us to check db hits
-# useful to optimize db query and hit
 LOGGING = {
     "version": 1,
     "filters": {
@@ -197,7 +193,6 @@ LOGGING = {
             "class": "logging.StreamHandler"
         }
     },
-    # database logger
     "loggers": {
         "django.db.backends": {
             "level": "DEBUG",
@@ -247,7 +242,6 @@ CORS_ALLOW_HEADERS = (
     'x-requested-with',
 )
 
-# CORS header settings
 CORS_EXPOSE_HEADERS = (
     'Access-Control-Allow-Origin: *',
 )
@@ -303,7 +297,5 @@ STATIC_URL = 'static/'
 # define static root
 STATIC_ROOT = 'static'
 
-# media url
 MEDIA_URL = "/media/"
-# media path
 MEDIA_ROOT = os.path.join(os.path.dirname(BASE_DIR), 'media')