Merge pull request #49 from KiwiTechLLC/dev

Dev

account/admin.py

@@ -2,9 +2,23 @@
 from django.contrib import admin
 
 """Import django app"""
-from .models import UserProfile, UserEmailOtp, UserPhoneOtp, DefaultTaskImages
+from .models import UserEmailOtp, UserPhoneOtp, DefaultTaskImages, UserNotification, UserDelete
 # Register your models here.
 
+@admin.register(UserDelete)
+class UserDeleteAdmin(admin.ModelAdmin):
+    """User profile admin"""
+    list_display = ['user', 'old_email', 'd_email']
+
+    def __str__(self):
+        return self.user
+@admin.register(UserNotification)
+class UserNotificationAdmin(admin.ModelAdmin):
+    """User profile admin"""
+    list_display = ['user', 'push_notification', 'email_notification', 'sms_notification']
+
+    def __str__(self):
+        return self.image_url
 @admin.register(DefaultTaskImages)
 class DefaultTaskImagesAdmin(admin.ModelAdmin):
     """User profile admin"""
@@ -13,14 +27,6 @@ class DefaultTaskImagesAdmin(admin.ModelAdmin):
     def __str__(self):
         return self.image_url
 
-@admin.register(UserProfile)
-class UserProfileAdmin(admin.ModelAdmin):
-    """User profile admin"""
-    list_display = ['user']
-
-    def __str__(self):
-        return self.user__email
-
 @admin.register(UserEmailOtp)
 class UserEmailOtpAdmin(admin.ModelAdmin):
     """User Email otp admin"""

account/apps.py

@@ -1,6 +1,9 @@
+"""Account app file"""
+"""Import Django"""
 from django.apps import AppConfig
 
 
 class AccountConfig(AppConfig):
+    """default configurations"""
     default_auto_field = 'django.db.models.BigAutoField'
     name = 'account'

account/migrations/0004_userdelete.py

@@ -0,0 +1,31 @@
+# Generated by Django 4.2.2 on 2023-07-10 09:24
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('account', '0003_defaulttaskimages'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='UserDelete',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('old_email', models.EmailField(blank=True, max_length=254, null=True, verbose_name='Original Email')),
+                ('d_email', models.EmailField(blank=True, max_length=254, null=True, verbose_name='Dummy Email')),
+                ('is_active', models.BooleanField(default=True)),
+                ('reason', models.TextField(blank=True, max_length=500, null=True, verbose_name='Reason for Leaving')),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='delete_information_set', to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'db_table': 'user_delete_information',
+            },
+        ),
+    ]

account/migrations/0005_usernotification.py

@@ -0,0 +1,31 @@
+# Generated by Django 4.2.2 on 2023-07-10 12:40
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('account', '0004_userdelete'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='UserNotification',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('push_notification', models.BooleanField(default=True)),
+                ('email_notification', models.BooleanField(default=True)),
+                ('sms_notification', models.BooleanField(default=True)),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+                ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='user_notification', to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'db_table': 'user_notification',
+            },
+        ),
+    ]

account/models.py

@@ -1,6 +1,8 @@
+"""Account module file"""
+"""Django import"""
 from django.db import models
-import random
 from django.contrib.auth.models import User
+"""App import"""
 from base.constants import USER_TYPE
 # Create your models here.
 
@@ -70,6 +72,8 @@ class UserEmailOtp(models.Model):
     class Meta(object):
         """ Meta information """
         db_table = 'user_email_otp'
+        verbose_name = 'User Email OTP'
+        verbose_name_plural = 'User Email OTP'
 
     def __str__(self):
         """return phone as an object"""
@@ -90,3 +94,49 @@ class DefaultTaskImages(models.Model):
     def __str__(self):
         """return phone as an object"""
         return self.task_name
+
+class UserDelete(models.Model):
+    """
+    User delete information
+    """
+    user = models.OneToOneField(User, on_delete=models.CASCADE, related_name='delete_information_set')
+    """Old email"""
+    old_email = models.EmailField(blank=True, null=True, verbose_name='Original Email')
+    """Dummy email"""
+    d_email = models.EmailField(blank=True, null=True, verbose_name='Dummy Email')
+    is_active = models.BooleanField(default=True)
+    """reason for leaving"""
+    reason = models.TextField(max_length=500, blank=True, null=True, verbose_name='Reason for Leaving')
+    created_at = models.DateTimeField(auto_now_add=True)
+
+    class Meta(object):
+        """ Meta information """
+        db_table = 'user_delete_information'
+
+    def __str__(self):
+        return self.user.email
+
+
+class UserNotification(models.Model):
+    """
+    User notification details
+    """
+    user = models.OneToOneField(User, on_delete=models.CASCADE, related_name='user_notification')
+    """Push Notification"""
+    push_notification = models.BooleanField(default=True)
+    """Email Notification"""
+    email_notification = models.BooleanField(default=True)
+    """SMS Notification"""
+    sms_notification = models.BooleanField(default=True)
+
+    created_at = models.DateTimeField(auto_now_add=True)
+    updated_at = models.DateTimeField(auto_now=True)
+
+    class Meta(object):
+        """ Meta information """
+        db_table = 'user_notification'
+        verbose_name = 'User Notification'
+        verbose_name_plural = 'User Notification'
+
+    def __str__(self):
+        return self.user.email

account/serializers.py

@@ -1,25 +1,22 @@
+"""Account serializer"""
+"""Django Imoprt"""
+import random
 from rest_framework import serializers
 from django.contrib.auth.models import User
+from rest_framework_simplejwt.tokens import RefreshToken
+"""App import"""
 from guardian.models import Guardian
 from junior.models import Junior
-from account.models import UserProfile, UserEmailOtp, UserPhoneOtp, DefaultTaskImages
+from account.models import UserEmailOtp, DefaultTaskImages, UserDelete, UserNotification, UserPhoneOtp
 from base.constants import GUARDIAN, JUNIOR, SUPERUSER
-from django.db import transaction
 from base.messages import ERROR_CODE_REQUIRED, ERROR_CODE, SUCCESS_CODE, STATUS_CODE_ERROR
-from django.core.exceptions import ObjectDoesNotExist
-from django.contrib.auth import authenticate
-from rest_framework import viewsets, status
-from rest_framework.decorators import action
-from django.contrib.auth import authenticate, login
-from rest_framework_simplejwt.tokens import RefreshToken
-from guardian.utils import upload_image_to_alibaba
-from .utils import get_token
-
+from .utils import junior_account_update, guardian_account_update
 
 class GoogleLoginSerializer(serializers.Serializer):
+    """google login serializer"""
     access_token = serializers.CharField(max_length=5000, required=True)
 
-    class Meta:
+    class Meta(object):
         """meta class"""
         fields = ('access_token',)
 
@@ -86,9 +83,8 @@ class ChangePasswordSerializer(serializers.Serializer):
 
     def validate_current_password(self, value):
         user = self.context
-        if self.context.password not in ('', None):
-            if user.check_password(value):
-                return value
+        if self.context.password not in ('', None) and user.check_password(value):
+            return value
         raise serializers.ValidationError(ERROR_CODE['2015'])
     def create(self, validated_data):
         new_password = validated_data.pop('new_password')
@@ -109,6 +105,7 @@ class ForgotPasswordSerializer(serializers.Serializer):
     email = serializers.EmailField()
 
 class SuperUserSerializer(serializers.ModelSerializer):
+    """Super admin serializer"""
     user_type = serializers.SerializerMethodField('get_user_type')
 
     def get_user_type(self, obj):
@@ -222,3 +219,68 @@ class DefaultTaskImagesDetailsSerializer(serializers.ModelSerializer):
         """Meta info"""
         model = DefaultTaskImages
         fields = '__all__'
+
+class UserDeleteSerializer(serializers.ModelSerializer):
+    """User Delete Serializer"""
+    class Meta(object):
+        """Meta Information"""
+        model = UserDelete
+        fields = ['reason']
+    def create(self, validated_data):
+        user = self.context['user']
+        user_type = str(self.context['user_type'])
+        data = validated_data.get('reason')
+        passwd = self.context['password']
+        random_num = random.randint(0,10000)
+        user_tb = User.objects.filter(id=user.id).last()
+        if user_tb and user_tb.check_password(passwd):
+            user_type_data = UserEmailOtp.objects.filter(email=user.email).last()
+            if user_type == '1' and user_type_data.user_type == '1':
+                junior_account_update(user_tb)
+            elif user_type == '2' and user_type_data.user_type == '2':
+                guardian_account_update(user_tb)
+            else:
+                raise serializers.ValidationError({"details":ERROR_CODE['2030'],"code":"400", "status":"failed"})
+            user_tb.email = str(random_num) + str('@D_') + '{}'.format(user_tb.username).lower()
+            user_tb.username = str(random_num) + str('@D_') + '{}'.format(user_tb.username).lower()
+            user_tb.password = 'None'
+            d_email = user_tb.email
+            o_mail = user.email
+            instance = UserDelete.objects.create(user=user_tb, d_email=d_email, old_email=o_mail,
+                                                 is_active=True, reason=data)
+            user_tb.save()
+
+            return instance
+        else:
+            raise serializers.ValidationError({"details": ERROR_CODE['2031'], "code": "400", "status": "failed"})
+
+
+class UserNotificationSerializer(serializers.ModelSerializer):
+    """User Notification serializer"""
+    class Meta(object):
+        """Meta info"""
+        model = UserNotification
+        fields = '__all__'
+
+
+class UpdateUserNotificationSerializer(serializers.ModelSerializer):
+    """Update User Notification serializer"""
+    class Meta(object):
+        """Meta info"""
+        model = UserNotification
+        fields = ['push_notification', 'email_notification', 'sms_notification']
+
+    def create(self, validated_data):
+        instance = UserNotification.objects.filter(user=self.context).last()
+        instance.push_notification = validated_data.get('push_notification',instance.push_notification)
+        instance.email_notification = validated_data.get('email_notification', instance.email_notification)
+        instance.sms_notification = validated_data.get('sms_notification', instance.sms_notification)
+        instance.save()
+        return instance
+
+class UserPhoneOtpSerializer(serializers.ModelSerializer):
+    """User Phone serializers"""
+    class Meta(object):
+        """Meta info"""
+        model = UserPhoneOtp
+        fields = '__all__'

account/tests.py

@@ -1,3 +1,5 @@
+"""Test cases file of account"""
+"""Django import"""
 from django.test import TestCase
 
 # Create your tests here.

account/urls.py

@@ -1,27 +1,42 @@
 """ Urls files"""
 """Django import"""
 from django.urls import path, include
-from rest_framework.decorators import api_view
 """Third party import"""
 from rest_framework import routers
+"""Import view functions"""
 from .views import (UserLogin, SendPhoneOtp, UserPhoneVerification, UserEmailVerification, ReSendEmailOtp,
                     ForgotPasswordAPIView, ResetPasswordAPIView, ChangePasswordAPIView, UpdateProfileImage,
                     GoogleLoginViewSet, SigninWithApple, ProfileAPIViewSet, UploadImageAPIViewSet,
-                    DefaultImageAPIViewSet)
+                    DefaultImageAPIViewSet, DeleteUserProfileAPIViewSet, UserNotificationAPIViewSet,
+                    UpdateUserNotificationAPIViewSet)
 """Router"""
 router = routers.SimpleRouter()
 
 """API End points with router"""
 router.register('user', UserLogin, basename='user')
+"""super admin login"""
 router.register('admin', UserLogin, 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')
+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"""
 router.register('resend-email-otp', ReSendEmailOtp, basename='resend-email-otp')
+"""Profile end point"""
 router.register('profile', ProfileAPIViewSet, basename='profile')
+"""Upload default task image end point"""
 router.register('upload-default-task-image', UploadImageAPIViewSet, basename='upload-default-task-image')
+"""Fetch default task image end point"""
 router.register('default-task-image', DefaultImageAPIViewSet, basename='default-task-image')
+"""Delete user account"""
+router.register('delete', DeleteUserProfileAPIViewSet, basename='delete')
+"""user account notification"""
+router.register('user-notification', UserNotificationAPIViewSet, basename='user-notification')
+"""update user account notification"""
+router.register('update-user-notification', UpdateUserNotificationAPIViewSet, basename='update-user-notification')
+"""Define url pattern"""
 urlpatterns = [
     path('api/v1/', include(router.urls)),
     path('api/v1/forgot-password/', ForgotPasswordAPIView.as_view()),

account/utils.py

@@ -1,16 +1,39 @@
 """Account utils"""
-"""Third party Django app"""
+"""Import django"""
 from django.conf import settings
 from rest_framework import viewsets, status
 from rest_framework.response import Response
+"""Third party Django app"""
 from templated_email import send_templated_mail
 import jwt
 from datetime import datetime
 from calendar import timegm
 from uuid import uuid4
 import secrets
+from junior.models import Junior
+from guardian.models import Guardian
+def junior_account_update(user_tb):
+    """junior account delete"""
+    junior_data = Junior.objects.filter(auth__email=user_tb.email).first()
+    if junior_data:
+        junior_data.is_active = False
+        junior_data.is_verified = False
+        junior_data.guardian_code = '{}'
+        junior_data.save()
 
+def guardian_account_update(user_tb):
+    """update guardian account after delete the user account"""
+    guardian_data = Guardian.objects.filter(user__email=user_tb.email).first()
+    if guardian_data:
+        guardian_data.is_active = False
+        guardian_data.is_verified = False
+        guardian_data.save()
+        jun_data = Junior.objects.filter(guardian_code__icontains=str(guardian_data.guardian_code))
+        for data in jun_data:
+            data.guardian_code.remove(guardian_data.guardian_code)
+            data.save()
 def send_otp_email(recipient_email, otp):
+    """Send otp on email with template"""
     from_email = settings.EMAIL_FROM_ADDRESS
     recipient_list = [recipient_email]
     send_templated_mail(
@@ -26,8 +49,8 @@ def send_otp_email(recipient_email, otp):
 def custom_response(detail, data=None, response_status=status.HTTP_200_OK):
     """Custom response code"""
     if not data:
+        """when data is none"""
         data = None
-
     return Response({"data": data, "message": detail, "status": "success", "code": response_status})
 
 
@@ -39,6 +62,7 @@ def custom_error_response(detail, response_status):
     :return: Json response
     """
     if not detail:
+        """when details is empty"""
         detail = {}
     return Response({"error": detail, "status": "failed", "code": response_status})
 
@@ -58,16 +82,20 @@ def generate_jwt_token(token_type: str, now_time: int, data: dict = dict):
     """
     if type(data) == type:
         data = {}
+    """Update data dictionary"""
     data.update({
         'token_type': token_type,
         'iss': 'your_site_url',
         'iat': timegm(datetime.utcnow().utctimetuple()),
         'jti': uuid4().hex
     })
+    """Access and Refresh token"""
     TOKEN_TYPE = ["access", "refresh"]
     if token_type == TOKEN_TYPE[1]:
+        """Refresh token"""
         exp = now_time + settings.SIMPLE_JWT['REFRESH_TOKEN_LIFETIME']
     else:
+        """access token"""
         exp = now_time + settings.SIMPLE_JWT['ACCESS_TOKEN_LIFETIME']
 
     data.update({
@@ -84,10 +112,12 @@ def generate_jwt_token(token_type: str, now_time: int, data: dict = dict):
 def get_token(data: dict = dict):
     """ create access and refresh token """
     now_time = datetime.utcnow()
+    """generate access token"""
     access = generate_jwt_token('access', now_time, data)
+    """generate refresh token"""
     refresh = generate_jwt_token('refresh', now_time, data)
 
     return {
         'access': access,
         'refresh': refresh
-    }
+    }

account/views.py

@@ -1,21 +1,25 @@
+"""Account view """
+"""Django import"""
 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
+"""App Import"""
 from guardian.utils import upload_image_to_alibaba
 from django.contrib.auth import authenticate, login
 from guardian.models import Guardian
 from junior.models import Junior
-from account.models import UserProfile, UserPhoneOtp, UserEmailOtp, DefaultTaskImages
+from account.models import UserProfile, UserPhoneOtp, UserEmailOtp, DefaultTaskImages, UserNotification
 from django.contrib.auth.models import User
+"""Account serializer"""
 from .serializers import (SuperUserSerializer, GuardianSerializer, JuniorSerializer, EmailVerificationSerializer,
                           ForgotPasswordSerializer, ResetPasswordSerializer, ChangePasswordSerializer,
                           GoogleLoginSerializer, UpdateGuardianImageSerializer, UpdateJuniorProfileImageSerializer,
-                          DefaultTaskImagesSerializer, DefaultTaskImagesDetailsSerializer)
+                          DefaultTaskImagesSerializer, DefaultTaskImagesDetailsSerializer, UserDeleteSerializer,
+                          UserNotificationSerializer, UpdateUserNotificationSerializer, UserPhoneOtpSerializer)
 from rest_framework_simplejwt.tokens import RefreshToken
 from base.messages import ERROR_CODE, SUCCESS_CODE
 from guardian.tasks import generate_otp
@@ -29,12 +33,13 @@ from rest_framework import status
 from rest_framework.response import Response
 import requests
 from django.conf import settings
-from .utils import get_token
 from junior.serializers import JuniorProfileSerializer
 from guardian.serializers import GuardianProfileSerializer
 
 class GoogleLoginMixin:
+    """google login mixin"""
     def google_login(self, request):
+        """google login function"""
         access_token = request.data.get('access_token')
         user_type = request.data.get('user_type')
         if not access_token:
@@ -104,8 +109,6 @@ class SigninWithApple(views.APIView):
     def post(self, request):
         token = request.data.get("access_token")
         user_type = request.data.get("user_type")
-        if not token:
-            return custom_error_response(ERROR_CODE['2027'], response_status=status.HTTP_400_BAD_REQUEST)
         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}
@@ -216,6 +219,7 @@ class ForgotPasswordAPIView(views.APIView):
 class SendPhoneOtp(viewsets.ModelViewSet):
     """Send otp on phone"""
     queryset = UserPhoneOtp.objects.all()
+    serializer_class = UserPhoneOtpSerializer
     def create(self, request, *args, **kwargs):
         otp = generate_otp()
         phone_number = self.request.data['phone']
@@ -232,6 +236,7 @@ class SendPhoneOtp(viewsets.ModelViewSet):
 class UserPhoneVerification(viewsets.ModelViewSet):
     """Send otp on phone"""
     queryset = UserPhoneOtp.objects.all()
+    serializer_class = UserPhoneOtpSerializer
     def list(self, request, *args, **kwargs):
         try:
             phone_data = UserPhoneOtp.objects.filter(phone=self.request.GET.get('phone'),
@@ -341,7 +346,8 @@ class UserEmailVerification(viewsets.ModelViewSet):
                         guardian_data.save()
                 refresh = RefreshToken.for_user(user_obj)
                 access_token = str(refresh.access_token)
-                return custom_response(SUCCESS_CODE['3011'], {"auth_token":access_token}, response_status=status.HTTP_200_OK)
+                return custom_response(SUCCESS_CODE['3011'], {"auth_token":access_token},
+                                       response_status=status.HTTP_200_OK)
             else:
                 return custom_error_response(ERROR_CODE["2008"], response_status=status.HTTP_400_BAD_REQUEST)
         except Exception as e:
@@ -372,7 +378,7 @@ class ReSendEmailOtp(viewsets.ModelViewSet):
 class ProfileAPIViewSet(viewsets.ModelViewSet):
     """Profile viewset"""
     queryset = User.objects.all()
-    serializer_class = [JuniorProfileSerializer, GuardianProfileSerializer]
+    serializer_class = JuniorProfileSerializer
     def list(self, request, *args, **kwargs):
         """profile view"""
         if str(self.request.GET.get('user_type')) == '1':
@@ -412,3 +418,46 @@ class DefaultImageAPIViewSet(viewsets.ModelViewSet):
         queryset = DefaultTaskImages.objects.all()
         serializer = DefaultTaskImagesSerializer(queryset, many=True)
         return custom_response(None, serializer.data, response_status=status.HTTP_200_OK)
+
+
+class DeleteUserProfileAPIViewSet(viewsets.GenericViewSet):
+    """ Delete user API view set """
+
+    @action(detail=False, methods=['POST'], url_path='user-account',serializer_class=UserDeleteSerializer,
+            permission_classes=[IsAuthenticated])
+    def account(self, request):
+        user_type = str(request.data['user_type'])
+        password = request.data['password']
+        serializer = self.get_serializer(data=request.data, context={'request': request, 'user': request.user,
+                                                                     'user_type':user_type,
+                                                                     'password':password})
+        if serializer.is_valid():
+            serializer.save()
+            return custom_response(SUCCESS_CODE['3005'], response_status=status.HTTP_200_OK)
+        return custom_error_response(serializer.errors, response_status=status.HTTP_400_BAD_REQUEST)
+
+
+class UserNotificationAPIViewSet(viewsets.ModelViewSet):
+    """notification viewset"""
+    queryset = UserNotification.objects.all()
+    serializer_class = UserNotificationSerializer
+    def list(self, request, *args, **kwargs):
+        """profile view"""
+        queryset = self.queryset.filter(user=request.user)
+        serializer = UserNotificationSerializer(queryset, many=True)
+        return custom_response(None, serializer.data, response_status=status.HTTP_200_OK)
+
+
+class UpdateUserNotificationAPIViewSet(viewsets.ModelViewSet):
+    """Update notification viewset"""
+    queryset = UserNotification.objects.all()
+    serializer_class = UpdateUserNotificationSerializer
+
+    def create(self, request, *args, **kwargs):
+        """profile view"""
+        serializer = UpdateUserNotificationSerializer(data=request.data,
+                                                      context=request.user)
+        if serializer.is_valid():
+            serializer.save()
+            return custom_response(None, serializer.data, response_status=status.HTTP_200_OK)
+        return custom_error_response(serializer.error, response_status=status.HTTP_400_BAD_REQUEST)

base/messages.py

@@ -52,7 +52,9 @@ ERROR_CODE = {
     "2026": "New password should not same as old password",
     "2027": "data should contain `identityToken`",
     "2028": "You are not authorized person to sign up on this platform",
-    "2029": "Validity of otp verification is expired"
+    "2029": "Validity of otp verification is expired",
+    "2030": "Use correct user type and token",
+    "2031":"Invalid password"
 }
 SUCCESS_CODE = {
     # Success code for password
@@ -64,7 +66,7 @@ SUCCESS_CODE = {
     # Success code for password reset
     "3004": "Password reset link has been sent to your email address",
     # Success code for link verified
-    "3005": "Your link has been verified, it's valid",
+    "3005": "Your account is deleted successfully.",
     # Success code for password reset
     "3006": "Your password has been reset successfully.",
     # Success code for password update

guardian/models.py

@@ -5,6 +5,7 @@ from django.contrib.auth import get_user_model
 """Import Django app"""
 from base.constants import GENDERS, TASK_STATUS, PENDING, TASK_POINTS
 from junior.models import Junior
+"""Add user model"""
 User = get_user_model()
 # Create your models here.
 
@@ -44,16 +45,22 @@ class Guardian(models.Model):
         return f'{self.user}'
 
 class JuniorTask(models.Model):
-    """Guardian model"""
+    """Junior Task details model"""
     guardian = models.ForeignKey(Guardian, on_delete=models.CASCADE, related_name='guardian', verbose_name='Guardian')
+    """task details"""
     task_name = models.CharField(max_length=100)
     task_description = models.CharField(max_length=500)
+    """points of the task"""
     points = models.IntegerField(default=TASK_POINTS)
     due_date = models.DateField(auto_now_add=False, null=True, blank=True)
+    """Images of task"""
     default_image = models.URLField(null=True, blank=True, default=None)
     image = models.URLField(null=True, blank=True, default=None)
+    """associated junior with the task"""
     junior = models.ForeignKey(Junior, on_delete=models.CASCADE, related_name='junior', verbose_name='Junior')
+    """task status"""
     task_status = models.CharField(choices=TASK_STATUS, max_length=15, default=PENDING)
+    """task stage"""
     is_active = models.BooleanField(default=True)
     is_approved = models.BooleanField(default=False)
     """Profile created and updated time"""

guardian/serializers.py

@@ -8,7 +8,7 @@ from django.db import transaction
 from django.contrib.auth.models import User
 """Import Django app"""
 from .models import Guardian, JuniorTask
-from account.models import UserProfile, UserEmailOtp
+from account.models import UserProfile, UserEmailOtp, UserNotification
 from account.serializers import JuniorSerializer
 from junior.serializers import JuniorDetailSerializer
 from base.messages import ERROR_CODE, SUCCESS_CODE
@@ -36,7 +36,7 @@ class UserSerializer(serializers.ModelSerializer):
         try:
             """Create user profile"""
             user = User.objects.create_user(username=email, email=email, password=password)
-            UserProfile.objects.create(user=user, user_type=user_type)
+            UserNotification.objects.create(user=user)
             if user_type == '1':
                 Junior.objects.create(auth=user, junior_code=''.join([str(random.randrange(9)) for _ in range(6)]),
                                       referral_code=''.join([str(random.randrange(9)) for _ in range(6)]))
@@ -67,7 +67,7 @@ class CreateGuardianSerializer(serializers.ModelSerializer):
     family_name = serializers.CharField(max_length=100, required=False)
     dob = serializers.DateField(required=False)
     referral_code = serializers.CharField(max_length=100, required=False)
-    image = serializers.ImageField(required=False)
+    image = serializers.URLField(required=False)
 
     class Meta(object):
         """Meta info"""
@@ -93,10 +93,11 @@ class CreateGuardianSerializer(serializers.ModelSerializer):
         user = User.objects.filter(username=self.context['user']).last()
         if user:
             """Save first and last name of guardian"""
-            if self.context.get('first_name') != '' and self.context.get('last_name') != '':
-                user.first_name = self.context.get('first_name', user.first_name)
-                user.last_name = self.context.get('last_name', user.last_name)
-                user.save()
+            if self.context.get('first_name') != '' and self.context.get('first_name') is not None:
+                user.first_name = self.context.get('first_name')
+            if self.context.get('last_name') != '' and self.context.get('last_name') is not None:
+                user.last_name = self.context.get('last_name')
+            user.save()
         """Create guardian data"""
         guardian, created = Guardian.objects.get_or_create(user=self.context['user'])
         if created:
@@ -114,17 +115,14 @@ class CreateGuardianSerializer(serializers.ModelSerializer):
             guardian.passcode = validated_data.get('passcode', guardian.passcode)
             guardian.country_name = validated_data.get('country_name', guardian.country_name)
             guardian.referral_code_used = validated_data.get('referral_code_used', guardian.referral_code_used)
+            guardian.image = validated_data.get('image', guardian.image)
             """Complete profile of the junior if below all data are filled"""
-            complete_profile_field = all([guardian.phone, guardian.gender, guardian.family_name, guardian.country_name,
-                                          guardian.dob, guardian.country_code, user.first_name, user.last_name])
+            complete_profile_field = all([guardian.phone, guardian.gender, guardian.country_name,
+                                          guardian.dob, guardian.country_code, user.first_name, user.last_name,
+                                          user.email, guardian.image])
             guardian.is_complete_profile = False
             if complete_profile_field:
                 guardian.is_complete_profile = True
-            image = validated_data.pop('image', None)
-            if image:
-                filename = f"images/{image.name}"
-                image_url = upload_image_to_alibaba(image, filename)
-                guardian.image = image_url
             guardian.save()
         return guardian
 
@@ -137,10 +135,13 @@ class CreateGuardianSerializer(serializers.ModelSerializer):
 
 
 class TaskSerializer(serializers.ModelSerializer):
+    """Task serializer"""
     class Meta(object):
+        """Meta info"""
         model = JuniorTask
         fields = ['task_name','task_description','points', 'due_date', 'junior', 'default_image']
     def create(self, validated_data):
+        """create default task image data"""
         validated_data['guardian'] = Guardian.objects.filter(user=self.context['user']).last()
         images = self.context['image']
         validated_data['default_image'] = images
@@ -173,26 +174,29 @@ class GuardianDetailSerializer(serializers.ModelSerializer):
                   'updated_at']
 class TaskDetailsSerializer(serializers.ModelSerializer):
 
-    # guardian = GuardianDetailSerializer()
     junior = JuniorDetailSerializer()
     class Meta(object):
+        """Meta info"""
         model = JuniorTask
         fields = ['id', 'guardian', 'task_name', 'task_description', 'points', 'due_date','default_image', 'image',
                   'junior', 'task_status', 'is_active', 'created_at','updated_at']
 
 
 class TopJuniorSerializer(serializers.ModelSerializer):
+    """Top junior serializer"""
     junior = JuniorDetailSerializer()
-    position = serializers.SerializerMethodField()
+    position = serializers.IntegerField()
 
     class Meta:
+        """Meta info"""
         model = JuniorPoints
         fields = ['id', 'junior', 'total_task_points', 'position', 'created_at', 'updated_at']
 
-    def get_position(self, obj):
-        queryset = self.context['view'].get_queryset()
-        position = list(queryset).index(obj) + 1
-        return position
+    def to_representation(self, instance):
+        """Convert instance to representation"""
+        representation = super().to_representation(instance)
+        representation['position'] = instance.position
+        return representation
 
 
 class GuardianProfileSerializer(serializers.ModelSerializer):
@@ -238,4 +242,4 @@ class GuardianProfileSerializer(serializers.ModelSerializer):
         fields = ['id', 'email', 'first_name', 'last_name', 'country_name','country_code', 'phone', 'gender', 'dob',
                   'guardian_code', 'notification_count', 'total_count', 'complete_field_count', 'referral_code',
                   'is_active', 'is_complete_profile', 'created_at', 'image',
-                  'updated_at']
+                  'updated_at']

guardian/utils.py

@@ -1,15 +1,22 @@
+"""Utiles file of guardian"""
+"""Django import"""
 import oss2
 from django.conf import settings
 import tempfile
 
 def upload_image_to_alibaba(image, filename):
+    """upload image on oss alibaba bucket"""
     # Save the image object to a temporary file
     with tempfile.NamedTemporaryFile(delete=False) as temp_file:
+        """write image in temporary file"""
         temp_file.write(image.read())
+        """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')
     return f"https://{settings.ALIYUN_OSS_BUCKET_NAME}.{settings.ALIYUN_OSS_ENDPOINT}/{new_filename}"
 

guardian/views.py

@@ -12,7 +12,7 @@ from .serializers import (UserSerializer, CreateGuardianSerializer, TaskSerializ
 from .models import Guardian, JuniorTask
 from junior.models import Junior, JuniorPoints
 from junior.serializers import JuniorDetailSerializer
-from account.models import UserEmailOtp
+from account.models import UserEmailOtp, UserNotification
 from .tasks import generate_otp
 from account.utils import send_otp_email
 from account.utils import custom_response, custom_error_response
@@ -51,10 +51,18 @@ class UpdateGuardianProfile(viewsets.ViewSet):
 
     def create(self, request, *args, **kwargs):
         """Create guardian profile"""
+        data = request.data
+        image = request.data.get('image')
+        image_url = ''
+        if image:
+            filename = f"images/{image.name}"
+            image_url = upload_image_to_alibaba(image, filename)
+            data = {"image":image_url}
         serializer = CreateGuardianSerializer(context={"user":request.user,
-                                                       "first_name":request.data.get('first_name', ''),
-                                                       "last_name": request.data.get('last_name',' ')},
-                                              data=request.data)
+                                                       "first_name":request.data.get('first_name'),
+                                                       "last_name": request.data.get('last_name'),
+                                                       "image":image_url},
+                                              data=data)
         if serializer.is_valid():
             """save serializer"""
             serializer.save()
@@ -84,7 +92,6 @@ class TaskListAPIView(viewsets.ModelViewSet):
     def list(self, request, *args, **kwargs):
         """Create guardian profile"""
         status_value = self.request.GET.get('status')
-        print("status_value==>",status_value,'===>',type(status_value))
         if str(status_value) == '0':
             queryset = JuniorTask.objects.filter(guardian__user=request.user).order_by('created_at')
         else:
@@ -109,6 +116,7 @@ class CreateTaskAPIView(viewsets.ModelViewSet):
             filename = f"images/{image}"
             image_url = upload_image_to_alibaba(image, filename)
             image_data = image_url
+            data.pop('default_image')
         serializer = TaskSerializer(context={"user":request.user, "image":image_data}, data=data)
         if serializer.is_valid():
             serializer.save()
@@ -152,8 +160,14 @@ class TopJuniorListAPIView(viewsets.ModelViewSet):
         return context
 
     def list(self, request, *args, **kwargs):
-        """fetch junior list those complete their task"""
+        """Fetch junior list of those who complete their tasks"""
         junior_total_points = self.get_queryset().order_by('-total_task_points')
+
+        # Update the position field for each JuniorPoints object
+        for index, junior in enumerate(junior_total_points):
+            junior.position = index + 1
+            junior.save()
+
         serializer = self.get_serializer(junior_total_points, many=True)
         return custom_response(serializer.data, response_status=status.HTTP_200_OK)
 

junior/admin.py

@@ -7,7 +7,7 @@ from .models import Junior, JuniorPoints
 @admin.register(Junior)
 class JuniorAdmin(admin.ModelAdmin):
     """Junior Admin"""
-    list_display = ['auth']
+    list_display = ['auth', 'guardian_code']
 
     def __str__(self):
         """Return email id"""
@@ -16,7 +16,7 @@ class JuniorAdmin(admin.ModelAdmin):
 @admin.register(JuniorPoints)
 class JuniorPointsAdmin(admin.ModelAdmin):
     """Junior Points Admin"""
-    list_display = ['junior', 'total_task_points']
+    list_display = ['junior', 'total_task_points', 'position']
 
     def __str__(self):
         """Return email id"""

junior/migrations/0009_juniorpoints_position.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.2 on 2023-07-10 07:36
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('junior', '0008_juniorpoints'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='juniorpoints',
+            name='position',
+            field=models.IntegerField(blank=True, default=99999, null=True),
+        ),
+    ]

junior/models.py

@@ -47,6 +47,8 @@ class JuniorPoints(models.Model):
     junior = models.OneToOneField(Junior, on_delete=models.CASCADE, related_name='junior_points')
     """Contact details"""
     total_task_points = models.IntegerField(blank=True, null=True, default=0)
+    """position of the junior"""
+    position = models.IntegerField(blank=True, null=True, default=99999)
     """Profile created and updated time"""
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)

junior/serializers.py

@@ -5,7 +5,7 @@ from django.contrib.auth.models import User
 from django.db import transaction
 import random
 """Import django app"""
-from junior.models import Junior
+from junior.models import Junior, JuniorPoints
 from guardian.utils import upload_image_to_alibaba
 from base.messages import ERROR_CODE, SUCCESS_CODE
 from guardian.models import Guardian, JuniorTask
@@ -36,7 +36,7 @@ class CreateJuniorSerializer(serializers.ModelSerializer):
     dob = serializers.DateField(required=False)
     referral_code = serializers.CharField(max_length=100, required=False)
     guardian_code = ListCharField(required=False)
-    image = serializers.ImageField(required=False)
+    image = serializers.URLField(required=False)
 
     class Meta(object):
         """Meta info"""
@@ -59,15 +59,15 @@ class CreateJuniorSerializer(serializers.ModelSerializer):
 
     def create(self, validated_data):
         """Create junior profile"""
-        image = validated_data.get('image', None)
         guardian_code = validated_data.get('guardian_code',None)
         user = User.objects.filter(username=self.context['user']).last()
         if user:
             """Save first and last name of junior"""
-            if self.context.get('first_name') != '' and self.context.get('last_name') != '':
-                user.first_name = self.context.get('first_name', user.first_name)
-                user.last_name = self.context.get('last_name', user.last_name)
-                user.save()
+            if self.context.get('first_name') != '' and self.context.get('first_name') is not None:
+                user.first_name = self.context.get('first_name')
+            if self.context.get('last_name') != '' and self.context.get('last_name') is not None:
+                user.last_name = self.context.get('last_name')
+            user.save()
         """Create junior data"""
         junior, created = Junior.objects.get_or_create(auth=self.context['user'])
         if created:
@@ -89,16 +89,14 @@ class CreateJuniorSerializer(serializers.ModelSerializer):
             junior.phone = validated_data.get('phone', junior.phone)
             junior.country_code = validated_data.get('country_code', junior.country_code)
             junior.referral_code_used = validated_data.get('referral_code_used', junior.referral_code_used)
+            junior.image = validated_data.get('image', junior.image)
             """Complete profile of the junior if below all data are filled"""
-            complete_profile_field = all([junior.phone, junior.gender, junior.country_name,
-                                          junior.dob, junior.country_code, user.first_name, user.last_name])
+            complete_profile_field = all([junior.phone, junior.gender, junior.country_name, junior.image,
+                                          junior.dob, junior.country_code, user.first_name, user.last_name,
+                                          user.email])
             junior.is_complete_profile = False
             if complete_profile_field:
                 junior.is_complete_profile = True
-            if image:
-                filename = f"images/{image.name}"
-                image_url = upload_image_to_alibaba(image, filename)
-                junior.image = image_url
             junior.save()
         return junior
 
@@ -146,6 +144,7 @@ class JuniorDetailListSerializer(serializers.ModelSerializer):
     requested_task = serializers.SerializerMethodField('get_requested_task')
     rejected_task = serializers.SerializerMethodField('get_rejected_task')
     pending_task = serializers.SerializerMethodField('get_pending_task')
+    position = serializers.SerializerMethodField('get_position')
 
 
     def get_auth(self, obj):
@@ -161,6 +160,11 @@ class JuniorDetailListSerializer(serializers.ModelSerializer):
         data = JuniorTask.objects.filter(junior=obj).count()
         return data
 
+    def get_position(self, obj):
+        data = JuniorPoints.objects.filter(junior=obj).last()
+        if data:
+            return data.position
+        return 99999
     def get_points(self, obj):
         data = sum(JuniorTask.objects.filter(junior=obj, task_status=COMPLETED).values_list('points', flat=True))
         return data
@@ -191,7 +195,7 @@ class JuniorDetailListSerializer(serializers.ModelSerializer):
         fields = ['id', 'email', 'first_name', 'last_name', 'country_code', 'phone', 'gender', 'dob',
                   'guardian_code', 'referral_code','is_active', 'is_complete_profile', 'created_at', 'image',
                   'updated_at', 'assigned_task','points', 'pending_task', 'in_progress_task', 'completed_task',
-                  'requested_task', 'rejected_task']
+                  'requested_task', 'rejected_task', 'position']
 
 class JuniorProfileSerializer(serializers.ModelSerializer):
     """junior serializer"""

junior/views.py

@@ -7,6 +7,7 @@ from .serializers import CreateJuniorSerializer, JuniorDetailListSerializer
 from guardian.models import Guardian
 from base.messages import ERROR_CODE, SUCCESS_CODE
 from account.utils import custom_response, custom_error_response
+from guardian.utils import upload_image_to_alibaba
 # Create your views here.
 class UpdateJuniorProfile(viewsets.ViewSet):
     """Update junior profile"""
@@ -16,10 +17,18 @@ class UpdateJuniorProfile(viewsets.ViewSet):
 
     def create(self, request, *args, **kwargs):
         """Use CreateJuniorSerializer"""
-        serializer = CreateJuniorSerializer(context={"user":request.user,
-                                                     "first_name":request.data.get('first_name', ''),
-                                                     "last_name": request.data.get('last_name',' ')},
-                                            data=request.data)
+        request_data = request.data
+        image = request.data.get('image')
+        image_url = ''
+        if image:
+            filename = f"images/{image.name}"
+            image_url = upload_image_to_alibaba(image, filename)
+            request_data = {"image": image_url}
+        serializer = CreateJuniorSerializer(context={"user":request.user, "image":image_url,
+                                                     "first_name": request.data.get('first_name'),
+                                                     "last_name": request.data.get('last_name')
+                                                     },
+                                            data=request_data)
         if serializer.is_valid():
             """save serializer"""
             serializer.save()

manage.py

@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 """Django's command-line utility for administrative tasks."""
 """Django import"""
+"""Import OS module"""
 import os
+"""Import sys module"""
 import sys
 
 
@@ -18,6 +20,7 @@ def main():
             "available on your PYTHONPATH environment variable? Did you "
             "forget to activate a virtual environment?"
         ) from exc
+    """execute command line function"""
     execute_from_command_line(sys.argv)
 
 

zod_bank/settings.py

@@ -93,8 +93,8 @@ REST_FRAMEWORK = {
                 # 'rest_framework.authentication.SessionAuthentication',
                 'rest_framework.authentication.BasicAuthentication',
                 'rest_framework_simplejwt.authentication.JWTAuthentication',],
-    'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.PageNumberPagination',
-    'PAGE_SIZE': 5,  # Set the default pagination size
+                'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.PageNumberPagination',
+                'PAGE_SIZE': 5,
 }
 SIMPLE_JWT = {
     'ACCESS_TOKEN_LIFETIME': timedelta(minutes=50),
@@ -201,22 +201,15 @@ https://docs.djangoproject.com/en/3.0/howto/static-files/"""
 GOOGLE_CLIENT_ID = os.getenv('GOOGLE_CLIENT_ID')
 GOOGLE_CLIENT_SECRET = os.getenv('GOOGLE_CLIENT_SECRET')
 
-# EMAIL_BACKEND = os.getenv('EMAIL_BACKEND')
-# EMAIL_HOST = os.getenv('EMAIL_HOST')
-# EMAIL_PORT = os.getenv('EMAIL_PORT')
-# EMAIL_USE_TLS = os.getenv('EMAIL_USE_TLS')
-# EMAIL_HOST_USER = os.getenv('EMAIL_HOST_USER')  # Replace with your Gmail email address
-# EMAIL_HOST_PASSWORD = os.getenv('EMAIL_HOST_PASSWORD')  # Replace with your Gmail email password or App password
-# EMAIL_FROM_ADDRESS = os.getenv('EMAIL_FROM_ADDRESS')
 
 EMAIL_BACKEND="django.core.mail.backends.smtp.EmailBackend"
 EMAIL_HOST="smtp.sendgrid.net"
 EMAIL_PORT="587"
 EMAIL_USE_TLS="True"
-EMAIL_HOST_USER="apikey"  # Replace with your Gmail email address
+EMAIL_HOST_USER="apikey"
 EMAIL_HOST_PASSWORD="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"
 EMAIL_FROM_ADDRESS="[email protected]"
-# EMAIL_FROM_ADDRESS="[email protected]"
+
 
 ALIYUN_OSS_ACCESS_KEY_ID = os.getenv('ALIYUN_OSS_ACCESS_KEY_ID')
 ALIYUN_OSS_ACCESS_KEY_SECRET = os.getenv('ALIYUN_OSS_ACCESS_KEY_SECRET')