From 5d528b885abbb139237627dfe200431491fa050f Mon Sep 17 00:00:00 2001 From: jain Date: Thu, 13 Jul 2023 19:24:33 +0530 Subject: [PATCH 01/38] jira-18 approval API --- account/utils.py | 6 ++++++ base/messages.py | 4 +++- guardian/serializers.py | 16 ++++++++++++++++ guardian/urls.py | 4 +++- guardian/views.py | 26 +++++++++++++++++++++++++- 5 files changed, 53 insertions(+), 3 deletions(-) diff --git a/account/utils.py b/account/utils.py index 3b74d24..846add9 100644 --- a/account/utils.py +++ b/account/utils.py @@ -187,3 +187,9 @@ def generate_alphanumeric_code(length): code = ''.join(secrets.choice(alphabet) for _ in range(length)) return code + +def generate_code(value, user_id): + alphabet = value + user_id.zfill(3) + return alphabet + + diff --git a/base/messages.py b/base/messages.py index 2c0d9cd..ffbbbec 100644 --- a/base/messages.py +++ b/base/messages.py @@ -93,7 +93,9 @@ SUCCESS_CODE = { "3019": "Support Email sent successfully", "3020": "Logged out successfully.", "3021": "Add junior successfully", - "3022": "Remove junior successfully" + "3022": "Remove junior successfully", + "3023": "Approved junior successfully", + "3024": "Reject junior request successfully" } STATUS_CODE_ERROR = { diff --git a/guardian/serializers.py b/guardian/serializers.py index 65def21..9d2a676 100644 --- a/guardian/serializers.py +++ b/guardian/serializers.py @@ -241,3 +241,19 @@ class GuardianProfileSerializer(serializers.ModelSerializer): 'guardian_code', 'notification_count', 'total_count', 'complete_field_count', 'referral_code', 'is_active', 'is_complete_profile', 'created_at', 'image', 'signup_method', 'updated_at', 'passcode'] + +class ApproveJuniorSerializer(serializers.ModelSerializer): + """approve junior serializer""" + class Meta(object): + """Meta info""" + model = Junior + fields = ['id', 'guardian_code'] + + def create(self, validated_data): + """update guardian code""" + instance = self.context['junior'] + instance.guardian_code = [self.context['guardian_code']] + instance.save() + return instance + + diff --git a/guardian/urls.py b/guardian/urls.py index b69b041..168610b 100644 --- a/guardian/urls.py +++ b/guardian/urls.py @@ -2,7 +2,7 @@ """Django import""" from django.urls import path, include from .views import (SignupViewset, UpdateGuardianProfile, AllTaskListAPIView, CreateTaskAPIView, TaskListAPIView, - SearchTaskListAPIView, TopJuniorListAPIView) + SearchTaskListAPIView, TopJuniorListAPIView, ApproveJuniorAPIView) """Third party import""" from rest_framework import routers @@ -24,6 +24,8 @@ router.register('task-list', TaskListAPIView, basename='task-list') router.register('top-junior', TopJuniorListAPIView, basename='top-junior') """Search Task list on the bases of status, due date, and task title API""" router.register('filter-task', SearchTaskListAPIView, basename='filter-task') +"""Approve junior API""" +router.register('approve-junior', ApproveJuniorAPIView, basename='approve-junior') """Define Url pattern""" urlpatterns = [ path('api/v1/', include(router.urls)), diff --git a/guardian/views.py b/guardian/views.py index 61bf9b9..f060732 100644 --- a/guardian/views.py +++ b/guardian/views.py @@ -9,7 +9,7 @@ from PIL import Image from datetime import datetime, timedelta """Import Django app""" from .serializers import (UserSerializer, CreateGuardianSerializer, TaskSerializer, TaskDetailsSerializer, - TopJuniorSerializer) + TopJuniorSerializer, ApproveJuniorSerializer) from .models import Guardian, JuniorTask from junior.models import Junior, JuniorPoints from junior.serializers import JuniorDetailSerializer @@ -114,6 +114,7 @@ class CreateTaskAPIView(viewsets.ModelViewSet): def create(self, request, *args, **kwargs): image = request.data['default_image'] data = request.data + print("data===>",data,'==>',type(data)) if 'https' in str(image): image_data = image else: @@ -178,3 +179,26 @@ class TopJuniorListAPIView(viewsets.ModelViewSet): return custom_response(None, serializer.data, response_status=status.HTTP_200_OK) +class ApproveJuniorAPIView(viewsets.ViewSet): + """approve junior by guardian""" + serializer_class = ApproveJuniorSerializer + permission_classes = [IsAuthenticated] + + def get_queryset(self): + """Get the queryset for the view""" + guardian = Guardian.objects.filter(user__email=self.request.user).last() + junior_queryset = Junior.objects.filter(id=self.request.data.get('junior_id')).last() + return guardian, junior_queryset + + def create(self, request, *args, **kwargs): + """ junior list""" + queryset = self.get_queryset() + if request.data['action'] == '1': + serializer = ApproveJuniorSerializer(context={"guardian_code": queryset[0].guardian_code, + "junior": queryset[1], "action": request.data['action']}, + data=request.data) + if serializer.is_valid(): + serializer.save() + return custom_response(SUCCESS_CODE['3023'], serializer.data, response_status=status.HTTP_200_OK) + else: + return custom_response(SUCCESS_CODE['3024'], response_status=status.HTTP_200_OK) From a4d9997580b69973d271841eacdcaa55393042dc Mon Sep 17 00:00:00 2001 From: abutalib-kiwi Date: Thu, 13 Jul 2023 19:51:17 +0530 Subject: [PATCH 02/38] web_admin module added, api for article created --- web_admin/__init__.py | 0 web_admin/admin.py | 27 +++++++++++++ web_admin/apps.py | 6 +++ web_admin/migrations/0001_initial.py | 60 ++++++++++++++++++++++++++++ web_admin/migrations/__init__.py | 0 web_admin/models.py | 54 +++++++++++++++++++++++++ web_admin/serializers.py | 55 +++++++++++++++++++++++++ web_admin/tests.py | 3 ++ web_admin/urls.py | 16 ++++++++ web_admin/views.py | 23 +++++++++++ zod_bank/settings.py | 3 ++ zod_bank/urls.py | 1 + 12 files changed, 248 insertions(+) create mode 100644 web_admin/__init__.py create mode 100644 web_admin/admin.py create mode 100644 web_admin/apps.py create mode 100644 web_admin/migrations/0001_initial.py create mode 100644 web_admin/migrations/__init__.py create mode 100644 web_admin/models.py create mode 100644 web_admin/serializers.py create mode 100644 web_admin/tests.py create mode 100644 web_admin/urls.py create mode 100644 web_admin/views.py diff --git a/web_admin/__init__.py b/web_admin/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/web_admin/admin.py b/web_admin/admin.py new file mode 100644 index 0000000..b5367ef --- /dev/null +++ b/web_admin/admin.py @@ -0,0 +1,27 @@ +from django.contrib import admin + +from web_admin.models import Article, ArticleCard, ArticleSurvey, SurveyOption + + +@admin.register(Article) +class ArticleAdmin(admin.ModelAdmin): + """Junior Points Admin""" + list_display = ['id', 'title', 'description', 'is_published'] + + +@admin.register(ArticleCard) +class ArticleAdmin(admin.ModelAdmin): + """Junior Points Admin""" + list_display = ['id', 'article', 'title', 'description', 'image'] + + +@admin.register(ArticleSurvey) +class ArticleAdmin(admin.ModelAdmin): + """Junior Points Admin""" + list_display = ['id', 'article', 'question', 'points'] + + +@admin.register(SurveyOption) +class ArticleAdmin(admin.ModelAdmin): + """Junior Points Admin""" + list_display = ['id', 'survey', 'option', 'is_answer'] diff --git a/web_admin/apps.py b/web_admin/apps.py new file mode 100644 index 0000000..9701a1f --- /dev/null +++ b/web_admin/apps.py @@ -0,0 +1,6 @@ +from django.apps import AppConfig + + +class WebAdminConfig(AppConfig): + default_auto_field = 'django.db.models.BigAutoField' + name = 'web_admin' diff --git a/web_admin/migrations/0001_initial.py b/web_admin/migrations/0001_initial.py new file mode 100644 index 0000000..e652b7c --- /dev/null +++ b/web_admin/migrations/0001_initial.py @@ -0,0 +1,60 @@ +# Generated by Django 4.2.2 on 2023-07-13 13:01 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ] + + operations = [ + migrations.CreateModel( + name='Article', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('title', models.CharField(max_length=255)), + ('description', models.TextField()), + ('created_at', models.DateTimeField(auto_now_add=True)), + ('updated_at', models.DateTimeField(auto_now=True)), + ('is_published', models.BooleanField(default=False)), + ], + ), + migrations.CreateModel( + name='ArticleSurvey', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('question', models.CharField(max_length=255)), + ('points', models.IntegerField()), + ('created_at', models.DateTimeField(auto_now_add=True)), + ('updated_at', models.DateTimeField(auto_now=True)), + ('article', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='web_admin.article')), + ], + ), + migrations.CreateModel( + name='SurveyOption', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('option', models.CharField(max_length=255)), + ('is_answer', models.BooleanField(default=False)), + ('created_at', models.DateTimeField(auto_now_add=True)), + ('updated_at', models.DateTimeField(auto_now=True)), + ('survey', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='web_admin.articlesurvey')), + ], + ), + migrations.CreateModel( + name='ArticleCard', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('title', models.CharField(max_length=255)), + ('description', models.TextField()), + ('image', models.ImageField(upload_to='card_images/')), + ('created_at', models.DateTimeField(auto_now_add=True)), + ('updated_at', models.DateTimeField(auto_now=True)), + ('article', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='web_admin.article')), + ], + ), + ] diff --git a/web_admin/migrations/__init__.py b/web_admin/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/web_admin/models.py b/web_admin/models.py new file mode 100644 index 0000000..411b0f9 --- /dev/null +++ b/web_admin/models.py @@ -0,0 +1,54 @@ +""" +web_admin model file +""" +# django imports +from django.db import models + + +class Article(models.Model): + title = models.CharField(max_length=255) + description = models.TextField() + created_at = models.DateTimeField(auto_now_add=True) + updated_at = models.DateTimeField(auto_now=True) + is_published = models.BooleanField(default=False) + + def __str__(self): + """Return title""" + return f'{self.id} | {self.title}' + + +class ArticleCard(models.Model): + article = models.ForeignKey(Article, on_delete=models.CASCADE) + title = models.CharField(max_length=255) + description = models.TextField() + image = models.ImageField(upload_to='card_images/') + created_at = models.DateTimeField(auto_now_add=True) + updated_at = models.DateTimeField(auto_now=True) + + def __str__(self): + """Return title""" + return f'{self.id} | {self.title}' + + +class ArticleSurvey(models.Model): + article = models.ForeignKey(Article, on_delete=models.CASCADE) + question = models.CharField(max_length=255) + points = models.IntegerField() + created_at = models.DateTimeField(auto_now_add=True) + updated_at = models.DateTimeField(auto_now=True) + + def __str__(self): + """Return title""" + return f'{self.id} | {self.article}' + + +class SurveyOption(models.Model): + survey = models.ForeignKey(ArticleSurvey, on_delete=models.CASCADE) + option = models.CharField(max_length=255) + is_answer = models.BooleanField(default=False) + created_at = models.DateTimeField(auto_now_add=True) + updated_at = models.DateTimeField(auto_now=True) + + def __str__(self): + """Return title""" + return f'{self.id} | {self.survey}' diff --git a/web_admin/serializers.py b/web_admin/serializers.py new file mode 100644 index 0000000..69fcb00 --- /dev/null +++ b/web_admin/serializers.py @@ -0,0 +1,55 @@ +""" +web_admin serializers file +""" +from rest_framework import serializers + +from web_admin.models import Article, ArticleCard, SurveyOption, ArticleSurvey + + +class ArticleCardSerializer(serializers.ModelSerializer): + class Meta: + model = ArticleCard + fields = ('title', 'description') + + +class SurveyOptionSerializer(serializers.ModelSerializer): + class Meta: + model = SurveyOption + fields = ('option', 'is_answer') + + +class ArticleSurveySerializer(serializers.ModelSerializer): + options = SurveyOptionSerializer(many=True) + + class Meta: + model = ArticleSurvey + fields = ('question', 'points', 'options') + + +class ArticleSerializer(serializers.ModelSerializer): + article_cards = ArticleCardSerializer(many=True) + article_survey = ArticleSurveySerializer(many=True) + + class Meta: + """ + meta class + """ + model = Article + fields = ('title', 'description', 'article_cards', 'article_survey') + + def create(self, validated_data): + article_cards = validated_data.pop('article_cards') + article_survey = validated_data.pop('article_survey') + + article = Article.objects.create(**validated_data) + + for card in article_cards: + ArticleCard.objects.create(article=article, **card) + + for survey in article_survey: + options = survey.pop('options') + survey_obj = ArticleSurvey.objects.create(article=article, **survey) + for option in options: + SurveyOption.objects.create(survey=survey_obj, **option) + + return article diff --git a/web_admin/tests.py b/web_admin/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/web_admin/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/web_admin/urls.py b/web_admin/urls.py new file mode 100644 index 0000000..d79fafa --- /dev/null +++ b/web_admin/urls.py @@ -0,0 +1,16 @@ +""" +web_admin urls file +""" +# django imports +from django.urls import path, include +from rest_framework import routers + +from web_admin.views import ArticleViewSet + +router = routers.SimpleRouter() + +router.register('article', ArticleViewSet, basename='article') + +urlpatterns = [ + path('api/v1/', include(router.urls)), +] diff --git a/web_admin/views.py b/web_admin/views.py new file mode 100644 index 0000000..7eecd8d --- /dev/null +++ b/web_admin/views.py @@ -0,0 +1,23 @@ +""" +web_admin views file +""" +# django imports +from rest_framework.viewsets import GenericViewSet, mixins +from rest_framework.response import Response +from rest_framework import status + +# local imports +from web_admin.models import Article +from web_admin.serializers import ArticleSerializer + + +class ArticleViewSet(GenericViewSet, mixins.CreateModelMixin): + serializer_class = ArticleSerializer + permission_classes = [] + queryset = Article.objects.all() + + def create(self, request, *args, **kwargs): + serializer = self.serializer_class(data=request.data) + serializer.is_valid(raise_exception=True) + serializer.save() + return Response({'message': "created"}, status=status.HTTP_201_CREATED) diff --git a/zod_bank/settings.py b/zod_bank/settings.py index d98d2db..a4c37f5 100644 --- a/zod_bank/settings.py +++ b/zod_bank/settings.py @@ -56,6 +56,7 @@ INSTALLED_APPS = [ 'account', 'junior', 'guardian', + 'web_admin', # 'social_django' ] @@ -221,3 +222,5 @@ ALIYUN_OSS_REGION = os.getenv('ALIYUN_OSS_REGION') STATIC_URL = 'static/' STATIC_ROOT = 'static' +MEDIA_URL = "/media/" +MEDIA_ROOT = os.path.join(os.path.dirname(BASE_DIR), 'media') diff --git a/zod_bank/urls.py b/zod_bank/urls.py index 274451e..009f1b3 100644 --- a/zod_bank/urls.py +++ b/zod_bank/urls.py @@ -30,4 +30,5 @@ urlpatterns = [ path('', include(('account.urls', 'account'), namespace='account')), path('', include('guardian.urls')), path('', include(('junior.urls', 'junior'), namespace='junior')), + path('', include(('web_admin.urls', 'web_admin'), namespace='web_admin')), ] From 7b9b5a2c6ff188965dbdfb28ffd3636c63f360bc Mon Sep 17 00:00:00 2001 From: jain Date: Fri, 14 Jul 2023 12:05:28 +0530 Subject: [PATCH 03/38] sonar issues --- account/admin.py | 10 +--------- account/models.py | 4 ++++ account/utils.py | 6 ++++-- account/views.py | 23 +++++++++++++---------- base/constants.py | 3 +++ base/messages.py | 3 ++- guardian/models.py | 24 +++++++++++++++++++++--- guardian/serializers.py | 12 ++++++------ junior/models.py | 16 ++++++++++++++++ junior/serializers.py | 8 ++++---- junior/utils.py | 16 +++------------- 11 files changed, 77 insertions(+), 48 deletions(-) diff --git a/account/admin.py b/account/admin.py index 7b59c84..e31076e 100644 --- a/account/admin.py +++ b/account/admin.py @@ -2,7 +2,7 @@ from django.contrib import admin """Import django app""" -from .models import UserEmailOtp, UserPhoneOtp, DefaultTaskImages, UserNotification, UserDelete +from .models import UserEmailOtp, DefaultTaskImages, UserNotification, UserDelete # Register your models here. @admin.register(UserDelete) @@ -37,11 +37,3 @@ class UserEmailOtpAdmin(admin.ModelAdmin): """Return object in email and otp format""" return self.email + '-' + self.otp -@admin.register(UserPhoneOtp) -class UserPhoneOtpAdmin(admin.ModelAdmin): - """User Phone otp admin""" - list_display = ['phone'] - - def __str__(self): - """Return object in phone number and otp format""" - return self.phone + '-' + self.otp diff --git a/account/models.py b/account/models.py index 60184c5..d89f499 100644 --- a/account/models.py +++ b/account/models.py @@ -90,6 +90,8 @@ class DefaultTaskImages(models.Model): class Meta(object): """ Meta information """ db_table = 'default_task_image' + verbose_name = 'Default Task images' + verbose_name_plural = 'Default Task images' def __str__(self): """return phone as an object""" @@ -112,6 +114,8 @@ class UserDelete(models.Model): class Meta(object): """ Meta information """ db_table = 'user_delete_information' + verbose_name = 'Deleted User' + verbose_name_plural = 'Deleted User' def __str__(self): return self.user.email diff --git a/account/utils.py b/account/utils.py index 846add9..b925b49 100644 --- a/account/utils.py +++ b/account/utils.py @@ -183,13 +183,15 @@ def get_token(data: dict = dict): def generate_alphanumeric_code(length): + """Generate alphanumeric code""" alphabet = string.ascii_letters + string.digits code = ''.join(secrets.choice(alphabet) for _ in range(length)) return code def generate_code(value, user_id): - alphabet = value + user_id.zfill(3) - return alphabet + """generate referral, junior and guardian code""" + code = value + str(user_id).zfill(3) + return code diff --git a/account/views.py b/account/views.py index 4e71ecd..0adc33c 100644 --- a/account/views.py +++ b/account/views.py @@ -25,10 +25,10 @@ from .serializers import (SuperUserSerializer, GuardianSerializer, JuniorSeriali UserNotificationSerializer, UpdateUserNotificationSerializer, UserPhoneOtpSerializer) from rest_framework_simplejwt.tokens import RefreshToken from base.messages import ERROR_CODE, SUCCESS_CODE -from base.constants import NUMBER +from base.constants import NUMBER, ZOD, JUN, GRD from guardian.tasks import generate_otp from account.utils import (send_otp_email, send_support_email, custom_response, custom_error_response, - generate_alphanumeric_code) + generate_code) from rest_framework.permissions import IsAuthenticated from templated_email import send_templated_mail import google.oauth2.credentials @@ -42,6 +42,7 @@ from guardian.serializers import GuardianProfileSerializer class GoogleLoginMixin: """google login mixin""" + @staticmethod def google_login(self, request): """google login function""" access_token = request.data.get('access_token') @@ -90,15 +91,15 @@ class GoogleLoginMixin: if str(user_type) == '1': junior_query = Junior.objects.create(auth=user_obj, is_verified=True, is_active=True, image=profile_picture, signup_method='2', - junior_code=generate_alphanumeric_code(6), - referral_code=generate_alphanumeric_code(6) + junior_code=generate_code(JUN, user_obj.id), + referral_code=generate_code(ZOD, user_obj.id) ) serializer = JuniorSerializer(junior_query) if 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_alphanumeric_code(6), - referral_code=generate_alphanumeric_code(6) + guardian_code=generate_code(GRD, user_obj.id), + referral_code=generate_code(ZOD, user_obj.id) ) serializer = GuardianSerializer(guardian_query) # Return a JSON response with the user's email and name @@ -141,14 +142,14 @@ class SigninWithApple(views.APIView): if str(user_type) == '1': junior_query = Junior.objects.create(auth=user, is_verified=True, is_active=True, signup_method='3', - junior_code=generate_alphanumeric_code(6), - referral_code=generate_alphanumeric_code(6)) + junior_code=generate_code(JUN, user.id), + referral_code=generate_code(ZOD, user.id)) serializer = JuniorSerializer(junior_query) if str(user_type) == '2': guardian_query = Guardian.objects.create(user=user, is_verified=True, is_active=True, signup_method='3', - guardian_code=generate_alphanumeric_code(6), - referral_code=generate_alphanumeric_code(6)) + guardian_code=generate_code(GRD, user.id), + referral_code=generate_code(ZOD, user.id)) serializer = GuardianSerializer(guardian_query) return custom_response(SUCCESS_CODE['3003'], serializer.data, response_status=status.HTTP_200_OK) @@ -181,6 +182,7 @@ class UpdateProfileImage(views.APIView): return custom_response(SUCCESS_CODE['3017'], 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: + logging.error(e) return custom_error_response(ERROR_CODE['2036'],response_status=status.HTTP_400_BAD_REQUEST) class ChangePasswordAPIView(views.APIView): @@ -512,6 +514,7 @@ class SendSupportEmail(views.APIView): class LogoutAPIView(views.APIView): + """Log out API""" permission_classes = (IsAuthenticated,) def post(self, request): diff --git a/base/constants.py b/base/constants.py index 7c83134..6025e0b 100644 --- a/base/constants.py +++ b/base/constants.py @@ -6,6 +6,9 @@ import os # GOOGLE_URL used for interact with google server to verify user existence. #GOOGLE_URL = "https://www.googleapis.com/plus/v1/" +ZOD = 'ZOD' +JUN = 'JUN' +GRD = 'GRD' NUMBER = { 'point_zero': 0.0, 'zero': 0, diff --git a/base/messages.py b/base/messages.py index ffbbbec..49deaf9 100644 --- a/base/messages.py +++ b/base/messages.py @@ -61,6 +61,7 @@ ERROR_CODE = { "2035": "Image should not be 0 kb", "2036": "Choose valid user" } +"""Success message code""" SUCCESS_CODE = { # Success code for password "3001": "Sign up successfully", @@ -97,7 +98,7 @@ SUCCESS_CODE = { "3023": "Approved junior successfully", "3024": "Reject junior request successfully" } - +"""status code error""" STATUS_CODE_ERROR = { # Status code for Invalid Input "4001": ["Invalid input."], diff --git a/guardian/models.py b/guardian/models.py index 921138a..5636a80 100644 --- a/guardian/models.py +++ b/guardian/models.py @@ -4,6 +4,7 @@ from django.db import models from django.contrib.auth import get_user_model """Import Django app""" from base.constants import GENDERS, TASK_STATUS, PENDING, TASK_POINTS, SIGNUP_METHODS +"""import Junior model""" from junior.models import Junior """Add user model""" User = get_user_model() @@ -15,23 +16,31 @@ class Guardian(models.Model): """Contact details""" country_code = models.IntegerField(blank=True, null=True) phone = models.CharField(max_length=31, null=True, blank=True, default=None) + """country name of the guardian""" country_name = models.CharField(max_length=100, null=True, blank=True, default=None) """Image info""" image = models.URLField(null=True, blank=True, default=None) """Personal info""" family_name = models.CharField(max_length=50, null=True, blank=True, default=None) + """gender of the guardian""" gender = models.CharField(choices=GENDERS, max_length=15, null=True, blank=True, default=None) + """date of birth of the guardian""" dob = models.DateField(max_length=15, null=True, blank=True, default=None) """Profile activity""" is_active = models.BooleanField(default=True) + """guardian is verified or not""" is_verified = models.BooleanField(default=False) + """guardian profile is complete or not""" is_complete_profile = models.BooleanField(default=False) + """passcode of the guardian profile""" passcode = models.IntegerField(null=True, blank=True, default=None) """Sign up method""" signup_method = models.CharField(max_length=31, choices=SIGNUP_METHODS, default='1') - """Codes""" + """Guardian Codes""" guardian_code = models.CharField(max_length=10, null=True, blank=True, default=None) + """Referral code""" referral_code = models.CharField(max_length=10, null=True, blank=True, default=None) + """Referral code that is used by guardian while signup""" referral_code_used = models.CharField(max_length=10, null=True, blank=True, default=None) """Profile created and updated time""" created_at = models.DateTimeField(auto_now_add=True) @@ -40,7 +49,10 @@ class Guardian(models.Model): class Meta(object): """ Meta class """ db_table = 'guardians' + """verbose name of the model""" verbose_name = 'Guardian' + """change another name""" + verbose_name_plural = 'Guardian' def __str__(self): """Return email id""" @@ -51,19 +63,23 @@ class JuniorTask(models.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""" task_description = models.CharField(max_length=500) """points of the task""" points = models.IntegerField(default=TASK_POINTS) + """last date of the task""" due_date = models.DateField(auto_now_add=False, null=True, blank=True) - """Images of task""" + """Images of task that is upload by guardian""" default_image = models.URLField(null=True, blank=True, default=None) + """image that is uploaded by junior""" 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""" + """task is active or not""" is_active = models.BooleanField(default=True) + """Task is approved or not""" is_approved = models.BooleanField(default=False) """Profile created and updated time""" created_at = models.DateTimeField(auto_now_add=True) @@ -72,7 +88,9 @@ class JuniorTask(models.Model): class Meta(object): """ Meta class """ db_table = 'junior_task' + """verbose name of the model""" verbose_name = 'Junior Task' + verbose_name_plural = 'Junior Task' def __str__(self): """Return email id""" diff --git a/guardian/serializers.py b/guardian/serializers.py index 9d2a676..055d738 100644 --- a/guardian/serializers.py +++ b/guardian/serializers.py @@ -9,11 +9,11 @@ from django.contrib.auth.models import User """Import Django app""" from .models import Guardian, JuniorTask from account.models import UserProfile, UserEmailOtp, UserNotification -from account.utils import generate_alphanumeric_code +from account.utils import generate_code from account.serializers import JuniorSerializer from junior.serializers import JuniorDetailSerializer from base.messages import ERROR_CODE, SUCCESS_CODE -from base.constants import NUMBER +from base.constants import NUMBER, JUN, ZOD, GRD from junior.models import Junior, JuniorPoints class UserSerializer(serializers.ModelSerializer): """User serializer""" @@ -39,11 +39,11 @@ class UserSerializer(serializers.ModelSerializer): user = User.objects.create_user(username=email, email=email, password=password) UserNotification.objects.create(user=user) if user_type == '1': - Junior.objects.create(auth=user, junior_code=generate_alphanumeric_code(6), - referral_code=generate_alphanumeric_code(6)) + Junior.objects.create(auth=user, junior_code=generate_code(JUN, user.id), + referral_code=generate_code(ZOD, user.id)) if user_type == '2': - Guardian.objects.create(user=user, guardian_code=generate_alphanumeric_code(6), - referral_code=generate_alphanumeric_code(6)) + Guardian.objects.create(user=user, guardian_code=generate_code(GRD, user.id), + referral_code=generate_code(ZOD, user.id)) return user except Exception as e: """Error handling""" diff --git a/junior/models.py b/junior/models.py index 58b1ae3..381bbf4 100644 --- a/junior/models.py +++ b/junior/models.py @@ -1,10 +1,13 @@ """Junior model """ """Import django""" from django.db import models +"""Import get_user_model function""" from django.contrib.auth import get_user_model +"""Import ArrayField""" from django.contrib.postgres.fields import ArrayField """Import django app""" from base.constants import GENDERS, SIGNUP_METHODS, RELATIONSHIP +"""Define User model""" User = get_user_model() # Create your models here. @@ -14,10 +17,13 @@ class Junior(models.Model): """Contact details""" phone = models.CharField(max_length=31, null=True, blank=True, default=None) country_code = models.IntegerField(blank=True, null=True) + """country name of the guardian""" country_name = models.CharField(max_length=100, null=True, blank=True, default=None) """Personal info""" gender = models.CharField(max_length=10, choices=GENDERS, null=True, blank=True, default=None) + """Date of birth""" dob = models.DateField(max_length=15, null=True, blank=True, default=None) + """Image of the junior""" image = models.URLField(null=True, blank=True, default=None) """relationship""" relationship = models.CharField(max_length=31, choices=RELATIONSHIP, null=True, blank=True, @@ -26,15 +32,21 @@ class Junior(models.Model): signup_method = models.CharField(max_length=31, choices=SIGNUP_METHODS, default='1') """Codes""" junior_code = models.CharField(max_length=10, null=True, blank=True, default=None) + """Guardian Codes""" guardian_code = ArrayField(models.CharField(max_length=10, null=True, blank=True, default=None),null=True) + """Referral code""" referral_code = models.CharField(max_length=10, null=True, blank=True, default=None) + """Referral code that is used by junior while signup""" referral_code_used = models.CharField(max_length=10, null=True, blank=True, default=None) """invited junior""" is_invited = models.BooleanField(default=False) """Profile activity""" is_active = models.BooleanField(default=True) + """junior profile is complete or not""" is_complete_profile = models.BooleanField(default=False) + """passcode of the junior profile""" passcode = models.IntegerField(null=True, blank=True, default=None) + """junior is verified or not""" is_verified = models.BooleanField(default=False) """Profile created and updated time""" created_at = models.DateTimeField(auto_now_add=True) @@ -44,6 +56,8 @@ class Junior(models.Model): """ Meta class """ db_table = 'junior' verbose_name = 'Junior' + """another name of the model""" + verbose_name_plural = 'Junior' def __str__(self): """Return email id""" @@ -64,6 +78,8 @@ class JuniorPoints(models.Model): """ Meta class """ db_table = 'junior_task_points' verbose_name = 'Junior Task Points' + """another name of the model""" + verbose_name_plural = 'Junior Task Points' def __str__(self): """Return email id""" diff --git a/junior/serializers.py b/junior/serializers.py index 2df13ca..013cd58 100644 --- a/junior/serializers.py +++ b/junior/serializers.py @@ -8,11 +8,11 @@ from django.utils import timezone from rest_framework_simplejwt.tokens import RefreshToken """Import django app""" -from account.utils import send_otp_email, generate_alphanumeric_code +from account.utils import send_otp_email, generate_code from junior.models import Junior, JuniorPoints 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 +from base.constants import PENDING, IN_PROGRESS, REJECTED, REQUESTED, COMPLETED, NUMBER, JUN, ZOD from guardian.models import Guardian, JuniorTask from account.models import UserEmailOtp from junior.utils import junior_notification_email, junior_approval_mail @@ -275,8 +275,8 @@ class AddJuniorSerializer(serializers.ModelSerializer): junior_data = Junior.objects.create(auth=user_data, gender=validated_data.get('gender'), dob=validated_data.get('dob'), is_invited=True, relationship=validated_data.get('relationship'), - junior_code=generate_alphanumeric_code(6), - referral_code=generate_alphanumeric_code(6), + junior_code=generate_code(JUN, user_data.id), + referral_code=generate_code(ZOD, user_data.id), referral_code_used=guardian_data.referral_code) """Generate otp""" otp_value = generate_otp() diff --git a/junior/utils.py b/junior/utils.py index 7d19a2d..41c393d 100644 --- a/junior/utils.py +++ b/junior/utils.py @@ -1,28 +1,17 @@ """Account utils""" """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 -import string -from datetime import datetime -from calendar import timegm -from uuid import uuid4 -import secrets -from rest_framework import serializers -from junior.models import Junior -from guardian.models import Guardian -from account.models import UserDelete -from base.messages import ERROR_CODE def junior_notification_email(recipient_email, full_name, email, password): """Notification email""" from_email = settings.EMAIL_FROM_ADDRESS + """recipient email""" recipient_list = [recipient_email] + """use send template mail for sending email""" send_templated_mail( template_name='junior_notification_email.email', from_email=from_email, @@ -40,6 +29,7 @@ def junior_approval_mail(guardian, full_name): """junior approval mail""" from_email = settings.EMAIL_FROM_ADDRESS recipient_list = [guardian] + """use send tempolate mail for sending email""" send_templated_mail( template_name='junior_approval_mail.email', from_email=from_email, From d163f43c852113bcb4f2885b00ca5b7d84afebf0 Mon Sep 17 00:00:00 2001 From: jain Date: Fri, 14 Jul 2023 15:02:53 +0530 Subject: [PATCH 04/38] jira-25 access token API --- account/serializers.py | 25 ++++++++++++++++++------- account/urls.py | 5 +++-- account/views.py | 24 +++++++++++++++++++++--- zod_bank/settings.py | 4 ++-- 4 files changed, 44 insertions(+), 14 deletions(-) diff --git a/account/serializers.py b/account/serializers.py index d75039a..bbde6a0 100644 --- a/account/serializers.py +++ b/account/serializers.py @@ -125,12 +125,17 @@ class GuardianSerializer(serializers.ModelSerializer): first_name = serializers.SerializerMethodField('get_first_name') last_name = serializers.SerializerMethodField('get_last_name') auth_token = serializers.SerializerMethodField('get_auth_token') + refresh_token = serializers.SerializerMethodField('get_refresh_token') def get_auth_token(self, obj): refresh = RefreshToken.for_user(obj.user) access_token = str(refresh.access_token) return access_token + def get_refresh_token(self, obj): + refresh = RefreshToken.for_user(obj.user) + refresh_token = str(refresh) + return refresh_token def get_user_type(self, obj): """user type""" @@ -154,9 +159,9 @@ class GuardianSerializer(serializers.ModelSerializer): class Meta(object): """Meta info""" model = Guardian - fields = ['id', 'auth_token', 'email', 'first_name', 'last_name', 'country_code', 'phone', 'family_name', - 'gender', 'dob', 'referral_code', 'is_active', 'is_complete_profile', 'passcode', 'image', - 'created_at', 'updated_at', 'user_type', 'country_name'] + fields = ['id', 'auth_token', 'refresh_token', 'email', 'first_name', 'last_name', 'country_code', + 'phone', 'family_name', 'gender', 'dob', 'referral_code', 'is_active', + 'is_complete_profile', 'passcode', 'image', 'created_at', 'updated_at', 'user_type', 'country_name'] class JuniorSerializer(serializers.ModelSerializer): @@ -166,15 +171,21 @@ class JuniorSerializer(serializers.ModelSerializer): first_name = serializers.SerializerMethodField('get_first_name') last_name = serializers.SerializerMethodField('get_last_name') auth_token = serializers.SerializerMethodField('get_auth_token') + refresh_token = serializers.SerializerMethodField('get_refresh_token') def get_auth_token(self, obj): refresh = RefreshToken.for_user(obj.auth) access_token = str(refresh.access_token) return access_token + def get_refresh_token(self, obj): + refresh = RefreshToken.for_user(obj.user) + refresh_token = str(refresh) + return refresh_token + def get_user_type(self, obj): email_verified = UserEmailOtp.objects.filter(email=obj.auth.username).last() - if email_verified and email_verified.user_type != None: + if email_verified and email_verified.user_type is not None: return email_verified.user_type return '1' @@ -190,9 +201,9 @@ class JuniorSerializer(serializers.ModelSerializer): class Meta(object): """Meta info""" model = Junior - fields = ['id', 'auth_token', 'email', 'first_name', 'last_name', 'country_code', 'phone', 'gender', 'dob', - 'guardian_code', 'referral_code','is_active', 'is_complete_profile', 'created_at', 'image', - 'updated_at', 'user_type', 'country_name','is_invited'] + fields = ['id', 'auth_token', 'refresh_token', 'email', 'first_name', 'last_name', 'country_code', + 'phone', 'gender', 'dob', 'guardian_code', 'referral_code','is_active', + 'is_complete_profile', 'created_at', 'image', 'updated_at', 'user_type', 'country_name','is_invited'] class EmailVerificationSerializer(serializers.ModelSerializer): """Email verification serializer""" diff --git a/account/urls.py b/account/urls.py index f2a1d62..9977658 100644 --- a/account/urls.py +++ b/account/urls.py @@ -8,7 +8,7 @@ from .views import (UserLogin, SendPhoneOtp, UserPhoneVerification, UserEmailVer ForgotPasswordAPIView, ResetPasswordAPIView, ChangePasswordAPIView, UpdateProfileImage, GoogleLoginViewSet, SigninWithApple, ProfileAPIViewSet, UploadImageAPIViewSet, DefaultImageAPIViewSet, DeleteUserProfileAPIViewSet, UserNotificationAPIViewSet, - UpdateUserNotificationAPIViewSet, SendSupportEmail, LogoutAPIView) + UpdateUserNotificationAPIViewSet, SendSupportEmail, LogoutAPIView, AccessTokenAPIView) """Router""" router = routers.SimpleRouter() @@ -45,5 +45,6 @@ urlpatterns = [ path('api/v1/update-profile-image/', UpdateProfileImage.as_view()), path('api/v1/apple-login/', SigninWithApple.as_view(), name='signup_with_apple'), path('api/v1/send-support-email/', SendSupportEmail.as_view(), name='send-support-email'), - path('api/v1/logout/', LogoutAPIView.as_view(), name='logout') + path('api/v1/logout/', LogoutAPIView.as_view(), name='logout'), + path('api/v1/generate-token/', AccessTokenAPIView.as_view(), name='generate-token') ] diff --git a/account/views.py b/account/views.py index 0adc33c..fcc5ecb 100644 --- a/account/views.py +++ b/account/views.py @@ -37,6 +37,7 @@ from rest_framework import status import requests from rest_framework.response import Response from django.conf import settings +from rest_framework_simplejwt.tokens import RefreshToken from junior.serializers import JuniorProfileSerializer from guardian.serializers import GuardianProfileSerializer @@ -302,7 +303,8 @@ class UserLogin(viewsets.ViewSet): email_verified = UserEmailOtp.objects.filter(email=username).last() refresh = RefreshToken.for_user(user) access_token = str(refresh.access_token) - data = {"auth_token":access_token, "is_profile_complete": False, + refresh_token = str(refresh) + data = {"auth_token":access_token, "refresh_token":refresh_token, "is_profile_complete": False, "user_type": email_verified.user_type, } is_verified = False @@ -336,7 +338,8 @@ class UserLogin(viewsets.ViewSet): logging.error(e) refresh = RefreshToken.for_user(user) access_token = str(refresh.access_token) - data = {"auth_token": access_token, "user_role": '3'} + refresh_token = str(refresh) + data = {"auth_token": access_token, "refresh_token":refresh_token, "user_type": '3'} return custom_response(None, data, response_status=status.HTTP_200_OK) class UserEmailVerification(viewsets.ModelViewSet): @@ -373,7 +376,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}, + refresh_token = str(refresh) + return custom_response(SUCCESS_CODE['3011'], {"auth_token":access_token, "refresh_token":refresh_token}, response_status=status.HTTP_200_OK) else: return custom_error_response(ERROR_CODE["2008"], response_status=status.HTTP_400_BAD_REQUEST) @@ -521,3 +525,17 @@ class LogoutAPIView(views.APIView): logout(request) request.session.flush() return custom_response(SUCCESS_CODE['3020'], response_status=status.HTTP_200_OK) + + +class AccessTokenAPIView(views.APIView): + """generate access token API""" + + def post(self, request): + # Assuming you have a refresh_token string + refresh_token = request.data['refresh_token'] + # Create a RefreshToken instance from the refresh token string + refresh = RefreshToken(refresh_token) + # Generate a new access token + access_token = str(refresh.access_token) + data = {"auth_token": access_token} + return custom_response(None, data, response_status=status.HTTP_200_OK) diff --git a/zod_bank/settings.py b/zod_bank/settings.py index d98d2db..687b42b 100644 --- a/zod_bank/settings.py +++ b/zod_bank/settings.py @@ -97,8 +97,8 @@ REST_FRAMEWORK = { 'PAGE_SIZE': 5, } SIMPLE_JWT = { - 'ACCESS_TOKEN_LIFETIME': timedelta(minutes=50), - 'REFRESH_TOKEN_LIFETIME': timedelta(days=7), + 'ACCESS_TOKEN_LIFETIME': timedelta(hours=2, minutes=59, seconds=59, microseconds=999999), + 'REFRESH_TOKEN_LIFETIME': timedelta(hours=71, minutes=59, seconds=59, microseconds=999999), } # Database # https://docs.djangoproject.com/en/3.0/ref/settings/#databases From c7983579527c9a63c651ab08a7a2b2664934e5af Mon Sep 17 00:00:00 2001 From: jain Date: Fri, 14 Jul 2023 15:05:18 +0530 Subject: [PATCH 05/38] migrations files --- ...lter_defaulttaskimages_options_and_more.py | 21 +++++++++++++++++++ ...ardian_options_alter_juniortask_options.py | 21 +++++++++++++++++++ ...nior_options_alter_juniorpoints_options.py | 21 +++++++++++++++++++ 3 files changed, 63 insertions(+) create mode 100644 account/migrations/0007_alter_defaulttaskimages_options_and_more.py create mode 100644 guardian/migrations/0015_alter_guardian_options_alter_juniortask_options.py create mode 100644 junior/migrations/0013_alter_junior_options_alter_juniorpoints_options.py diff --git a/account/migrations/0007_alter_defaulttaskimages_options_and_more.py b/account/migrations/0007_alter_defaulttaskimages_options_and_more.py new file mode 100644 index 0000000..4c134d7 --- /dev/null +++ b/account/migrations/0007_alter_defaulttaskimages_options_and_more.py @@ -0,0 +1,21 @@ +# Generated by Django 4.2.2 on 2023-07-14 09:34 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('account', '0006_alter_useremailotp_options_and_more'), + ] + + operations = [ + migrations.AlterModelOptions( + name='defaulttaskimages', + options={'verbose_name': 'Default Task images', 'verbose_name_plural': 'Default Task images'}, + ), + migrations.AlterModelOptions( + name='userdelete', + options={'verbose_name': 'Deleted User', 'verbose_name_plural': 'Deleted User'}, + ), + ] diff --git a/guardian/migrations/0015_alter_guardian_options_alter_juniortask_options.py b/guardian/migrations/0015_alter_guardian_options_alter_juniortask_options.py new file mode 100644 index 0000000..45edd24 --- /dev/null +++ b/guardian/migrations/0015_alter_guardian_options_alter_juniortask_options.py @@ -0,0 +1,21 @@ +# Generated by Django 4.2.2 on 2023-07-14 09:34 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('guardian', '0014_guardian_signup_method'), + ] + + operations = [ + migrations.AlterModelOptions( + name='guardian', + options={'verbose_name': 'Guardian', 'verbose_name_plural': 'Guardian'}, + ), + migrations.AlterModelOptions( + name='juniortask', + options={'verbose_name': 'Junior Task', 'verbose_name_plural': 'Junior Task'}, + ), + ] diff --git a/junior/migrations/0013_alter_junior_options_alter_juniorpoints_options.py b/junior/migrations/0013_alter_junior_options_alter_juniorpoints_options.py new file mode 100644 index 0000000..266d53c --- /dev/null +++ b/junior/migrations/0013_alter_junior_options_alter_juniorpoints_options.py @@ -0,0 +1,21 @@ +# Generated by Django 4.2.2 on 2023-07-14 09:34 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('junior', '0012_junior_is_invited'), + ] + + operations = [ + migrations.AlterModelOptions( + name='junior', + options={'verbose_name': 'Junior', 'verbose_name_plural': 'Junior'}, + ), + migrations.AlterModelOptions( + name='juniorpoints', + options={'verbose_name': 'Junior Task Points', 'verbose_name_plural': 'Junior Task Points'}, + ), + ] From a0e1dc11fae65f15d87590c711162efb2d4770e8 Mon Sep 17 00:00:00 2001 From: jain Date: Fri, 14 Jul 2023 15:07:54 +0530 Subject: [PATCH 06/38] migrations files --- guardian/views.py | 1 - 1 file changed, 1 deletion(-) diff --git a/guardian/views.py b/guardian/views.py index f060732..f35ca90 100644 --- a/guardian/views.py +++ b/guardian/views.py @@ -114,7 +114,6 @@ class CreateTaskAPIView(viewsets.ModelViewSet): def create(self, request, *args, **kwargs): image = request.data['default_image'] data = request.data - print("data===>",data,'==>',type(data)) if 'https' in str(image): image_data = image else: From 485dc8391147696bd06048a5c34e770f4cb361a2 Mon Sep 17 00:00:00 2001 From: jain Date: Fri, 14 Jul 2023 16:04:43 +0530 Subject: [PATCH 07/38] authenticate the api --- account/views.py | 11 +++++++++++ junior/views.py | 2 ++ 2 files changed, 13 insertions(+) diff --git a/account/views.py b/account/views.py index fcc5ecb..59260c2 100644 --- a/account/views.py +++ b/account/views.py @@ -208,6 +208,7 @@ class ResetPasswordAPIView(views.APIView): class ForgotPasswordAPIView(views.APIView): """Forgot password""" + def post(self, request): serializer = ForgotPasswordSerializer(data=request.data) if serializer.is_valid(): @@ -346,6 +347,7 @@ class UserEmailVerification(viewsets.ModelViewSet): """User Email verification""" serializer_class = EmailVerificationSerializer queryset = UserEmailOtp.objects.all() + permission_classes = [IsAuthenticated] def list(self, request, *args, **kwargs): try: @@ -389,6 +391,8 @@ class ReSendEmailOtp(viewsets.ModelViewSet): """Send otp on phone""" queryset = UserEmailOtp.objects.all() serializer_class = EmailVerificationSerializer + permission_classes = [IsAuthenticated] + def create(self, request, *args, **kwargs): otp = generate_otp() if User.objects.filter(email=request.data['email']): @@ -410,6 +414,8 @@ class ProfileAPIViewSet(viewsets.ModelViewSet): """Profile viewset""" queryset = User.objects.all() serializer_class = JuniorProfileSerializer + permission_classes = [IsAuthenticated] + def list(self, request, *args, **kwargs): """profile view""" if str(self.request.GET.get('user_type')) == '1': @@ -448,6 +454,7 @@ class DefaultImageAPIViewSet(viewsets.ModelViewSet): """Profile viewset""" queryset = DefaultTaskImages.objects.all() serializer_class = DefaultTaskImagesDetailsSerializer + permission_classes = [IsAuthenticated] def list(self, request, *args, **kwargs): """profile view""" queryset = DefaultTaskImages.objects.all() @@ -478,6 +485,7 @@ class UserNotificationAPIViewSet(viewsets.ModelViewSet): """notification viewset""" queryset = UserNotification.objects.all() serializer_class = UserNotificationSerializer + permission_classes = [IsAuthenticated] def list(self, request, *args, **kwargs): """profile view""" queryset = self.queryset.filter(user=request.user) @@ -489,6 +497,7 @@ class UpdateUserNotificationAPIViewSet(viewsets.ModelViewSet): """Update notification viewset""" queryset = UserNotification.objects.all() serializer_class = UpdateUserNotificationSerializer + permission_classes = [IsAuthenticated] def create(self, request, *args, **kwargs): """profile view""" @@ -502,6 +511,8 @@ class UpdateUserNotificationAPIViewSet(viewsets.ModelViewSet): class SendSupportEmail(views.APIView): """support email api""" + permission_classes = (IsAuthenticated,) + def post(self, request): name = request.data.get('name') sender = request.data.get('email') diff --git a/junior/views.py b/junior/views.py index a1053d4..5766c82 100644 --- a/junior/views.py +++ b/junior/views.py @@ -62,6 +62,8 @@ class JuniorListAPIView(viewsets.ModelViewSet): serializer_class = JuniorDetailListSerializer queryset = Junior.objects.all() + permission_classes = [IsAuthenticated] + def list(self, request, *args, **kwargs): """ junior list""" guardian_data = Guardian.objects.filter(user__email=request.user).last() From 45410fa0ca066915cfc4c262430f35ca9c455293 Mon Sep 17 00:00:00 2001 From: abutalib-kiwi Date: Fri, 14 Jul 2023 18:47:07 +0530 Subject: [PATCH 08/38] list, view, edit api for article --- web_admin/admin.py | 16 +++--- web_admin/migrations/0001_initial.py | 11 ++-- web_admin/models.py | 9 ++-- web_admin/serializers.py | 76 +++++++++++++++++++++++++--- web_admin/utils.py | 13 +++++ web_admin/views.py | 37 ++++++++++++-- 6 files changed, 136 insertions(+), 26 deletions(-) create mode 100644 web_admin/utils.py diff --git a/web_admin/admin.py b/web_admin/admin.py index b5367ef..1adf7e6 100644 --- a/web_admin/admin.py +++ b/web_admin/admin.py @@ -5,23 +5,23 @@ from web_admin.models import Article, ArticleCard, ArticleSurvey, SurveyOption @admin.register(Article) class ArticleAdmin(admin.ModelAdmin): - """Junior Points Admin""" - list_display = ['id', 'title', 'description', 'is_published'] + """Article Admin""" + list_display = ['id', 'title', 'description', 'is_published', 'is_deleted'] @admin.register(ArticleCard) -class ArticleAdmin(admin.ModelAdmin): - """Junior Points Admin""" +class ArticleCardAdmin(admin.ModelAdmin): + """Article Card Admin""" list_display = ['id', 'article', 'title', 'description', 'image'] @admin.register(ArticleSurvey) -class ArticleAdmin(admin.ModelAdmin): - """Junior Points Admin""" +class ArticleSurveyAdmin(admin.ModelAdmin): + """Article Survey Admin""" list_display = ['id', 'article', 'question', 'points'] @admin.register(SurveyOption) -class ArticleAdmin(admin.ModelAdmin): - """Junior Points Admin""" +class SurveyOptionAdmin(admin.ModelAdmin): + """Survey Option Admin""" list_display = ['id', 'survey', 'option', 'is_answer'] diff --git a/web_admin/migrations/0001_initial.py b/web_admin/migrations/0001_initial.py index e652b7c..ad25a50 100644 --- a/web_admin/migrations/0001_initial.py +++ b/web_admin/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 4.2.2 on 2023-07-13 13:01 +# Generated by Django 4.2.2 on 2023-07-14 13:15 from django.db import migrations, models import django.db.models.deletion @@ -20,7 +20,8 @@ class Migration(migrations.Migration): ('description', models.TextField()), ('created_at', models.DateTimeField(auto_now_add=True)), ('updated_at', models.DateTimeField(auto_now=True)), - ('is_published', models.BooleanField(default=False)), + ('is_published', models.BooleanField(default=True)), + ('is_deleted', models.BooleanField(default=False)), ], ), migrations.CreateModel( @@ -31,7 +32,7 @@ class Migration(migrations.Migration): ('points', models.IntegerField()), ('created_at', models.DateTimeField(auto_now_add=True)), ('updated_at', models.DateTimeField(auto_now=True)), - ('article', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='web_admin.article')), + ('article', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='article_survey', to='web_admin.article')), ], ), migrations.CreateModel( @@ -42,7 +43,7 @@ class Migration(migrations.Migration): ('is_answer', models.BooleanField(default=False)), ('created_at', models.DateTimeField(auto_now_add=True)), ('updated_at', models.DateTimeField(auto_now=True)), - ('survey', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='web_admin.articlesurvey')), + ('survey', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='survey_options', to='web_admin.articlesurvey')), ], ), migrations.CreateModel( @@ -54,7 +55,7 @@ class Migration(migrations.Migration): ('image', models.ImageField(upload_to='card_images/')), ('created_at', models.DateTimeField(auto_now_add=True)), ('updated_at', models.DateTimeField(auto_now=True)), - ('article', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='web_admin.article')), + ('article', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='article_cards', to='web_admin.article')), ], ), ] diff --git a/web_admin/models.py b/web_admin/models.py index 411b0f9..0437102 100644 --- a/web_admin/models.py +++ b/web_admin/models.py @@ -10,7 +10,8 @@ class Article(models.Model): description = models.TextField() created_at = models.DateTimeField(auto_now_add=True) updated_at = models.DateTimeField(auto_now=True) - is_published = models.BooleanField(default=False) + is_published = models.BooleanField(default=True) + is_deleted = models.BooleanField(default=False) def __str__(self): """Return title""" @@ -18,7 +19,7 @@ class Article(models.Model): class ArticleCard(models.Model): - article = models.ForeignKey(Article, on_delete=models.CASCADE) + article = models.ForeignKey(Article, on_delete=models.CASCADE, related_name='article_cards') title = models.CharField(max_length=255) description = models.TextField() image = models.ImageField(upload_to='card_images/') @@ -31,7 +32,7 @@ class ArticleCard(models.Model): class ArticleSurvey(models.Model): - article = models.ForeignKey(Article, on_delete=models.CASCADE) + article = models.ForeignKey(Article, on_delete=models.CASCADE, related_name='article_survey') question = models.CharField(max_length=255) points = models.IntegerField() created_at = models.DateTimeField(auto_now_add=True) @@ -43,7 +44,7 @@ class ArticleSurvey(models.Model): class SurveyOption(models.Model): - survey = models.ForeignKey(ArticleSurvey, on_delete=models.CASCADE) + survey = models.ForeignKey(ArticleSurvey, on_delete=models.CASCADE, related_name='survey_options') option = models.CharField(max_length=255) is_answer = models.BooleanField(default=False) created_at = models.DateTimeField(auto_now_add=True) diff --git a/web_admin/serializers.py b/web_admin/serializers.py index 69fcb00..23e69e3 100644 --- a/web_admin/serializers.py +++ b/web_admin/serializers.py @@ -4,29 +4,38 @@ web_admin serializers file from rest_framework import serializers from web_admin.models import Article, ArticleCard, SurveyOption, ArticleSurvey +from web_admin.utils import pop_id class ArticleCardSerializer(serializers.ModelSerializer): + id = serializers.IntegerField(required=False) + class Meta: model = ArticleCard - fields = ('title', 'description') + fields = ('id', 'title', 'description') class SurveyOptionSerializer(serializers.ModelSerializer): + id = serializers.IntegerField(required=False) + class Meta: model = SurveyOption - fields = ('option', 'is_answer') + fields = ('id', 'option', 'is_answer') class ArticleSurveySerializer(serializers.ModelSerializer): - options = SurveyOptionSerializer(many=True) + id = serializers.IntegerField(required=False) + survey_options = SurveyOptionSerializer(many=True) class Meta: model = ArticleSurvey - fields = ('question', 'points', 'options') + fields = ('id', 'question', 'points', 'survey_options') class ArticleSerializer(serializers.ModelSerializer): + """ + serializer for article API + """ article_cards = ArticleCardSerializer(many=True) article_survey = ArticleSurveySerializer(many=True) @@ -35,21 +44,76 @@ class ArticleSerializer(serializers.ModelSerializer): meta class """ model = Article - fields = ('title', 'description', 'article_cards', 'article_survey') + fields = ('id', 'title', 'description', 'article_cards', 'article_survey') def create(self, validated_data): + """ + to create article. + ID in post data dict is for update api. + :param validated_data: + :return: success message + """ article_cards = validated_data.pop('article_cards') article_survey = validated_data.pop('article_survey') article = Article.objects.create(**validated_data) for card in article_cards: + card = pop_id(card) ArticleCard.objects.create(article=article, **card) for survey in article_survey: - options = survey.pop('options') + survey = pop_id(survey) + options = survey.pop('survey_options') survey_obj = ArticleSurvey.objects.create(article=article, **survey) for option in options: + option = pop_id(option) SurveyOption.objects.create(survey=survey_obj, **option) return article + + def update(self, instance, validated_data): + article_cards = validated_data.pop('article_cards') + article_survey = validated_data.pop('article_survey') + instance.title = validated_data.get('title', instance.title) + instance.description = validated_data.get('description', instance.description) + instance.save() + + # Update or create cards + for card_data in article_cards: + card_id = card_data.get('id', None) + if card_id: + card = ArticleCard.objects.get(id=card_id, article=instance) + card.title = card_data.get('title', card.title) + card.description = card_data.get('description', card.description) + card.image = card_data.get('image', card.image) + card.save() + else: + card_data = pop_id(card_data) + ArticleCard.objects.create(article=instance, **card_data) + + # Update or create survey sections + for survey_data in article_survey: + survey_id = survey_data.get('id', None) + options_data = survey_data.pop('survey_options') + if survey_id: + survey = ArticleSurvey.objects.get(id=survey_id, article=instance) + survey.question = survey_data.get('question', survey.question) + survey.save() + else: + survey_data = pop_id(survey_data) + survey = ArticleSurvey.objects.create(article=instance, **survey_data) + + # Update or create survey options + for option_data in options_data: + option_id = option_data.get('id', None) + if option_id: + option = SurveyOption.objects.get(id=option_id, survey=survey) + option.option = option_data.get('option', option.option) + option.is_answer = option_data.get('is_answer', option.is_answer) + option.save() + else: + option_data = pop_id(option_data) + SurveyOption.objects.create(survey=survey, **option_data) + + return instance diff --git a/web_admin/utils.py b/web_admin/utils.py new file mode 100644 index 0000000..2e09e2f --- /dev/null +++ b/web_admin/utils.py @@ -0,0 +1,13 @@ +""" +web_utils file +""" + + +def pop_id(data): + """ + to pop id, not in use + :param data: + :return: data + """ + data.pop('id') if 'id' in data else data + return data diff --git a/web_admin/views.py b/web_admin/views.py index 7eecd8d..88147a1 100644 --- a/web_admin/views.py +++ b/web_admin/views.py @@ -7,17 +7,48 @@ from rest_framework.response import Response from rest_framework import status # local imports +from account.utils import custom_response, custom_error_response from web_admin.models import Article from web_admin.serializers import ArticleSerializer -class ArticleViewSet(GenericViewSet, mixins.CreateModelMixin): +class ArticleViewSet(GenericViewSet, mixins.CreateModelMixin, mixins.UpdateModelMixin, + mixins.ListModelMixin, mixins.RetrieveModelMixin, mixins.DestroyModelMixin): serializer_class = ArticleSerializer permission_classes = [] - queryset = Article.objects.all() + queryset = Article.objects.prefetch_related('article_cards', + 'article_survey', + 'article_survey__survey_options') def create(self, request, *args, **kwargs): serializer = self.serializer_class(data=request.data) serializer.is_valid(raise_exception=True) serializer.save() - return Response({'message': "created"}, status=status.HTTP_201_CREATED) + return custom_response("created") + + def update(self, request, *args, **kwargs): + article = self.queryset.filter(id=kwargs['pk']).first() + serializer = self.serializer_class(article, data=request.data) + serializer.is_valid(raise_exception=True) + serializer.save() + return custom_response("updated") + + def list(self, request, *args, **kwargs): + # queryset = Article.objects.prefetch_related('article_cards', + # 'article_survey', + # 'article_survey__survey_options') + paginator = self.pagination_class() + paginated_queryset = paginator.paginate_queryset(self.queryset, request) + serializer = self.serializer_class(paginated_queryset, many=True) + return custom_response(None, data=serializer.data) + + def retrieve(self, request, *args, **kwargs): + queryset = self.queryset.filter(id=kwargs['pk']) + serializer = self.serializer_class(queryset, many=True) + return custom_response(None, data=serializer.data) + + def destroy(self, request, *args, **kwargs): + article = self.queryset.filter(id=kwargs['pk']).update(is_deleted=True) + if article: + return custom_response("deleted") + return custom_error_response("article doesn't exist", status.HTTP_400_BAD_REQUEST) From 5bd865a685b979fcace94794c55068d0f94d7341 Mon Sep 17 00:00:00 2001 From: jain Date: Fri, 14 Jul 2023 19:38:58 +0530 Subject: [PATCH 09/38] login in only single device at a time --- account/admin.py | 9 ++++- account/custom_middleware.py | 36 ++++++++++++++++++ account/migrations/0008_userdevicedetails.py | 31 ++++++++++++++++ account/models.py | 20 ++++++++++ account/views.py | 39 ++++++++++---------- base/messages.py | 3 +- guardian/urls.py | 10 ++++- zod_bank/settings.py | 1 + 8 files changed, 126 insertions(+), 23 deletions(-) create mode 100644 account/custom_middleware.py create mode 100644 account/migrations/0008_userdevicedetails.py diff --git a/account/admin.py b/account/admin.py index e31076e..b67b88a 100644 --- a/account/admin.py +++ b/account/admin.py @@ -2,7 +2,7 @@ from django.contrib import admin """Import django app""" -from .models import UserEmailOtp, DefaultTaskImages, UserNotification, UserDelete +from .models import UserEmailOtp, DefaultTaskImages, UserNotification, UserDelete, UserDeviceDetails # Register your models here. @admin.register(UserDelete) @@ -37,3 +37,10 @@ class UserEmailOtpAdmin(admin.ModelAdmin): """Return object in email and otp format""" return self.email + '-' + self.otp +@admin.register(UserDeviceDetails) +class UserDeviceDetailsAdmin(admin.ModelAdmin): + """User profile admin""" + list_display = ['user', 'device_id'] + + def __str__(self): + return self.user.email diff --git a/account/custom_middleware.py b/account/custom_middleware.py new file mode 100644 index 0000000..3bd5e60 --- /dev/null +++ b/account/custom_middleware.py @@ -0,0 +1,36 @@ +"""middleware file""" +"""Django import""" +from rest_framework import status +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 base.messages import ERROR_CODE, SUCCESS_CODE + +"""Custom middleware +when user login with +multiple device simultaneously""" +class CustomMiddleware: + """Custom middleware""" + def __init__(self, get_response): + """response""" + self.get_response = get_response + + def __call__(self, request): + # Code to be executed before the view is called + response = self.get_response(request) + # Code to be executed after the view is called + device_id = request.META['HTTP_DEVICE_ID'] + if request.user.is_authenticated: + """device details""" + device_details = UserDeviceDetails.objects.filter(user=request.user, device_id=device_id).last() + if not device_details: + custom_error = custom_error_response(ERROR_CODE['2037'], response_status=status.HTTP_404_NOT_FOUND) + response = Response(custom_error.data, status=status.HTTP_404_NOT_FOUND) + # Set content type header to "application/json" + response['Content-Type'] = 'application/json' + # Render the response as JSON + renderer = JSONRenderer() + response.content = renderer.render(response.data) + return response diff --git a/account/migrations/0008_userdevicedetails.py b/account/migrations/0008_userdevicedetails.py new file mode 100644 index 0000000..0b655f6 --- /dev/null +++ b/account/migrations/0008_userdevicedetails.py @@ -0,0 +1,31 @@ +# Generated by Django 4.2.2 on 2023-07-14 11:08 + +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', '0007_alter_defaulttaskimages_options_and_more'), + ] + + operations = [ + migrations.CreateModel( + name='UserDeviceDetails', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('device_id', models.CharField(max_length=500)), + ('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_device_details', to=settings.AUTH_USER_MODEL)), + ], + options={ + 'verbose_name': 'User Device Details', + 'verbose_name_plural': 'User Device Details', + 'db_table': 'user_device_details', + }, + ), + ] diff --git a/account/models.py b/account/models.py index d89f499..d515e01 100644 --- a/account/models.py +++ b/account/models.py @@ -145,3 +145,23 @@ class UserNotification(models.Model): def __str__(self): return self.user.email + +class UserDeviceDetails(models.Model): + """ + User notification details + """ + user = models.OneToOneField(User, on_delete=models.CASCADE, related_name='user_device_details') + """Device ID""" + device_id = models.CharField(max_length=500) + + created_at = models.DateTimeField(auto_now_add=True) + updated_at = models.DateTimeField(auto_now=True) + + class Meta(object): + """ Meta information """ + db_table = 'user_device_details' + verbose_name = 'User Device Details' + verbose_name_plural = 'User Device Details' + + def __str__(self): + return self.user.email diff --git a/account/views.py b/account/views.py index 59260c2..b6fc821 100644 --- a/account/views.py +++ b/account/views.py @@ -5,17 +5,23 @@ from rest_framework import viewsets, status, views from rest_framework.decorators import action import random import logging -from PIL import Image -from django.views.decorators.csrf import csrf_exempt from django.utils import timezone import jwt from django.contrib.auth import logout -"""App Import""" -from guardian.utils import upload_image_to_alibaba from django.contrib.auth import authenticate, login +from rest_framework.permissions import IsAuthenticated +from templated_email import send_templated_mail +import google.oauth2.credentials +import google.auth.transport.requests +from rest_framework import status +import requests +from rest_framework.response import Response +from django.conf import settings +"""App Import""" from guardian.models import Guardian from junior.models import Junior -from account.models import UserProfile, UserPhoneOtp, UserEmailOtp, DefaultTaskImages, UserNotification +from guardian.utils import upload_image_to_alibaba +from account.models import UserDeviceDetails, UserPhoneOtp, UserEmailOtp, DefaultTaskImages, UserNotification from django.contrib.auth.models import User """Account serializer""" from .serializers import (SuperUserSerializer, GuardianSerializer, JuniorSerializer, EmailVerificationSerializer, @@ -29,15 +35,6 @@ from base.constants import NUMBER, ZOD, JUN, GRD from guardian.tasks import generate_otp from account.utils import (send_otp_email, send_support_email, custom_response, custom_error_response, generate_code) -from rest_framework.permissions import IsAuthenticated -from templated_email import send_templated_mail -import google.oauth2.credentials -import google.auth.transport.requests -from rest_framework import status -import requests -from rest_framework.response import Response -from django.conf import settings -from rest_framework_simplejwt.tokens import RefreshToken from junior.serializers import JuniorProfileSerializer from guardian.serializers import GuardianProfileSerializer @@ -229,7 +226,6 @@ class ForgotPasswordAPIView(views.APIView): 'verification_code': verification_code } ) - expiry = timezone.now() + timezone.timedelta(days=1) user_data, created = UserEmailOtp.objects.get_or_create(email=email) if created: @@ -285,6 +281,7 @@ class UserLogin(viewsets.ViewSet): def login(self, request): username = request.data.get('username') password = request.data.get('password') + device_id = request.META.get('HTTP_DEVICE_ID') user = authenticate(request, username=username, password=password) try: @@ -296,6 +293,10 @@ class UserLogin(viewsets.ViewSet): 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() 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) @@ -347,7 +348,6 @@ class UserEmailVerification(viewsets.ModelViewSet): """User Email verification""" serializer_class = EmailVerificationSerializer queryset = UserEmailOtp.objects.all() - permission_classes = [IsAuthenticated] def list(self, request, *args, **kwargs): try: @@ -379,7 +379,8 @@ class UserEmailVerification(viewsets.ModelViewSet): refresh = RefreshToken.for_user(user_obj) access_token = str(refresh.access_token) refresh_token = str(refresh) - return custom_response(SUCCESS_CODE['3011'], {"auth_token":access_token, "refresh_token":refresh_token}, + return custom_response(SUCCESS_CODE['3011'], {"auth_token":access_token, + "refresh_token":refresh_token}, response_status=status.HTTP_200_OK) else: return custom_error_response(ERROR_CODE["2008"], response_status=status.HTTP_400_BAD_REQUEST) @@ -429,8 +430,6 @@ class ProfileAPIViewSet(viewsets.ModelViewSet): serializer = GuardianProfileSerializer(guardian_data) return custom_response(None, serializer.data, response_status=status.HTTP_200_OK) - - class UploadImageAPIViewSet(viewsets.ModelViewSet): """Profile viewset""" queryset = DefaultTaskImages.objects.all() @@ -527,7 +526,6 @@ class SendSupportEmail(views.APIView): else: return custom_error_response(ERROR_CODE['2033'], response_status=status.HTTP_400_BAD_REQUEST) - class LogoutAPIView(views.APIView): """Log out API""" permission_classes = (IsAuthenticated,) @@ -550,3 +548,4 @@ class AccessTokenAPIView(views.APIView): access_token = str(refresh.access_token) data = {"auth_token": access_token} return custom_response(None, data, response_status=status.HTTP_200_OK) + diff --git a/base/messages.py b/base/messages.py index 49deaf9..02b0e34 100644 --- a/base/messages.py +++ b/base/messages.py @@ -59,7 +59,8 @@ ERROR_CODE = { "2033": "Missing required fields", "2034": "Junior is not associated", "2035": "Image should not be 0 kb", - "2036": "Choose valid user" + "2036": "Choose valid user", + "2037": "You are already log in another device" } """Success message code""" SUCCESS_CODE = { diff --git a/guardian/urls.py b/guardian/urls.py index 168610b..14398f2 100644 --- a/guardian/urls.py +++ b/guardian/urls.py @@ -9,7 +9,15 @@ from rest_framework import routers """Define Router""" router = routers.SimpleRouter() -"""API End points with router""" +"""API End points with router +in this file +we define various api end point +that is covered in this guardian +section API:- like +sign-up, create guardian profile, +create-task, +all task list, top junior, +filter-task""" """Sign up API""" router.register('sign-up', SignupViewset, basename='sign-up') """Create guardian profile API""" diff --git a/zod_bank/settings.py b/zod_bank/settings.py index 687b42b..b052a4f 100644 --- a/zod_bank/settings.py +++ b/zod_bank/settings.py @@ -67,6 +67,7 @@ MIDDLEWARE = [ 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', + 'account.custom_middleware.CustomMiddleware' ] ROOT_URLCONF = 'zod_bank.urls' From 32e52e17f4b5cb9daae5ed5af978e37af8abc278 Mon Sep 17 00:00:00 2001 From: jain Date: Sat, 15 Jul 2023 23:07:12 +0530 Subject: [PATCH 10/38] sonar issue --- account/admin.py | 3 +++ account/custom_middleware.py | 10 +++++----- base/messages.py | 2 ++ guardian/urls.py | 18 +++++++++--------- 4 files changed, 19 insertions(+), 14 deletions(-) diff --git a/account/admin.py b/account/admin.py index b67b88a..cf3ff23 100644 --- a/account/admin.py +++ b/account/admin.py @@ -19,6 +19,7 @@ class UserNotificationAdmin(admin.ModelAdmin): list_display = ['user', 'push_notification', 'email_notification', 'sms_notification'] def __str__(self): + """Return image url""" return self.image_url @admin.register(DefaultTaskImages) class DefaultTaskImagesAdmin(admin.ModelAdmin): @@ -26,6 +27,7 @@ class DefaultTaskImagesAdmin(admin.ModelAdmin): list_display = ['task_name', 'image_url'] def __str__(self): + """Return image url""" return self.image_url @admin.register(UserEmailOtp) @@ -43,4 +45,5 @@ class UserDeviceDetailsAdmin(admin.ModelAdmin): list_display = ['user', 'device_id'] def __str__(self): + """Return user email""" return self.user.email diff --git a/account/custom_middleware.py b/account/custom_middleware.py index 3bd5e60..7c4dc32 100644 --- a/account/custom_middleware.py +++ b/account/custom_middleware.py @@ -8,10 +8,10 @@ from account.utils import custom_error_response from account.models import UserDeviceDetails from base.messages import ERROR_CODE, SUCCESS_CODE -"""Custom middleware -when user login with +"""Custom middleware +when user login with multiple device simultaneously""" -class CustomMiddleware: +class CustomMiddleware(object): """Custom middleware""" def __init__(self, get_response): """response""" @@ -21,11 +21,11 @@ class CustomMiddleware: # Code to be executed before the view is called response = self.get_response(request) # Code to be executed after the view is called - device_id = request.META['HTTP_DEVICE_ID'] + device_id = request.META.get('HTTP_DEVICE_ID') if request.user.is_authenticated: """device details""" device_details = UserDeviceDetails.objects.filter(user=request.user, device_id=device_id).last() - if not device_details: + if device_id and not device_details: custom_error = custom_error_response(ERROR_CODE['2037'], response_status=status.HTTP_404_NOT_FOUND) response = Response(custom_error.data, status=status.HTTP_404_NOT_FOUND) # Set content type header to "application/json" diff --git a/base/messages.py b/base/messages.py index 02b0e34..e3399ed 100644 --- a/base/messages.py +++ b/base/messages.py @@ -58,8 +58,10 @@ ERROR_CODE = { "2032": "Failed to send email", "2033": "Missing required fields", "2034": "Junior is not associated", + # image size "2035": "Image should not be 0 kb", "2036": "Choose valid user", + # log in multiple device msg "2037": "You are already log in another device" } """Success message code""" diff --git a/guardian/urls.py b/guardian/urls.py index 14398f2..4a1c644 100644 --- a/guardian/urls.py +++ b/guardian/urls.py @@ -9,15 +9,15 @@ from rest_framework import routers """Define Router""" router = routers.SimpleRouter() -"""API End points with router -in this file -we define various api end point -that is covered in this guardian -section API:- like -sign-up, create guardian profile, -create-task, -all task list, top junior, -filter-task""" +# API End points with router +# in this file +# we define various api end point +# that is covered in this guardian +# section API:- like +# sign-up, create guardian profile, +# create-task, +# all task list, top junior, +# filter-task""" """Sign up API""" router.register('sign-up', SignupViewset, basename='sign-up') """Create guardian profile API""" From cfc36735d61dbd5377a74eb885d5331be015bd46 Mon Sep 17 00:00:00 2001 From: jain Date: Mon, 17 Jul 2023 11:58:04 +0530 Subject: [PATCH 11/38] sonar issues fixed --- account/custom_middleware.py | 10 ++++-- account/serializers.py | 32 +++++++++++++++++- account/urls.py | 22 +++++++++++- account/utils.py | 32 ++++++++++++++++-- base/constants.py | 36 +++++++++----------- guardian/urls.py | 16 ++++----- guardian/utils.py | 8 +++++ junior/models.py | 65 ++++++++++++++++++++++++------------ junior/urls.py | 24 ++++++++----- junior/utils.py | 16 ++++++--- 10 files changed, 190 insertions(+), 71 deletions(-) diff --git a/account/custom_middleware.py b/account/custom_middleware.py index 7c4dc32..7a06e43 100644 --- a/account/custom_middleware.py +++ b/account/custom_middleware.py @@ -8,9 +8,13 @@ from account.utils import custom_error_response from account.models import UserDeviceDetails from base.messages import ERROR_CODE, SUCCESS_CODE -"""Custom middleware -when user login with -multiple device simultaneously""" +# Custom middleware +# when user login with +# multiple device simultaneously +# It restricted login in +# multiple devices only +# user can login in single +# device at a time""" class CustomMiddleware(object): """Custom middleware""" def __init__(self, get_response): diff --git a/account/serializers.py b/account/serializers.py index bbde6a0..4583b6a 100644 --- a/account/serializers.py +++ b/account/serializers.py @@ -1,10 +1,20 @@ """Account serializer""" -"""Django Imoprt""" +"""Django Import""" import random from rest_framework import serializers from django.contrib.auth.models import User from rest_framework_simplejwt.tokens import RefreshToken """App import""" +# Import guardian's model, +# Import junior's model, +# Import account's model, +# Import constant from +# base package, +# Import messages from +# base package, +# Import some functions +# from utils file""" + from guardian.models import Guardian from junior.models import Junior from account.models import UserEmailOtp, DefaultTaskImages, UserDelete, UserNotification, UserPhoneOtp @@ -12,6 +22,25 @@ from base.constants import GUARDIAN, JUNIOR, SUPERUSER from base.messages import ERROR_CODE_REQUIRED, ERROR_CODE, SUCCESS_CODE, STATUS_CODE_ERROR from .utils import delete_user_account_condition_social, delete_user_account_condition +# In this serializer file +# define google login serializer +# update junior profile, +# update guardian profile, +# super admin serializer, +# reset password, +# forgot password, +# change password, +# basic junior serializer, +# basic guardian serializer, +# user delete account serializer, +# user notification serializer, +# update user notification serializer, +# default task's images serializer, +# upload default task's images serializer, +# email verification serializer, +# phone otp serializer + + class GoogleLoginSerializer(serializers.Serializer): """google login serializer""" access_token = serializers.CharField(max_length=5000, required=True) @@ -89,6 +118,7 @@ class ChangePasswordSerializer(serializers.Serializer): def create(self, validated_data): new_password = validated_data.pop('new_password') current_password = validated_data.pop('current_password') + """Check new password is different from current password""" if new_password == current_password: raise serializers.ValidationError({"details": ERROR_CODE['2026']}) user_details = User.objects.filter(email=self.context).last() diff --git a/account/urls.py b/account/urls.py index 9977658..ef3d026 100644 --- a/account/urls.py +++ b/account/urls.py @@ -3,7 +3,27 @@ from django.urls import path, include """Third party import""" from rest_framework import routers -"""Import view functions""" +# Import view functions +# UserLogin views, +# SendPhoneOtp views, +# UserPhoneVerification views, +# UserEmailVerification views, +# ReSendEmailOtp views, +# ForgotPasswordAPIView views, +# ResetPasswordAPIView views, +# ChangePasswordAPIView views, +# UpdateProfileImage views, +# GoogleLoginViewSet views, +# SigninWithApple views, +# ProfileAPIViewSet views, +# UploadImageAPIViewSet views, +# DefaultImageAPIViewSet views, +# DeleteUserProfileAPIViewSet views, +# UserNotificationAPIViewSet views, +# UpdateUserNotificationAPIViewSet views, +# SendSupportEmail views, +# LogoutAPIView views, +# AccessTokenAPIView views""" from .views import (UserLogin, SendPhoneOtp, UserPhoneVerification, UserEmailVerification, ReSendEmailOtp, ForgotPasswordAPIView, ResetPasswordAPIView, ChangePasswordAPIView, UpdateProfileImage, GoogleLoginViewSet, SigninWithApple, ProfileAPIViewSet, UploadImageAPIViewSet, diff --git a/account/utils.py b/account/utils.py index b925b49..eeb6954 100644 --- a/account/utils.py +++ b/account/utils.py @@ -12,12 +12,37 @@ from calendar import timegm from uuid import uuid4 import secrets from rest_framework import serializers +# Django App Import +# Import models from junior App, +# Import models from guardian App, +# Import models from account App, +# Import messages from base package""" from junior.models import Junior from guardian.models import Guardian from account.models import UserDelete from base.messages import ERROR_CODE +# Define delete +# user account condition, +# Define delete +# user account +# condition for social +# login account, +# Update junior account, +# Update guardian account, +# Define custom email for otp verification, +# Define support email for user's query, +# Define custom success response, +# Define custom error response, +# Generate access token, +# refresh token by using jwt, +# Define function for generating +# guardian code, junior code, +# referral code, +# Define function for generating +# alphanumeric code + 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': @@ -28,10 +53,10 @@ def delete_user_account_condition(user, user_type_data, user_type, user_tb, data 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 user_tb.save() + """create object in user delete model""" instance = UserDelete.objects.create(user=user_tb, d_email=d_email, old_email=o_mail, is_active=True, reason=data) @@ -47,10 +72,10 @@ def delete_user_account_condition_social(user, user_type,user_tb, data, random_n 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' dummy_email = user_tb.email old_mail = user.email user_tb.save() + """create object in user delete model""" instance_data = UserDelete.objects.create(user=user_tb, d_email=dummy_email, old_email=old_mail, is_active=True, reason=data) @@ -72,6 +97,7 @@ def guardian_account_update(user_tb): guardian_data.is_verified = False guardian_data.save() jun_data = Junior.objects.filter(guardian_code__icontains=str(guardian_data.guardian_code)) + """Disassociate relation between guardian and junior""" for data in jun_data: data.guardian_code.remove(guardian_data.guardian_code) data.save() @@ -79,6 +105,7 @@ def send_otp_email(recipient_email, otp): """Send otp on email with template""" from_email = settings.EMAIL_FROM_ADDRESS recipient_list = [recipient_email] + """Send otp on email""" send_templated_mail( template_name='email_otp_verification.email', from_email=from_email, @@ -93,6 +120,7 @@ def send_support_email(name, sender, subject, message): """Send otp on email with template""" to_email = [settings.EMAIL_FROM_ADDRESS] from_email = settings.DEFAULT_ADDRESS + """Send support email to zod bank support team""" send_templated_mail( template_name='support_mail.email', from_email=from_email, diff --git a/base/constants.py b/base/constants.py index 6025e0b..648bdd8 100644 --- a/base/constants.py +++ b/base/constants.py @@ -6,31 +6,22 @@ import os # GOOGLE_URL used for interact with google server to verify user existence. #GOOGLE_URL = "https://www.googleapis.com/plus/v1/" +# Define Code prefix word +# for guardian code, +# junior code, +# referral code""" ZOD = 'ZOD' JUN = 'JUN' GRD = 'GRD' +# Define number variable +# from zero to +# twenty and +# some standard +# number""" NUMBER = { - 'point_zero': 0.0, - 'zero': 0, - 'one': 1, - 'two': 2, - 'three': 3, - 'four': 4, - 'five': 5, - 'six': 6, - 'seven': 7, - 'eight': 8, - 'nine': 9, - 'ten': 10, - 'eleven': 11, - 'twelve': 12, - 'thirteen': 13, - 'fourteen': 14, - 'fifteen': 15, - 'sixteen': 16, - 'seventeen': 17, - 'eighteen': 18, - 'nineteen': 19, + 'point_zero': 0.0, 'zero': 0, 'one': 1, 'two': 2, 'three': 3, 'four': 4, 'five': 5, 'six': 6, 'seven': 7, + 'eight': 8, 'nine': 9, 'ten': 10, 'eleven': 11, 'twelve': 12, 'thirteen': 13, 'fourteen': 14, 'fifteen': 15, + 'sixteen': 16, 'seventeen': 17, 'eighteen': 18, 'nineteen': 19, 'twenty_four': 24, 'twenty_one': 21, 'twenty_two': 22, @@ -108,6 +99,9 @@ RELATIONSHIP = ( ('1', 'parent'), ('2', 'legal_guardian') ) +""" +Define task status +in a number""" PENDING = 1 IN_PROGRESS = 2 REJECTED = 3 diff --git a/guardian/urls.py b/guardian/urls.py index 4a1c644..71d3036 100644 --- a/guardian/urls.py +++ b/guardian/urls.py @@ -20,21 +20,21 @@ router = routers.SimpleRouter() # filter-task""" """Sign up API""" router.register('sign-up', SignupViewset, basename='sign-up') -"""Create guardian profile API""" +# Create guardian profile API""" router.register('create-guardian-profile', UpdateGuardianProfile, basename='update-guardian-profile') -"""Create Task API""" +# Create Task API""" router.register('create-task', CreateTaskAPIView, basename='create-task') -"""All Task list API""" +# All Task list API""" router.register('all-task-list', AllTaskListAPIView, basename='all-task-list') -"""Task list bases on the status API""" +# Task list bases on the status API""" router.register('task-list', TaskListAPIView, basename='task-list') -"""Leaderboard API""" +# Leaderboard API""" router.register('top-junior', TopJuniorListAPIView, basename='top-junior') -"""Search Task list on the bases of status, due date, and task title API""" +# Search Task list on the bases of status, due date, and task title API""" router.register('filter-task', SearchTaskListAPIView, basename='filter-task') -"""Approve junior API""" +# Approve junior API""" router.register('approve-junior', ApproveJuniorAPIView, basename='approve-junior') -"""Define Url pattern""" +# Define Url pattern""" urlpatterns = [ path('api/v1/', include(router.urls)), ] diff --git a/guardian/utils.py b/guardian/utils.py index f565e4b..c3f9f39 100644 --- a/guardian/utils.py +++ b/guardian/utils.py @@ -6,6 +6,14 @@ from django.conf import settings """Import tempfile""" import tempfile +# Define upload image on +# ali baba cloud +# firstly save image +# in temporary file +# then check bucket name +# then upload on ali baba +# bucket and reform the image url""" + def upload_image_to_alibaba(image, filename): """upload image on oss alibaba bucket""" # Save the image object to a temporary file diff --git a/junior/models.py b/junior/models.py index 381bbf4..41dddc8 100644 --- a/junior/models.py +++ b/junior/models.py @@ -10,45 +10,66 @@ from base.constants import GENDERS, SIGNUP_METHODS, RELATIONSHIP """Define User model""" User = get_user_model() # Create your models here. +# Define junior model with +# various fields like +# phone, country code, +# country name, +# gender, +# date of birth, +# profile image, +# relationship type of the guardian +# signup method, +# guardian code, +# junior code, +# referral code, +# referral code that used by the junior +# is invited junior +# profile is active or not +# profile is complete or not +# passcode +# junior is verified or not +"""Define junior points model""" +# points of the junior +# position of the junior class Junior(models.Model): """Junior model""" auth = models.ForeignKey(User, on_delete=models.CASCADE, related_name='junior_profile', verbose_name='Email') - """Contact details""" + # Contact details""" phone = models.CharField(max_length=31, null=True, blank=True, default=None) country_code = models.IntegerField(blank=True, null=True) - """country name of the guardian""" + # country name of the guardian""" country_name = models.CharField(max_length=100, null=True, blank=True, default=None) - """Personal info""" + # Personal info""" gender = models.CharField(max_length=10, choices=GENDERS, null=True, blank=True, default=None) - """Date of birth""" + # Date of birth""" dob = models.DateField(max_length=15, null=True, blank=True, default=None) - """Image of the junior""" + # Image of the junior""" image = models.URLField(null=True, blank=True, default=None) - """relationship""" + # relationship""" relationship = models.CharField(max_length=31, choices=RELATIONSHIP, null=True, blank=True, default='1') - """Sign up method""" + # Sign up method""" signup_method = models.CharField(max_length=31, choices=SIGNUP_METHODS, default='1') - """Codes""" + # Codes""" junior_code = models.CharField(max_length=10, null=True, blank=True, default=None) - """Guardian Codes""" + # Guardian Codes""" guardian_code = ArrayField(models.CharField(max_length=10, null=True, blank=True, default=None),null=True) - """Referral code""" + # Referral code""" referral_code = models.CharField(max_length=10, null=True, blank=True, default=None) - """Referral code that is used by junior while signup""" + # Referral code that is used by junior while signup""" referral_code_used = models.CharField(max_length=10, null=True, blank=True, default=None) - """invited junior""" + # invited junior""" is_invited = models.BooleanField(default=False) - """Profile activity""" + # Profile activity""" is_active = models.BooleanField(default=True) - """junior profile is complete or not""" + # junior profile is complete or not""" is_complete_profile = models.BooleanField(default=False) - """passcode of the junior profile""" + # passcode of the junior profile""" passcode = models.IntegerField(null=True, blank=True, default=None) - """junior is verified or not""" + # junior is verified or not""" is_verified = models.BooleanField(default=False) - """Profile created and updated time""" + # Profile created and updated time""" created_at = models.DateTimeField(auto_now_add=True) updated_at = models.DateTimeField(auto_now=True) @@ -56,7 +77,7 @@ class Junior(models.Model): """ Meta class """ db_table = 'junior' verbose_name = 'Junior' - """another name of the model""" + # another name of the model""" verbose_name_plural = 'Junior' def __str__(self): @@ -66,11 +87,11 @@ class Junior(models.Model): class JuniorPoints(models.Model): """Junior model""" junior = models.OneToOneField(Junior, on_delete=models.CASCADE, related_name='junior_points') - """Contact details""" + # Contact details""" total_task_points = models.IntegerField(blank=True, null=True, default=0) - """position of the junior""" + # position of the junior""" position = models.IntegerField(blank=True, null=True, default=99999) - """Profile created and updated time""" + # Profile created and updated time""" created_at = models.DateTimeField(auto_now_add=True) updated_at = models.DateTimeField(auto_now=True) @@ -78,7 +99,7 @@ class JuniorPoints(models.Model): """ Meta class """ db_table = 'junior_task_points' verbose_name = 'Junior Task Points' - """another name of the model""" + # another name of the model""" verbose_name_plural = 'Junior Task Points' def __str__(self): diff --git a/junior/urls.py b/junior/urls.py index 162f693..ecedb1a 100644 --- a/junior/urls.py +++ b/junior/urls.py @@ -8,21 +8,29 @@ from rest_framework import routers """Router""" router = routers.SimpleRouter() - +# API End points with router +# in this file +# we define various api end point +# that is covered in this guardian +# section API:- like +# Create junior profile API, validate junior profile, +# junior list, +# add junior list, invited junior, +# filter-junior, +# remove junior""" """API End points with router""" -"""Create junior profile API""" router.register('create-junior-profile', UpdateJuniorProfile, basename='profile-update') -"""validate guardian code API""" +# validate guardian code API""" router.register('validate-guardian-code', ValidateGuardianCode, basename='validate-guardian-code') -"""junior list API""" +# junior list API""" router.register('junior-list', JuniorListAPIView, basename='junior-list') -"""Add junior list API""" +# Add junior list API""" router.register('add-junior', AddJuniorAPIView, basename='add-junior') -"""Invited junior list API""" +# Invited junior list API""" router.register('invited-junior', InvitedJuniorAPIView, basename='invited-junior') -"""Filter junior list API""" +# Filter junior list API""" router.register('filter-junior', FilterJuniorAPIView, basename='filter-junior') -"""Define url pattern""" +# Define url pattern""" urlpatterns = [ path('api/v1/', include(router.urls)), path('api/v1/remove-junior/', RemoveJuniorAPIView.as_view()) diff --git a/junior/utils.py b/junior/utils.py index 41c393d..e1fb5df 100644 --- a/junior/utils.py +++ b/junior/utils.py @@ -4,14 +4,20 @@ from django.conf import settings """Third party Django app""" from templated_email import send_templated_mail - - +# junior notification +# email for sending email +# when guardian create junior profile +# guardian get email when junior send +# request for approving the profile and +# being part of the zod bank and access the platform +# define junior notification email +# junior approval email def junior_notification_email(recipient_email, full_name, email, password): """Notification email""" from_email = settings.EMAIL_FROM_ADDRESS - """recipient email""" + # recipient email""" recipient_list = [recipient_email] - """use send template mail for sending email""" + # use send template mail for sending email""" send_templated_mail( template_name='junior_notification_email.email', from_email=from_email, @@ -29,7 +35,7 @@ def junior_approval_mail(guardian, full_name): """junior approval mail""" from_email = settings.EMAIL_FROM_ADDRESS recipient_list = [guardian] - """use send tempolate mail for sending email""" + # use send template mail for sending email""" send_templated_mail( template_name='junior_approval_mail.email', from_email=from_email, From 1399b585e860da6dea3f4688b160c0abae7014d8 Mon Sep 17 00:00:00 2001 From: jain Date: Mon, 17 Jul 2023 16:07:06 +0530 Subject: [PATCH 12/38] sonar issues --- account/serializers.py | 22 +++++++----- account/utils.py | 5 +++ base/constants.py | 40 +++++----------------- base/messages.py | 9 +++-- guardian/models.py | 27 +++++++++++++++ guardian/serializers.py | 57 ++++++++++++++++++++++++++++--- guardian/urls.py | 4 ++- guardian/views.py | 75 +++++++++++++++++++++++++++++++++++++---- junior/views.py | 36 ++++++++++++++++++-- zod_bank/settings.py | 44 ++++++++++++++++-------- 10 files changed, 249 insertions(+), 70 deletions(-) diff --git a/account/serializers.py b/account/serializers.py index 4583b6a..3596c07 100644 --- a/account/serializers.py +++ b/account/serializers.py @@ -1,9 +1,10 @@ """Account serializer""" """Django Import""" -import random +# Import Refresh token of jwt from rest_framework import serializers from django.contrib.auth.models import User from rest_framework_simplejwt.tokens import RefreshToken +import secrets """App import""" # Import guardian's model, # Import junior's model, @@ -18,8 +19,8 @@ from rest_framework_simplejwt.tokens import RefreshToken from guardian.models import Guardian from junior.models import Junior from account.models import UserEmailOtp, DefaultTaskImages, UserDelete, UserNotification, UserPhoneOtp -from base.constants import GUARDIAN, JUNIOR, SUPERUSER -from base.messages import ERROR_CODE_REQUIRED, ERROR_CODE, SUCCESS_CODE, STATUS_CODE_ERROR +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 # In this serializer file @@ -90,6 +91,7 @@ class ResetPasswordSerializer(serializers.Serializer): def create(self, validated_data): verification_code = validated_data.pop('verification_code') password = validated_data.pop('password') + # fetch email otp object of the user user_opt_details = UserEmailOtp.objects.filter(otp=verification_code, is_verified=True).last() if user_opt_details: user_details = User.objects.filter(email=user_opt_details.email).last() @@ -112,6 +114,7 @@ class ChangePasswordSerializer(serializers.Serializer): def validate_current_password(self, value): user = self.context + # check old password if self.context.password not in ('', None) and user.check_password(value): return value raise serializers.ValidationError(ERROR_CODE['2015']) @@ -170,9 +173,9 @@ 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 != None: + if email_verified and email_verified.user_type is not None: return email_verified.user_type - return '2' + return str(NUMBER['two']) def get_auth(self, obj): """user email address""" @@ -217,7 +220,7 @@ class JuniorSerializer(serializers.ModelSerializer): email_verified = UserEmailOtp.objects.filter(email=obj.auth.username).last() if email_verified and email_verified.user_type is not None: return email_verified.user_type - return '1' + return str(NUMBER['one']) def get_auth(self, obj): return obj.auth.username @@ -251,6 +254,7 @@ class DefaultTaskImagesSerializer(serializers.ModelSerializer): model = DefaultTaskImages fields = ['id', 'task_name', 'image_url'] def create(self, validated_data): + # create default task object data = DefaultTaskImages.objects.create(**validated_data) return data @@ -273,10 +277,11 @@ class UserDeleteSerializer(serializers.ModelSerializer): data = validated_data.get('reason') passwd = self.context['password'] signup_method = self.context['signup_method'] - random_num = random.randint(0, 10000) + random_num = secrets.randbelow(10001) user_tb = User.objects.filter(id=user.id).last() user_type_datas = UserEmailOtp.objects.filter(email=user.email).last() - if user_tb and user_tb.check_password(passwd) and signup_method == '1': + # check password and sign up method + if user_tb and user_tb.check_password(passwd) and signup_method == str(NUMBER['one']): user_type_data = user_type_datas.user_type instance = delete_user_account_condition(user, user_type_data, user_type, user_tb, data, random_num) return instance @@ -305,6 +310,7 @@ class UpdateUserNotificationSerializer(serializers.ModelSerializer): def create(self, validated_data): instance = UserNotification.objects.filter(user=self.context).last() if instance: + # change notification status 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) diff --git a/account/utils.py b/account/utils.py index eeb6954..9aca671 100644 --- a/account/utils.py +++ b/account/utils.py @@ -10,6 +10,7 @@ import string from datetime import datetime from calendar import timegm from uuid import uuid4 +# Import secrets module for generating random number import secrets from rest_framework import serializers # Django App Import @@ -55,6 +56,7 @@ def delete_user_account_condition(user, user_type_data, user_type, user_tb, data user_tb.username = str(random_num) + str('@D_') + '{}'.format(user_tb.username).lower() d_email = user_tb.email o_mail = user.email + # update user email with dummy email user_tb.save() """create object in user delete model""" instance = UserDelete.objects.create(user=user_tb, d_email=d_email, old_email=o_mail, @@ -74,6 +76,7 @@ def delete_user_account_condition_social(user, user_type,user_tb, data, random_n user_tb.username = str(random_num) + str('@D_') + '{}'.format(user_tb.username).lower() dummy_email = user_tb.email old_mail = user.email + # update user email with dummy email user_tb.save() """create object in user delete model""" instance_data = UserDelete.objects.create(user=user_tb, d_email=dummy_email, old_email=old_mail, @@ -84,6 +87,7 @@ def junior_account_update(user_tb): """junior account delete""" junior_data = Junior.objects.filter(auth__email=user_tb.email).first() if junior_data: + # Update junior account junior_data.is_active = False junior_data.is_verified = False junior_data.guardian_code = '{}' @@ -93,6 +97,7 @@ 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: + # Update guardian account guardian_data.is_active = False guardian_data.is_verified = False guardian_data.save() diff --git a/base/constants.py b/base/constants.py index 648bdd8..d8ca8a8 100644 --- a/base/constants.py +++ b/base/constants.py @@ -21,31 +21,10 @@ GRD = 'GRD' NUMBER = { 'point_zero': 0.0, 'zero': 0, 'one': 1, 'two': 2, 'three': 3, 'four': 4, 'five': 5, 'six': 6, 'seven': 7, 'eight': 8, 'nine': 9, 'ten': 10, 'eleven': 11, 'twelve': 12, 'thirteen': 13, 'fourteen': 14, 'fifteen': 15, - 'sixteen': 16, 'seventeen': 17, 'eighteen': 18, 'nineteen': 19, - 'twenty_four': 24, - 'twenty_one': 21, - 'twenty_two': 22, - 'twenty_five': 25, - 'thirty': 30, - 'thirty_five': 35, - 'thirty_six': 36, - 'forty': 40, - 'fifty': 50, - 'fifty_nine': 59, - 'sixty': 60, - 'seventy_five': 75, - 'eighty': 80, - 'ninty_five': 95, - 'ninty_six': 96, - 'ninety_nine': 99, - 'hundred': 100, - 'one_one_nine': 119, - 'one_twenty': 120, - 'four_zero_four': 404, - 'five_hundred': 500, - 'minus_one': -1, - 'point_three': 0.3, - 'point_seven': 0.7 + 'sixteen': 16, 'seventeen': 17, 'eighteen': 18, 'nineteen': 19, 'twenty': 20, + 'twenty_one': 21, 'twenty_two': 22,'twenty_three': 23, 'twenty_four': 24, 'twenty_five': 25, + 'thirty': 30, 'forty': 40, 'fifty': 50, 'sixty': 60, 'seventy': 70, 'eighty': 80, 'ninty': 90, + 'ninety_nine': 99, 'hundred': 100, } @@ -65,10 +44,6 @@ FILE_SIZE = 5 * 1024 * 1024 # String constant for configurable date for allocation lock period ALLOCATION_LOCK_DATE = 1 -sort_dict = { - '1': 'name', - '2': '-name' -} """user type""" USER_TYPE = ( ('1', 'junior'), @@ -80,7 +55,7 @@ GENDERS = ( ('1', 'Male'), ('2', 'Female') ) -"""Task status""" +# Task status""" TASK_STATUS = ( ('1', 'pending'), ('2', 'in-progress'), @@ -88,13 +63,13 @@ TASK_STATUS = ( ('4', 'requested'), ('5', 'completed') ) -"""sign up method""" +# sign up method SIGNUP_METHODS = ( ('1', 'manual'), ('2', 'google'), ('3', 'apple') ) -"""relationship""" +# relationship RELATIONSHIP = ( ('1', 'parent'), ('2', 'legal_guardian') @@ -110,6 +85,7 @@ COMPLETED = 5 TASK_POINTS = 5 # duplicate name used defined in constant PROJECT_NAME PROJECT_NAME = 'Zod Bank' +# define user type constant GUARDIAN = 'guardian' JUNIOR = 'junior' SUPERUSER = 'superuser' diff --git a/base/messages.py b/base/messages.py index e3399ed..8b65d2a 100644 --- a/base/messages.py +++ b/base/messages.py @@ -62,7 +62,8 @@ ERROR_CODE = { "2035": "Image should not be 0 kb", "2036": "Choose valid user", # log in multiple device msg - "2037": "You are already log in another device" + "2037": "You are already log in another device", + "2038": "Choose valid action for task" } """Success message code""" SUCCESS_CODE = { @@ -98,8 +99,10 @@ SUCCESS_CODE = { "3020": "Logged out successfully.", "3021": "Add junior successfully", "3022": "Remove junior successfully", - "3023": "Approved junior successfully", - "3024": "Reject junior request successfully" + "3023": "Junior is approved successfully", + "3024": "Junior request is rejected successfully", + "3025": "Task is approved successfully", + "3026": "Task is rejected successfully", } """status code error""" STATUS_CODE_ERROR = { diff --git a/guardian/models.py b/guardian/models.py index 5636a80..1746c44 100644 --- a/guardian/models.py +++ b/guardian/models.py @@ -8,6 +8,33 @@ from base.constants import GENDERS, TASK_STATUS, PENDING, TASK_POINTS, SIGNUP_ME from junior.models import Junior """Add user model""" User = get_user_model() + +# Create your models here. +# Define junior model with +# various fields like +# phone, country code, +# country name, +# gender, +# date of birth, +# profile image, +# signup method, +# guardian code, +# referral code, +# referral code that used by the guardian +# is invited guardian +# profile is active or not +# profile is complete or not +# passcode +# guardian is verified or not +"""Define junior task model""" +# define name of the Task +# task description +# points of the task +# default image of the task +# image uploaded by junior +# task status +# task approved or not + # Create your models here. class Guardian(models.Model): diff --git a/guardian/serializers.py b/guardian/serializers.py index 055d738..8bcd0cf 100644 --- a/guardian/serializers.py +++ b/guardian/serializers.py @@ -1,20 +1,41 @@ """Serializer of Guardian""" """Third party Django app""" import logging -import random from rest_framework import serializers +# Import Refresh token of jwt from rest_framework_simplejwt.tokens import RefreshToken from django.db import transaction from django.contrib.auth.models import User """Import Django app""" +# Import guardian's model, +# Import junior's model, +# Import account's model, +# Import constant from +# base package, +# Import messages from +# base package, +# Import some functions +# from utils file""" from .models import Guardian, JuniorTask from account.models import UserProfile, UserEmailOtp, UserNotification from account.utils import generate_code -from account.serializers import JuniorSerializer from junior.serializers import JuniorDetailSerializer from base.messages import ERROR_CODE, SUCCESS_CODE from base.constants import NUMBER, JUN, ZOD, GRD from junior.models import Junior, JuniorPoints + + +# In this serializer file +# define user serializer, +# create guardian serializer, +# task serializer, +# guardian serializer, +# task details serializer, +# top junior serializer, +# guardian profile serializer, +# approve junior serializer, +# approve task serializer, + class UserSerializer(serializers.ModelSerializer): """User serializer""" auth_token = serializers.SerializerMethodField('get_auth_token') @@ -38,10 +59,12 @@ class UserSerializer(serializers.ModelSerializer): """Create user profile""" user = User.objects.create_user(username=email, email=email, password=password) UserNotification.objects.create(user=user) - if user_type == '1': + if user_type == str(NUMBER['one']): + # create junior profile Junior.objects.create(auth=user, junior_code=generate_code(JUN, user.id), referral_code=generate_code(ZOD, user.id)) - if user_type == '2': + if user_type == str(NUMBER['two']): + # create guardian profile Guardian.objects.create(user=user, guardian_code=generate_code(GRD, user.id), referral_code=generate_code(ZOD, user.id)) return user @@ -56,6 +79,7 @@ class UserSerializer(serializers.ModelSerializer): "code": 400, "status":"failed", }) +# update guardian profile class CreateGuardianSerializer(serializers.ModelSerializer): """Create guardian serializer""" """Basic info""" @@ -65,9 +89,12 @@ class CreateGuardianSerializer(serializers.ModelSerializer): """Contact details""" phone = serializers.CharField(max_length=20, required=False) country_code = serializers.IntegerField(required=False) + # basic info family_name = serializers.CharField(max_length=100, required=False) dob = serializers.DateField(required=False) + # code info referral_code = serializers.CharField(max_length=100, required=False) + # image info image = serializers.URLField(required=False) class Meta(object): @@ -140,6 +167,7 @@ class TaskSerializer(serializers.ModelSerializer): def create(self, validated_data): """create default task image data""" validated_data['guardian'] = Guardian.objects.filter(user=self.context['user']).last() + # update image of the task images = self.context['image'] validated_data['default_image'] = images instance = JuniorTask.objects.create(**validated_data) @@ -227,6 +255,7 @@ class GuardianProfileSerializer(serializers.ModelSerializer): """total filled fields count""" total_field_list = [obj.user.first_name, obj.country_name, obj.gender, obj.dob, obj.image] + # count total complete field total_complete_field = [data for data in total_field_list if data != '' and data is not None] return len(total_complete_field) @@ -256,4 +285,24 @@ class ApproveJuniorSerializer(serializers.ModelSerializer): instance.save() return instance +class ApproveTaskSerializer(serializers.ModelSerializer): + """approve task serializer""" + class Meta(object): + """Meta info""" + model = JuniorTask + fields = ['id', 'task_status', 'is_approved'] + + def create(self, validated_data): + """update task status """ + instance = self.context['task_instance'] + if self.context['action'] == str(NUMBER['one']): + # approve the task + instance.task_status = str(NUMBER['five']) + instance.is_approved = True + else: + # reject the task + instance.task_status = str(NUMBER['three']) + instance.is_approved = False + instance.save() + return instance diff --git a/guardian/urls.py b/guardian/urls.py index 71d3036..b14aa77 100644 --- a/guardian/urls.py +++ b/guardian/urls.py @@ -2,7 +2,7 @@ """Django import""" from django.urls import path, include from .views import (SignupViewset, UpdateGuardianProfile, AllTaskListAPIView, CreateTaskAPIView, TaskListAPIView, - SearchTaskListAPIView, TopJuniorListAPIView, ApproveJuniorAPIView) + SearchTaskListAPIView, TopJuniorListAPIView, ApproveJuniorAPIView, ApproveTaskAPIView) """Third party import""" from rest_framework import routers @@ -34,6 +34,8 @@ router.register('top-junior', TopJuniorListAPIView, basename='top-junior') router.register('filter-task', SearchTaskListAPIView, basename='filter-task') # Approve junior API""" router.register('approve-junior', ApproveJuniorAPIView, basename='approve-junior') +# Approve junior API""" +router.register('approve-task', ApproveTaskAPIView, basename='approve-task') # Define Url pattern""" urlpatterns = [ path('api/v1/', include(router.urls)), diff --git a/guardian/views.py b/guardian/views.py index f35ca90..f53dc7d 100644 --- a/guardian/views.py +++ b/guardian/views.py @@ -5,14 +5,24 @@ from rest_framework import viewsets, status from rest_framework.pagination import PageNumberPagination from django.contrib.auth.models import User from django.utils import timezone -from PIL import Image -from datetime import datetime, timedelta """Import Django app""" + +# Import guardian's model, +# Import junior's model, +# Import account's model, +# Import constant from +# base package, +# Import messages from +# base package, +# Import some functions +# from utils file +# Import account's serializer +# Import account's task + from .serializers import (UserSerializer, CreateGuardianSerializer, TaskSerializer, TaskDetailsSerializer, - TopJuniorSerializer, ApproveJuniorSerializer) + TopJuniorSerializer, ApproveJuniorSerializer, ApproveTaskSerializer) from .models import Guardian, JuniorTask from junior.models import Junior, JuniorPoints -from junior.serializers import JuniorDetailSerializer from account.models import UserEmailOtp, UserNotification from .tasks import generate_otp from account.utils import send_otp_email @@ -20,7 +30,17 @@ from account.utils import custom_response, custom_error_response from base.messages import ERROR_CODE, SUCCESS_CODE from base.constants import NUMBER from .utils import upload_image_to_alibaba -from django.db.models import Sum + +""" Define APIs """ +# Define Signup API, +# update guardian profile, +# list of all task +# list of task according to the status of the task +# create task API +# search task by name of the task API +# top junior API, +# approve junior API +# approve task API # Create your views here. class SignupViewset(viewsets.ModelViewSet): """Signup view set""" @@ -35,6 +55,7 @@ class SignupViewset(viewsets.ModelViewSet): """Generate otp""" otp = generate_otp() expiry = timezone.now() + timezone.timedelta(days=1) + # create user email otp object 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""" @@ -60,6 +81,7 @@ class UpdateGuardianProfile(viewsets.ViewSet): if image and image.size == NUMBER['zero']: return custom_error_response(ERROR_CODE['2035'], response_status=status.HTTP_400_BAD_REQUEST) filename = f"images/{image.name}" + # upload image on ali baba image_url = upload_image_to_alibaba(image, filename) data = {"image":image_url} serializer = CreateGuardianSerializer(context={"user":request.user, @@ -83,6 +105,7 @@ class AllTaskListAPIView(viewsets.ModelViewSet): def list(self, request, *args, **kwargs): """Create guardian profile""" queryset = JuniorTask.objects.filter(guardian__user=request.user) + # use TaskDetailsSerializer serializer serializer = TaskDetailsSerializer(queryset, many=True) return custom_response(None, serializer.data, response_status=status.HTTP_200_OK) @@ -102,7 +125,9 @@ class TaskListAPIView(viewsets.ModelViewSet): queryset = JuniorTask.objects.filter(guardian__user=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 serializer = TaskDetailsSerializer(paginated_queryset, many=True) return custom_response(None, serializer.data, response_status=status.HTTP_200_OK) @@ -123,8 +148,10 @@ class CreateTaskAPIView(viewsets.ModelViewSet): image_url = upload_image_to_alibaba(image, filename) image_data = image_url data.pop('default_image') + # use TaskSerializer serializer serializer = TaskSerializer(context={"user":request.user, "image":image_data}, data=data) if serializer.is_valid(): + # save serializer serializer.save() 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) @@ -139,6 +166,7 @@ class SearchTaskListAPIView(viewsets.ModelViewSet): def get_queryset(self): """Get the queryset for the view""" title = self.request.GET.get('title') + # fetch junior query junior_queryset = JuniorTask.objects.filter(guardian__user=self.request.user, task_name__icontains=title)\ .order_by('due_date', 'created_at') return junior_queryset @@ -149,7 +177,7 @@ class SearchTaskListAPIView(viewsets.ModelViewSet): paginator = self.pagination_class() paginated_queryset = paginator.paginate_queryset(queryset, request) - + # use TaskSerializer serializer serializer = TaskDetailsSerializer(paginated_queryset, many=True) return custom_response(None, serializer.data, response_status=status.HTTP_200_OK) @@ -186,18 +214,53 @@ class ApproveJuniorAPIView(viewsets.ViewSet): def get_queryset(self): """Get the queryset for the view""" guardian = Guardian.objects.filter(user__email=self.request.user).last() + # fetch junior query junior_queryset = Junior.objects.filter(id=self.request.data.get('junior_id')).last() return guardian, junior_queryset def create(self, request, *args, **kwargs): """ junior list""" queryset = self.get_queryset() + # action 1 is use for approve and 2 for reject if request.data['action'] == '1': + # use ApproveJuniorSerializer serializer serializer = ApproveJuniorSerializer(context={"guardian_code": queryset[0].guardian_code, "junior": queryset[1], "action": request.data['action']}, data=request.data) if serializer.is_valid(): + # save serializer serializer.save() return custom_response(SUCCESS_CODE['3023'], serializer.data, response_status=status.HTTP_200_OK) else: return custom_response(SUCCESS_CODE['3024'], response_status=status.HTTP_200_OK) + +class ApproveTaskAPIView(viewsets.ViewSet): + """approve junior by guardian""" + serializer_class = ApproveTaskSerializer + permission_classes = [IsAuthenticated] + + def get_queryset(self): + """Get the queryset for the view""" + guardian = Guardian.objects.filter(user__email=self.request.user).last() + task_queryset = JuniorTask.objects.filter(id=self.request.data.get('task_id'), + guardian=guardian, + junior=self.request.data.get('junior_id')).last() + return guardian, task_queryset + + def create(self, request, *args, **kwargs): + """ junior list""" + # action 1 is use for approve and 2 for reject + queryset = self.get_queryset() + # use ApproveJuniorSerializer serializer + serializer = ApproveTaskSerializer(context={"guardian_code": queryset[0].guardian_code, + "task_instance": queryset[1], + "action": str(request.data['action'])}, + data=request.data) + if str(request.data['action']) == str(NUMBER['one']) and serializer.is_valid(): + serializer.save() + return custom_response(SUCCESS_CODE['3025'], response_status=status.HTTP_200_OK) + elif str(request.data['action']) == str(NUMBER['two']) and serializer.is_valid(): + 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) diff --git a/junior/views.py b/junior/views.py index 5766c82..d77727b 100644 --- a/junior/views.py +++ b/junior/views.py @@ -2,9 +2,19 @@ from rest_framework import viewsets, status, generics,views from rest_framework.permissions import IsAuthenticated from rest_framework.pagination import PageNumberPagination -from rest_framework.response import Response -from PIL import Image """Django app import""" + +# Import guardian's model, +# Import junior's model, +# Import account's model, +# Import constant from +# base package, +# Import messages from +# base package, +# Import some functions +# from utils file +# Import account's serializer +# Import account's task from junior.models import Junior from .serializers import (CreateJuniorSerializer, JuniorDetailListSerializer, AddJuniorSerializer,\ RemoveJuniorSerializer) @@ -13,6 +23,17 @@ from base.messages import ERROR_CODE, SUCCESS_CODE from base.constants import NUMBER from account.utils import custom_response, custom_error_response from guardian.utils import upload_image_to_alibaba + +""" Define APIs """ +# Define validate guardian code API, +# update junior profile, +# list of all assosicated junior +# Add junior API +# invite junior API +# search junior API +# remove junior API, +# approve junior API + # Create your views here. class UpdateJuniorProfile(viewsets.ViewSet): """Update junior profile""" @@ -29,6 +50,7 @@ class UpdateJuniorProfile(viewsets.ViewSet): if image.size == NUMBER['zero']: return custom_error_response(ERROR_CODE['2035'], response_status=status.HTTP_400_BAD_REQUEST) filename = f"images/{image.name}" + # upload image on ali baba image_url = upload_image_to_alibaba(image, filename) request_data = {"image": image_url} serializer = CreateJuniorSerializer(context={"user":request.user, "image":image_url, @@ -51,6 +73,7 @@ class ValidateGuardianCode(viewsets.ViewSet): """check guardian code""" guardian_code = self.request.GET.get('guardian_code').split(',') for code in guardian_code: + # fetch guardian object guardian_data = Guardian.objects.filter(guardian_code=code).exists() if guardian_data: return custom_response(SUCCESS_CODE['3013'], response_status=status.HTTP_200_OK) @@ -68,6 +91,7 @@ class JuniorListAPIView(viewsets.ModelViewSet): """ junior list""" guardian_data = Guardian.objects.filter(user__email=request.user).last() queryset = Junior.objects.filter(guardian_code__icontains=str(guardian_data.guardian_code)) + # use JuniorDetailListSerializer serializer serializer = JuniorDetailListSerializer(queryset, many=True) return custom_response(None, serializer.data, response_status=status.HTTP_200_OK) @@ -80,8 +104,10 @@ class AddJuniorAPIView(viewsets.ModelViewSet): """ junior list""" info = {'user': request.user, 'email': request.data['email'], 'first_name': request.data['first_name'], 'last_name': request.data['last_name']} + # use AddJuniorSerializer serializer serializer = AddJuniorSerializer(data=request.data, context=info) if serializer.is_valid(): + # save serializer serializer.save() return custom_response(SUCCESS_CODE['3021'], serializer.data, response_status=status.HTTP_200_OK) return custom_error_response(serializer.error, response_status=status.HTTP_400_BAD_REQUEST) @@ -105,6 +131,7 @@ class InvitedJuniorAPIView(viewsets.ModelViewSet): queryset = self.get_queryset() paginator = self.pagination_class() paginated_queryset = paginator.paginate_queryset(queryset, request) + # use JuniorDetailListSerializer serializer serializer = JuniorDetailListSerializer(paginated_queryset, many=True) return custom_response(None, serializer.data, response_status=status.HTTP_200_OK) @@ -128,7 +155,9 @@ class FilterJuniorAPIView(viewsets.ModelViewSet): """Create guardian profile""" queryset = self.get_queryset() paginator = self.pagination_class() + # use Pagination paginated_queryset = paginator.paginate_queryset(queryset, request) + # use JuniorDetailListSerializer serializer serializer = JuniorDetailListSerializer(paginated_queryset, many=True) return custom_response(None, serializer.data, response_status=status.HTTP_200_OK) @@ -142,11 +171,14 @@ class RemoveJuniorAPIView(views.APIView): def put(self, request, format=None): junior_id = self.request.GET.get('id') guardian = Guardian.objects.filter(user__email=self.request.user).last() + # fetch junior query junior_queryset = Junior.objects.filter(id=junior_id, guardian_code__icontains=str(guardian.guardian_code), is_invited=True).last() if junior_queryset: + # use RemoveJuniorSerializer serializer serializer = RemoveJuniorSerializer(junior_queryset, data=request.data, partial=True) if serializer.is_valid(): + # save serializer serializer.save() 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) diff --git a/zod_bank/settings.py b/zod_bank/settings.py index b052a4f..84191b0 100644 --- a/zod_bank/settings.py +++ b/zod_bank/settings.py @@ -9,13 +9,14 @@ https://docs.djangoproject.com/en/3.0/topics/settings/ For the full list of settings and their values, see https://docs.djangoproject.com/en/3.0/ref/settings/ """ - +# Django Import import os from dotenv import load_dotenv from datetime import timedelta load_dotenv() # OR, the same with increased verbosity: load_dotenv(verbose=True) +# env path env_path = os.path.join(os.path.abspath(os.path.join('.env', os.pardir)), '.env') load_dotenv(dotenv_path=env_path) @@ -34,32 +35,36 @@ SECRET_KEY = '-pb+8w#)6qsh+w&tr+q$tholf7=54v%05e^9!lneiqqgtddg6q' # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True +# allow all host ALLOWED_HOSTS = ['*'] # Application definition INSTALLED_APPS = [ + # Add your installed Django apps here 'django.contrib.admin', 'django.contrib.auth', 'django.contrib.contenttypes', 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', + # Add Django rest frame work apps here 'django_extensions', 'storages', 'drf_yasg', 'corsheaders', 'django.contrib.postgres', 'rest_framework', + # Add your custom apps here. 'django_ses', 'account', 'junior', - 'guardian', - # 'social_django' + 'guardian' ] - +# define middle ware here MIDDLEWARE = [ + # Add your middleware classes here. 'django.middleware.security.SecurityMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', 'django.middleware.common.CommonMiddleware', @@ -70,8 +75,10 @@ MIDDLEWARE = [ 'account.custom_middleware.CustomMiddleware' ] +# define root ROOT_URLCONF = 'zod_bank.urls' +# define templates TEMPLATES = [ { 'BACKEND': 'django.template.backends.django.DjangoTemplates', @@ -88,7 +95,9 @@ TEMPLATES = [ }, ] +# define wsgi WSGI_APPLICATION = 'zod_bank.wsgi.application' +# define rest frame work REST_FRAMEWORK = { 'DEFAULT_AUTHENTICATION_CLASSES': [ # 'rest_framework.authentication.SessionAuthentication', @@ -97,6 +106,7 @@ REST_FRAMEWORK = { 'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.PageNumberPagination', 'PAGE_SIZE': 5, } +# define jwt token SIMPLE_JWT = { 'ACCESS_TOKEN_LIFETIME': timedelta(hours=2, minutes=59, seconds=59, microseconds=999999), 'REFRESH_TOKEN_LIFETIME': timedelta(hours=71, minutes=59, seconds=59, microseconds=999999), @@ -113,7 +123,7 @@ DATABASES = { 'PORT':os.getenv('DB_PORT'), } } - +# define swagger setting SWAGGER_SETTINGS = { "exclude_namespaces": [], "api_version": '0.1', @@ -140,6 +150,7 @@ SWAGGER_SETTINGS = { # Password validation # https://docs.djangoproject.com/en/3.0/ref/settings/#auth-password-validators +# password validation AUTH_PASSWORD_VALIDATORS = [ { 'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator', @@ -159,20 +170,23 @@ AUTH_PASSWORD_VALIDATORS = [ # Internationalization # https://docs.djangoproject.com/en/3.0/topics/i18n/ +# language code LANGUAGE_CODE = 'en-us' - +# time zone TIME_ZONE = 'UTC' - +# define I18N USE_I18N = True - +# define L10N USE_L10N = True - +# define TZ USE_TZ = True # cors header settings SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https') +# cors allow setting CORS_ORIGIN_ALLOW_ALL = True +# cors allow method CORS_ALLOW_METHODS = ( 'DELETE', 'GET', @@ -181,7 +195,7 @@ CORS_ALLOW_METHODS = ( 'POST', 'PUT', ) - +# cors allow header CORS_ALLOW_HEADERS = ( 'accept', 'accept-encoding', @@ -197,11 +211,12 @@ CORS_ALLOW_HEADERS = ( """Static files (CSS, JavaScript, Images) https://docs.djangoproject.com/en/3.0/howto/static-files/""" - +# google client id GOOGLE_CLIENT_ID = os.getenv('GOOGLE_CLIENT_ID') +# google client secret key GOOGLE_CLIENT_SECRET = os.getenv('GOOGLE_CLIENT_SECRET') - +# email settings EMAIL_BACKEND="django.core.mail.backends.smtp.EmailBackend" EMAIL_HOST="smtp.sendgrid.net" EMAIL_PORT="587" @@ -211,14 +226,15 @@ EMAIL_HOST_PASSWORD="SG.HAMnFRvaSMWeVLatqr4seg.Y9fQb-ckK9gyXLoMKdUE8eCh5lrel36Tm EMAIL_FROM_ADDRESS="support@zodbank.com" DEFAULT_ADDRESS="zodbank@yopmail.com" - +# ali baba cloud settings ALIYUN_OSS_ACCESS_KEY_ID = os.getenv('ALIYUN_OSS_ACCESS_KEY_ID') ALIYUN_OSS_ACCESS_KEY_SECRET = os.getenv('ALIYUN_OSS_ACCESS_KEY_SECRET') ALIYUN_OSS_BUCKET_NAME = os.getenv('ALIYUN_OSS_BUCKET_NAME') ALIYUN_OSS_ENDPOINT = os.getenv('ALIYUN_OSS_ENDPOINT') ALIYUN_OSS_REGION = os.getenv('ALIYUN_OSS_REGION') - +# define static url STATIC_URL = 'static/' +# define static root STATIC_ROOT = 'static' From 6d6d21137fec028c6656e8fa1a3a37a3a49ef2b4 Mon Sep 17 00:00:00 2001 From: jain Date: Mon, 17 Jul 2023 17:00:33 +0530 Subject: [PATCH 13/38] sonar issues --- account/serializers.py | 17 +++++++++++++++-- account/views.py | 2 +- base/messages.py | 2 ++ guardian/tasks.py | 5 +++-- guardian/views.py | 4 ++++ 5 files changed, 25 insertions(+), 5 deletions(-) diff --git a/account/serializers.py b/account/serializers.py index 3596c07..11944e6 100644 --- a/account/serializers.py +++ b/account/serializers.py @@ -140,15 +140,28 @@ class ForgotPasswordSerializer(serializers.Serializer): class SuperUserSerializer(serializers.ModelSerializer): """Super admin serializer""" user_type = serializers.SerializerMethodField('get_user_type') + auth_token = serializers.SerializerMethodField('get_auth_token') + refresh_token = serializers.SerializerMethodField('get_refresh_token') + + def get_auth_token(self, obj): + refresh = RefreshToken.for_user(obj.auth) + access_token = str(refresh.access_token) + return access_token + + def get_refresh_token(self, obj): + refresh = RefreshToken.for_user(obj.user) + refresh_token = str(refresh) + return refresh_token def get_user_type(self, obj): """user type""" - return SUPERUSER + return str(NUMBER['three']) class Meta(object): """Meta info""" model = User - fields = ['id', 'username', 'email', 'first_name', 'last_name', 'is_active', 'user_type'] + fields = ['id', 'auth_token', 'refresh_token', 'username', 'email', 'first_name', + 'last_name', 'is_active', 'user_type'] class GuardianSerializer(serializers.ModelSerializer): diff --git a/account/views.py b/account/views.py index b6fc821..c11e955 100644 --- a/account/views.py +++ b/account/views.py @@ -214,7 +214,7 @@ class ForgotPasswordAPIView(views.APIView): User.objects.get(email=email) except User.DoesNotExist: return custom_error_response(ERROR_CODE['2004'], response_status=status.HTTP_404_NOT_FOUND) - verification_code = ''.join([str(random.randrange(9)) for _ in range(6)]) + verification_code = generate_otp() # Send the verification code to the user's email from_email = settings.EMAIL_FROM_ADDRESS recipient_list = [email] diff --git a/base/messages.py b/base/messages.py index 8b65d2a..82d471a 100644 --- a/base/messages.py +++ b/base/messages.py @@ -47,6 +47,7 @@ ERROR_CODE = { "2021": "Already register", "2022": "Invalid Guardian code", "2023": "Invalid user", + # email not verified "2024": "Email not verified", "2025": "Invalid input. Expected a list of strings.", "2026": "New password should not same as old password", @@ -54,6 +55,7 @@ ERROR_CODE = { "2028": "You are not authorized person to sign up on this platform", "2029": "Validity of otp verification is expired", "2030": "Use correct user type and token", + # invalid password "2031": "Invalid password", "2032": "Failed to send email", "2033": "Missing required fields", diff --git a/guardian/tasks.py b/guardian/tasks.py index 7a5dd90..9cf39b3 100644 --- a/guardian/tasks.py +++ b/guardian/tasks.py @@ -1,6 +1,7 @@ """task files""" """Django import""" -import random +import secrets def generate_otp(): """generate random otp""" - return ''.join([str(random.randrange(9)) for _ in range(6)]) + digits = "0123456789" + return "".join(secrets.choice(digits) for _ in range(6)) diff --git a/guardian/views.py b/guardian/views.py index f53dc7d..1d1808e 100644 --- a/guardian/views.py +++ b/guardian/views.py @@ -176,6 +176,7 @@ class SearchTaskListAPIView(viewsets.ModelViewSet): queryset = self.get_queryset() paginator = self.pagination_class() + # use pagination paginated_queryset = paginator.paginate_queryset(queryset, request) # use TaskSerializer serializer serializer = TaskDetailsSerializer(paginated_queryset, many=True) @@ -242,6 +243,7 @@ class ApproveTaskAPIView(viewsets.ViewSet): def get_queryset(self): """Get the queryset for the view""" guardian = Guardian.objects.filter(user__email=self.request.user).last() + # task query task_queryset = JuniorTask.objects.filter(id=self.request.data.get('task_id'), guardian=guardian, junior=self.request.data.get('junior_id')).last() @@ -257,9 +259,11 @@ class ApproveTaskAPIView(viewsets.ViewSet): "action": str(request.data['action'])}, data=request.data) if str(request.data['action']) == str(NUMBER['one']) and serializer.is_valid(): + # save serializer serializer.save() return custom_response(SUCCESS_CODE['3025'], response_status=status.HTTP_200_OK) elif str(request.data['action']) == str(NUMBER['two']) and serializer.is_valid(): + # save serializer serializer.save() return custom_response(SUCCESS_CODE['3026'], response_status=status.HTTP_200_OK) else: From 4779749b0c85c111e54e44eff1aaba1e749554a3 Mon Sep 17 00:00:00 2001 From: jain Date: Mon, 17 Jul 2023 17:05:45 +0530 Subject: [PATCH 14/38] success msg --- account/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/account/views.py b/account/views.py index c11e955..015d505 100644 --- a/account/views.py +++ b/account/views.py @@ -321,7 +321,7 @@ class UserLogin(viewsets.ViewSet): 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(None, 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): From 8f1f49de4551fe040a4263089f08e24ebc6dc7be Mon Sep 17 00:00:00 2001 From: jain Date: Mon, 17 Jul 2023 18:00:19 +0530 Subject: [PATCH 15/38] jira-21 approve task API --- account/views.py | 2 +- guardian/serializers.py | 7 +++++++ guardian/views.py | 3 ++- manage.py | 8 ++++++-- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/account/views.py b/account/views.py index 015d505..7bc9ab5 100644 --- a/account/views.py +++ b/account/views.py @@ -38,7 +38,7 @@ from account.utils import (send_otp_email, send_support_email, custom_response, from junior.serializers import JuniorProfileSerializer from guardian.serializers import GuardianProfileSerializer -class GoogleLoginMixin: +class GoogleLoginMixin(object): """google login mixin""" @staticmethod def google_login(self, request): diff --git a/guardian/serializers.py b/guardian/serializers.py index 8bcd0cf..ae96969 100644 --- a/guardian/serializers.py +++ b/guardian/serializers.py @@ -295,14 +295,21 @@ class ApproveTaskSerializer(serializers.ModelSerializer): def create(self, validated_data): """update task status """ instance = self.context['task_instance'] + junior = self.context['junior'] + junior_details = Junior.objects.filter(id=junior).last() + junior_data, created = JuniorPoints.objects.get_or_create(junior=junior_details) if self.context['action'] == str(NUMBER['one']): # approve the task instance.task_status = str(NUMBER['five']) instance.is_approved = True + junior_data.total_task_points = junior_data.total_task_points + instance.points + junior_data.save() else: # reject the task instance.task_status = str(NUMBER['three']) instance.is_approved = False + junior_data.total_task_points = junior_data.total_task_points - instance.points + junior_data.save() instance.save() return instance diff --git a/guardian/views.py b/guardian/views.py index 1d1808e..3450be7 100644 --- a/guardian/views.py +++ b/guardian/views.py @@ -256,7 +256,8 @@ class ApproveTaskAPIView(viewsets.ViewSet): # use ApproveJuniorSerializer serializer serializer = ApproveTaskSerializer(context={"guardian_code": queryset[0].guardian_code, "task_instance": queryset[1], - "action": str(request.data['action'])}, + "action": str(request.data['action']), + "junior": self.request.data['junior_id']}, data=request.data) if str(request.data['action']) == str(NUMBER['one']) and serializer.is_valid(): # save serializer diff --git a/manage.py b/manage.py index a19d33b..81f9c88 100755 --- a/manage.py +++ b/manage.py @@ -1,11 +1,15 @@ #!/usr/bin/env python """Django's command-line utility for administrative tasks.""" """Django import""" -"""Import OS module""" +# Import OS module import os -"""Import sys module""" +# Import sys module""" import sys +# define all function +# execute command line +# Import execute from command line +# fetch django settings def main(): """Main function""" From ae7250b34ac01104db439f71f2d6f4bba32624f1 Mon Sep 17 00:00:00 2001 From: jain Date: Mon, 17 Jul 2023 18:17:00 +0530 Subject: [PATCH 16/38] changes in env --- zod_bank/settings.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/zod_bank/settings.py b/zod_bank/settings.py index 84191b0..c8b85a6 100644 --- a/zod_bank/settings.py +++ b/zod_bank/settings.py @@ -30,11 +30,9 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) # See https://docs.djangoproject.com/en/3.0/howto/deployment/checklist/ # SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = '-pb+8w#)6qsh+w&tr+q$tholf7=54v%05e^9!lneiqqgtddg6q' - +SECRET_KEY = os.getenv('SECRET_KEY') # SECURITY WARNING: don't run with debug turned on in production! -DEBUG = True - +DEBUG = os.getenv('DEBUG') # allow all host ALLOWED_HOSTS = ['*'] From 751af642b8d251eb7249099498476a611a650f4e Mon Sep 17 00:00:00 2001 From: abutalib-kiwi Date: Mon, 17 Jul 2023 18:58:09 +0530 Subject: [PATCH 17/38] added admin permission --- base/messages.py | 12 ++++- web_admin/admin.py | 5 ++ web_admin/apps.py | 7 +++ web_admin/models.py | 12 +++++ web_admin/permission.py | 26 +++++++++ web_admin/serializers.py | 45 +++++++++++++++- web_admin/tests.py | 3 ++ web_admin/urls.py | 2 + web_admin/views.py | 112 ++++++++++++++++++++++++++++++++++----- zod_bank/settings.py | 4 ++ 10 files changed, 214 insertions(+), 14 deletions(-) create mode 100644 web_admin/permission.py diff --git a/base/messages.py b/base/messages.py index 82d471a..a13c1d6 100644 --- a/base/messages.py +++ b/base/messages.py @@ -65,7 +65,12 @@ ERROR_CODE = { "2036": "Choose valid user", # log in multiple device msg "2037": "You are already log in another device", - "2038": "Choose valid action for task" + "2038": "Choose valid action for task", + "2039": "Add at least one article card or maximum 6", + "2040": "Add at least 5 article survey or maximum 10", + "2041": "Article with given id doesn't exist.", + "2042": "Article Card with given id doesn't exist.", + "2043": "Article Survey with given id doesn't exist." } """Success message code""" SUCCESS_CODE = { @@ -105,6 +110,11 @@ SUCCESS_CODE = { "3024": "Junior request is rejected successfully", "3025": "Task is approved 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.", } """status code error""" STATUS_CODE_ERROR = { diff --git a/web_admin/admin.py b/web_admin/admin.py index 1adf7e6..b1df483 100644 --- a/web_admin/admin.py +++ b/web_admin/admin.py @@ -1,5 +1,10 @@ +""" +web_admin admin file +""" +# django imports from django.contrib import admin +# local imports from web_admin.models import Article, ArticleCard, ArticleSurvey, SurveyOption diff --git a/web_admin/apps.py b/web_admin/apps.py index 9701a1f..2842e02 100644 --- a/web_admin/apps.py +++ b/web_admin/apps.py @@ -1,6 +1,13 @@ +""" +web_admin app file +""" +# django imports from django.apps import AppConfig class WebAdminConfig(AppConfig): + """ + web admin app config + """ default_auto_field = 'django.db.models.BigAutoField' name = 'web_admin' diff --git a/web_admin/models.py b/web_admin/models.py index 0437102..1e49c6b 100644 --- a/web_admin/models.py +++ b/web_admin/models.py @@ -6,6 +6,9 @@ from django.db import models class Article(models.Model): + """ + Article model + """ title = models.CharField(max_length=255) description = models.TextField() created_at = models.DateTimeField(auto_now_add=True) @@ -19,6 +22,9 @@ class Article(models.Model): class ArticleCard(models.Model): + """ + Article Card model + """ article = models.ForeignKey(Article, on_delete=models.CASCADE, related_name='article_cards') title = models.CharField(max_length=255) description = models.TextField() @@ -32,6 +38,9 @@ class ArticleCard(models.Model): class ArticleSurvey(models.Model): + """ + Article Survey model + """ article = models.ForeignKey(Article, on_delete=models.CASCADE, related_name='article_survey') question = models.CharField(max_length=255) points = models.IntegerField() @@ -44,6 +53,9 @@ class ArticleSurvey(models.Model): class SurveyOption(models.Model): + """ + Survey Options model + """ survey = models.ForeignKey(ArticleSurvey, on_delete=models.CASCADE, related_name='survey_options') option = models.CharField(max_length=255) is_answer = models.BooleanField(default=False) diff --git a/web_admin/permission.py b/web_admin/permission.py new file mode 100644 index 0000000..5ecf33a --- /dev/null +++ b/web_admin/permission.py @@ -0,0 +1,26 @@ +""" +web_admin permission classes +""" +# django imports +from rest_framework import permissions + + +class AdminPermission(permissions.BasePermission): + """ + to check for usertype admin only + """ + def has_permission(self, request, view): + """ + Return True if user_type is admin + """ + if request.user.is_superuser: + return True + return False + + def has_object_permission(self, request, view, obj): + """ + check for object level permission + """ + if request.user.is_superuser: + return True + return False diff --git a/web_admin/serializers.py b/web_admin/serializers.py index 23e69e3..57d4278 100644 --- a/web_admin/serializers.py +++ b/web_admin/serializers.py @@ -1,33 +1,55 @@ """ web_admin serializers file """ +# django imports from rest_framework import serializers +from django.conf import settings +# local imports +from base.messages import ERROR_CODE from web_admin.models import Article, ArticleCard, SurveyOption, ArticleSurvey from web_admin.utils import pop_id class ArticleCardSerializer(serializers.ModelSerializer): + """ + Article Card serializer + """ id = serializers.IntegerField(required=False) class Meta: + """ + meta class + """ model = ArticleCard fields = ('id', 'title', 'description') class SurveyOptionSerializer(serializers.ModelSerializer): + """ + survey option serializer + """ id = serializers.IntegerField(required=False) class Meta: + """ + meta class + """ model = SurveyOption fields = ('id', 'option', 'is_answer') class ArticleSurveySerializer(serializers.ModelSerializer): + """ + article survey serializer + """ id = serializers.IntegerField(required=False) survey_options = SurveyOptionSerializer(many=True) class Meta: + """ + meta class + """ model = ArticleSurvey fields = ('id', 'question', 'points', 'survey_options') @@ -46,12 +68,27 @@ class ArticleSerializer(serializers.ModelSerializer): model = Article fields = ('id', 'title', 'description', 'article_cards', 'article_survey') + def validate(self, attrs): + """ + to validate request data + :param attrs: + :return: validated attrs + """ + article_cards = attrs.get('article_cards', None) + article_survey = attrs.get('article_survey', None) + if article_cards is None or len(article_cards) > int(settings.MAX_ARTICLE_CARD): + raise serializers.ValidationError({'details': ERROR_CODE['2039']}) + if article_survey is None or len(article_survey) < int(settings.MIN_ARTICLE_SURVEY) or int( + settings.MAX_ARTICLE_SURVEY) < len(article_survey): + raise serializers.ValidationError({'details': ERROR_CODE['2040']}) + return attrs + def create(self, validated_data): """ to create article. ID in post data dict is for update api. :param validated_data: - :return: success message + :return: article object """ article_cards = validated_data.pop('article_cards') article_survey = validated_data.pop('article_survey') @@ -73,6 +110,12 @@ class ArticleSerializer(serializers.ModelSerializer): return article def update(self, instance, validated_data): + """ + to update article and related table + :param instance: + :param validated_data: + :return: article object + """ article_cards = validated_data.pop('article_cards') article_survey = validated_data.pop('article_survey') instance.title = validated_data.get('title', instance.title) diff --git a/web_admin/tests.py b/web_admin/tests.py index 7ce503c..8800281 100644 --- a/web_admin/tests.py +++ b/web_admin/tests.py @@ -1,3 +1,6 @@ +""" +web_admin test file +""" from django.test import TestCase # Create your tests here. diff --git a/web_admin/urls.py b/web_admin/urls.py index d79fafa..95bc7d9 100644 --- a/web_admin/urls.py +++ b/web_admin/urls.py @@ -5,8 +5,10 @@ web_admin urls file from django.urls import path, include from rest_framework import routers +# local imports from web_admin.views import ArticleViewSet +# initiate router router = routers.SimpleRouter() router.register('article', ArticleViewSet, basename='article') diff --git a/web_admin/views.py b/web_admin/views.py index 88147a1..8003e2c 100644 --- a/web_admin/views.py +++ b/web_admin/views.py @@ -5,50 +5,138 @@ web_admin views file from rest_framework.viewsets import GenericViewSet, mixins from rest_framework.response import Response from rest_framework import status +from rest_framework.decorators import action +from rest_framework.permissions import IsAuthenticated # local imports from account.utils import custom_response, custom_error_response -from web_admin.models import Article +from base.messages import SUCCESS_CODE, ERROR_CODE +from web_admin.models import Article, ArticleCard, ArticleSurvey +from web_admin.permission import AdminPermission from web_admin.serializers import ArticleSerializer class ArticleViewSet(GenericViewSet, mixins.CreateModelMixin, mixins.UpdateModelMixin, mixins.ListModelMixin, mixins.RetrieveModelMixin, mixins.DestroyModelMixin): + """ + article api + """ serializer_class = ArticleSerializer - permission_classes = [] + permission_classes = [IsAuthenticated, AdminPermission] queryset = Article.objects.prefetch_related('article_cards', 'article_survey', - 'article_survey__survey_options') + 'article_survey__survey_options').order_by('-created_at') + + http_method_names = ['get', 'post', 'put', 'delete'] def create(self, request, *args, **kwargs): + """ + article create api method + :param request: + :param args: + :param kwargs: + :return: success message + """ serializer = self.serializer_class(data=request.data) serializer.is_valid(raise_exception=True) serializer.save() - return custom_response("created") + return custom_response(SUCCESS_CODE["3027"]) def update(self, request, *args, **kwargs): + """ + article update api method + :param request: + :param args: + :param kwargs: + :return: success message + """ article = self.queryset.filter(id=kwargs['pk']).first() serializer = self.serializer_class(article, data=request.data) serializer.is_valid(raise_exception=True) serializer.save() - return custom_response("updated") + return custom_response(SUCCESS_CODE["3028"]) def list(self, request, *args, **kwargs): - # queryset = Article.objects.prefetch_related('article_cards', - # 'article_survey', - # 'article_survey__survey_options') + """ + article list api method + :param request: + :param args: + :param kwargs: + :return: list of article + """ + queryset = self.queryset.filter(is_deleted=False) paginator = self.pagination_class() - paginated_queryset = paginator.paginate_queryset(self.queryset, request) + paginated_queryset = paginator.paginate_queryset(queryset, request) serializer = self.serializer_class(paginated_queryset, many=True) return custom_response(None, data=serializer.data) def retrieve(self, request, *args, **kwargs): - queryset = self.queryset.filter(id=kwargs['pk']) + """ + article detail api method + :param request: + :param args: + :param kwargs: + :return: article detail data + """ + queryset = self.queryset.filter(id=kwargs['pk'], is_deleted=False) serializer = self.serializer_class(queryset, many=True) return custom_response(None, data=serializer.data) def destroy(self, request, *args, **kwargs): + """ + article delete (soft delete) api method + :param request: + :param args: + :param kwargs: + :return: success message + """ article = self.queryset.filter(id=kwargs['pk']).update(is_deleted=True) if article: - return custom_response("deleted") - return custom_error_response("article doesn't exist", status.HTTP_400_BAD_REQUEST) + return custom_response(SUCCESS_CODE["3029"]) + return custom_error_response(ERROR_CODE["2041"], status.HTTP_400_BAD_REQUEST) + + @action(methods=['get'], url_name='', url_path='', detail=False) + def search_article(self, request): + """ + article search api method + :param request: + :return: searched article + """ + search = request.GET.get('search') + queryset = self.queryset.filter(title__icontains=search) + paginator = self.pagination_class() + paginated_queryset = paginator.paginate_queryset(queryset, request) + serializer = self.serializer_class(paginated_queryset, many=True) + return custom_response(None, data=serializer.data) + + @action(methods=['get'], url_name='remove_card', url_path='remove_card', + detail=True, serializer_class=None) + def remove_article_card(self, request, *args, **kwargs): + """ + article card remove (delete) api method + :param request: + :param args: + :param kwargs: + :return: success message + """ + try: + ArticleCard.objects.filter(id=kwargs['pk']).first().delete() + return custom_response(SUCCESS_CODE["3030"]) + except AttributeError: + return custom_error_response(ERROR_CODE["2042"], response_status=status.HTTP_400_BAD_REQUEST) + + @action(methods=['get'], url_name='remove_survey', url_path='remove_survey', + detail=True, serializer_class=None) + def remove_article_survey(self, request, *args, **kwargs): + """ + article survey remove (delete) api method + :param request: + :param args: + :param kwargs: + :return: success message + """ + try: + ArticleSurvey.objects.filter(id=kwargs['pk']).first().delete() + return custom_response(SUCCESS_CODE["3031"]) + except AttributeError: + return custom_error_response(ERROR_CODE["2043"], response_status=status.HTTP_400_BAD_REQUEST) diff --git a/zod_bank/settings.py b/zod_bank/settings.py index a319bbe..b107ffd 100644 --- a/zod_bank/settings.py +++ b/zod_bank/settings.py @@ -233,6 +233,10 @@ ALIYUN_OSS_BUCKET_NAME = os.getenv('ALIYUN_OSS_BUCKET_NAME') ALIYUN_OSS_ENDPOINT = os.getenv('ALIYUN_OSS_ENDPOINT') ALIYUN_OSS_REGION = os.getenv('ALIYUN_OSS_REGION') +MAX_ARTICLE_CARD = os.getenv('MAX_ARTICLE_CARD', 6) +MIN_ARTICLE_SURVEY = os.getenv('MIN_ARTICLE_SURVEY', 5) +MAX_ARTICLE_SURVEY = os.getenv('MAX_ARTICLE_SURVEY', 10) + # define static url STATIC_URL = 'static/' # define static root From 032186bf43498cf7e6d50357e28afbd2c5a50631 Mon Sep 17 00:00:00 2001 From: jain Date: Tue, 18 Jul 2023 11:01:16 +0530 Subject: [PATCH 18/38] task list --- account/serializers.py | 2 +- junior/urls.py | 7 +++++-- junior/views.py | 26 +++++++++++++++++++++++++- 3 files changed, 31 insertions(+), 4 deletions(-) diff --git a/account/serializers.py b/account/serializers.py index 11944e6..4df4e89 100644 --- a/account/serializers.py +++ b/account/serializers.py @@ -225,7 +225,7 @@ class JuniorSerializer(serializers.ModelSerializer): return access_token def get_refresh_token(self, obj): - refresh = RefreshToken.for_user(obj.user) + refresh = RefreshToken.for_user(obj.auth) refresh_token = str(refresh) return refresh_token diff --git a/junior/urls.py b/junior/urls.py index ecedb1a..33d52e7 100644 --- a/junior/urls.py +++ b/junior/urls.py @@ -2,7 +2,7 @@ """Django import""" from django.urls import path, include from .views import (UpdateJuniorProfile, ValidateGuardianCode, JuniorListAPIView, AddJuniorAPIView, - InvitedJuniorAPIView, FilterJuniorAPIView, RemoveJuniorAPIView) + InvitedJuniorAPIView, FilterJuniorAPIView, RemoveJuniorAPIView, JuniorTaskListAPIView) """Third party import""" from rest_framework import routers @@ -17,7 +17,8 @@ router = routers.SimpleRouter() # junior list, # add junior list, invited junior, # filter-junior, -# remove junior""" +# remove junior, +# junior task list """API End points with router""" router.register('create-junior-profile', UpdateJuniorProfile, basename='profile-update') # validate guardian code API""" @@ -30,6 +31,8 @@ router.register('add-junior', AddJuniorAPIView, basename='add-junior') router.register('invited-junior', InvitedJuniorAPIView, basename='invited-junior') # Filter junior list API""" router.register('filter-junior', FilterJuniorAPIView, basename='filter-junior') +# junior's task list API""" +router.register('junior-task-list', JuniorTaskListAPIView, basename='junior-task-list') # Define url pattern""" urlpatterns = [ path('api/v1/', include(router.urls)), diff --git a/junior/views.py b/junior/views.py index d77727b..0e1de75 100644 --- a/junior/views.py +++ b/junior/views.py @@ -18,7 +18,8 @@ from rest_framework.pagination import PageNumberPagination from junior.models import Junior from .serializers import (CreateJuniorSerializer, JuniorDetailListSerializer, AddJuniorSerializer,\ RemoveJuniorSerializer) -from guardian.models import Guardian +from guardian.models import Guardian, JuniorTask +from guardian.serializers import TaskDetailsSerializer from base.messages import ERROR_CODE, SUCCESS_CODE from base.constants import NUMBER from account.utils import custom_response, custom_error_response @@ -184,3 +185,26 @@ class RemoveJuniorAPIView(views.APIView): return custom_error_response(serializer.errors, response_status=status.HTTP_400_BAD_REQUEST) else: return custom_error_response(ERROR_CODE['2034'], response_status=status.HTTP_400_BAD_REQUEST) + + +class JuniorTaskListAPIView(viewsets.ModelViewSet): + """Update guardian profile""" + serializer_class = TaskDetailsSerializer + permission_classes = [IsAuthenticated] + pagination_class = PageNumberPagination + queryset = JuniorTask.objects.all() + + def list(self, request, *args, **kwargs): + """Create guardian profile""" + status_value = self.request.GET.get('status') + if str(status_value) == '0': + queryset = JuniorTask.objects.filter(junior__auth=request.user).order_by('due_date', 'created_at') + else: + 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 + serializer = TaskDetailsSerializer(paginated_queryset, many=True) + return custom_response(None, serializer.data, response_status=status.HTTP_200_OK) From ba4d5933de97e80afb2a9c69a9a9f3a54f2610c0 Mon Sep 17 00:00:00 2001 From: abutalib-kiwi Date: Tue, 18 Jul 2023 14:06:04 +0530 Subject: [PATCH 19/38] notification app, api for device registration and fcm token --- base/messages.py | 1 + notifications/__init__.py | 0 notifications/admin.py | 6 ++++++ notifications/apps.py | 13 ++++++++++++ notifications/migrations/__init__.py | 0 notifications/models.py | 6 ++++++ notifications/serializers.py | 28 ++++++++++++++++++++++++++ notifications/tests.py | 6 ++++++ notifications/urls.py | 18 +++++++++++++++++ notifications/utils.py | 17 ++++++++++++++++ notifications/views.py | 30 ++++++++++++++++++++++++++++ requirements.txt | 2 ++ web_admin/urls.py | 2 +- zod_bank/settings.py | 13 ++++++++++++ zod_bank/urls.py | 1 + 15 files changed, 142 insertions(+), 1 deletion(-) create mode 100644 notifications/__init__.py create mode 100644 notifications/admin.py create mode 100644 notifications/apps.py create mode 100644 notifications/migrations/__init__.py create mode 100644 notifications/models.py create mode 100644 notifications/serializers.py create mode 100644 notifications/tests.py create mode 100644 notifications/urls.py create mode 100644 notifications/utils.py create mode 100644 notifications/views.py diff --git a/base/messages.py b/base/messages.py index a13c1d6..950ffe1 100644 --- a/base/messages.py +++ b/base/messages.py @@ -74,6 +74,7 @@ ERROR_CODE = { } """Success message code""" SUCCESS_CODE = { + "3000": "ok", # Success code for password "3001": "Sign up successfully", # Success code for Thank you diff --git a/notifications/__init__.py b/notifications/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/notifications/admin.py b/notifications/admin.py new file mode 100644 index 0000000..7bd27a7 --- /dev/null +++ b/notifications/admin.py @@ -0,0 +1,6 @@ +""" +notification admin file +""" +from django.contrib import admin + +# Register your models here. diff --git a/notifications/apps.py b/notifications/apps.py new file mode 100644 index 0000000..366a893 --- /dev/null +++ b/notifications/apps.py @@ -0,0 +1,13 @@ +""" +notification app file +""" +# django imports +from django.apps import AppConfig + + +class NotificationsConfig(AppConfig): + """ + notification app config + """ + default_auto_field = 'django.db.models.BigAutoField' + name = 'notifications' diff --git a/notifications/migrations/__init__.py b/notifications/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/notifications/models.py b/notifications/models.py new file mode 100644 index 0000000..90a6f02 --- /dev/null +++ b/notifications/models.py @@ -0,0 +1,6 @@ +""" +notification models file +""" +from django.db import models + +# Create your models here. diff --git a/notifications/serializers.py b/notifications/serializers.py new file mode 100644 index 0000000..053096f --- /dev/null +++ b/notifications/serializers.py @@ -0,0 +1,28 @@ +""" +notification serializer file +""" +# third party imports +from rest_framework import serializers + +# local imports +from notifications.utils import register_fcm_token + + +class RegisterDevice(serializers.Serializer): + """ + used to create and validate register device token + """ + registration_id = serializers.CharField(max_length=250) + device_id = serializers.CharField(max_length=250) + type = serializers.ChoiceField(choices=["ios", "web", "android"]) + + class Meta: + """ meta class """ + fields = ('registration_id', 'type', 'device_id') + + def create(self, validated_data): + """ override this method to create device token for users """ + registration_id = validated_data['registration_id'] + device_type = validated_data['type'] + return register_fcm_token(self.context['user_id'], registration_id, + validated_data['device_id'], device_type) diff --git a/notifications/tests.py b/notifications/tests.py new file mode 100644 index 0000000..fd087b9 --- /dev/null +++ b/notifications/tests.py @@ -0,0 +1,6 @@ +""" +notification test file +""" +from django.test import TestCase + +# Create your tests here. diff --git a/notifications/urls.py b/notifications/urls.py new file mode 100644 index 0000000..b184d02 --- /dev/null +++ b/notifications/urls.py @@ -0,0 +1,18 @@ +""" +notifications urls file +""" +# django imports +from django.urls import path, include +from rest_framework import routers + +# local imports +from notifications.views import NotificationViewSet + +# initiate router +router = routers.SimpleRouter() + +router.register('notifications', NotificationViewSet, basename='notifications') + +urlpatterns = [ + path('api/v1/', include(router.urls)), +] diff --git a/notifications/utils.py b/notifications/utils.py new file mode 100644 index 0000000..b3a0ede --- /dev/null +++ b/notifications/utils.py @@ -0,0 +1,17 @@ +""" +notifications utils file +""" +# third party imports +from fcm_django.models import FCMDevice + +# local imports + + +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, + defaults={'user_id': user_id, 'type': device_type, + 'active': True, + 'registration_id': registration_id}) + return device + diff --git a/notifications/views.py b/notifications/views.py new file mode 100644 index 0000000..8ac3786 --- /dev/null +++ b/notifications/views.py @@ -0,0 +1,30 @@ +""" +notifications views file +""" +# django imports +from django.db.models import Q +from rest_framework import viewsets +from rest_framework.decorators import action +from rest_framework.permissions import IsAuthenticated +from rest_framework.response import Response + +from account.utils import custom_response +from base.messages import SUCCESS_CODE +from notifications.serializers import RegisterDevice + + +class NotificationViewSet(viewsets.GenericViewSet): + """ used to do the notification actions """ + serializer_class = None + permission_classes = [IsAuthenticated, ] + + @action(methods=['post'], detail=False, url_path='device', url_name='device', serializer_class=RegisterDevice) + def fcm_registration(self, request): + """ + used to save the fcm token + """ + serializer = self.get_serializer_class()(data=request.data, + context={'user_id': request.auth.payload['user_id']}) + serializer.is_valid(raise_exception=True) + serializer.save() + return custom_response(SUCCESS_CODE["3000"]) diff --git a/requirements.txt b/requirements.txt index 5dd7f76..6a141cb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -79,3 +79,5 @@ uritemplate==4.1.1 urllib3==1.26.16 vine==5.0.0 wcwidth==0.2.6 + +fcm-django==2.0.0 \ No newline at end of file diff --git a/web_admin/urls.py b/web_admin/urls.py index 95bc7d9..fa272f4 100644 --- a/web_admin/urls.py +++ b/web_admin/urls.py @@ -11,7 +11,7 @@ from web_admin.views import ArticleViewSet # initiate router router = routers.SimpleRouter() -router.register('article', ArticleViewSet, basename='article') +router.register('articles', ArticleViewSet, basename='articles') urlpatterns = [ path('api/v1/', include(router.urls)), diff --git a/zod_bank/settings.py b/zod_bank/settings.py index b107ffd..aea5896 100644 --- a/zod_bank/settings.py +++ b/zod_bank/settings.py @@ -54,6 +54,7 @@ INSTALLED_APPS = [ 'corsheaders', 'django.contrib.postgres', 'rest_framework', + 'fcm_django', # Add your custom apps here. 'django_ses', 'account', @@ -208,6 +209,18 @@ CORS_ALLOW_HEADERS = ( 'x-requested-with', ) +CORS_EXPOSE_HEADERS = ( + 'Access-Control-Allow-Origin: *', +) + +# fcm django settings +FCM_DJANGO_SETTINGS = { + "APP_VERBOSE_NAME": "ZOD_Bank", + "ONE_DEVICE_PER_USER": False, + "DELETE_INACTIVE_DEVICES": True, + "UPDATE_ON_DUPLICATE_REG_ID": True, +} + """Static files (CSS, JavaScript, Images) https://docs.djangoproject.com/en/3.0/howto/static-files/""" diff --git a/zod_bank/urls.py b/zod_bank/urls.py index 009f1b3..a34ef93 100644 --- a/zod_bank/urls.py +++ b/zod_bank/urls.py @@ -30,5 +30,6 @@ urlpatterns = [ path('', include(('account.urls', 'account'), namespace='account')), path('', include('guardian.urls')), path('', include(('junior.urls', 'junior'), namespace='junior')), + path('', include(('notifications.urls', 'notifications'), namespace='notifications')), path('', include(('web_admin.urls', 'web_admin'), namespace='web_admin')), ] From 4c0cac7cb08b8d025c29dd5bacb0975dc5680c15 Mon Sep 17 00:00:00 2001 From: jain Date: Tue, 18 Jul 2023 15:19:50 +0530 Subject: [PATCH 20/38] jira-32 list of all task of junior API, changes in Search task API --- account/serializers.py | 2 +- .../junior_notification_email.email | 2 +- base/constants.py | 2 +- ...eted_on_juniortask_rejected_on_and_more.py | 28 +++++++++++++++++++ guardian/models.py | 6 ++++ guardian/serializers.py | 23 ++++++++++++++- guardian/utils.py | 27 ++++++++++++++++++ guardian/views.py | 11 ++++++-- .../migrations/0014_junior_is_password_set.py | 18 ++++++++++++ junior/models.py | 2 ++ junior/serializers.py | 5 ++-- junior/views.py | 11 ++++++-- zod_bank/settings.py | 5 ++-- 13 files changed, 130 insertions(+), 12 deletions(-) create mode 100644 guardian/migrations/0016_juniortask_completed_on_juniortask_rejected_on_and_more.py create mode 100644 junior/migrations/0014_junior_is_password_set.py diff --git a/account/serializers.py b/account/serializers.py index 4df4e89..5810f1d 100644 --- a/account/serializers.py +++ b/account/serializers.py @@ -248,7 +248,7 @@ class JuniorSerializer(serializers.ModelSerializer): """Meta info""" model = Junior fields = ['id', 'auth_token', 'refresh_token', 'email', 'first_name', 'last_name', 'country_code', - 'phone', 'gender', 'dob', 'guardian_code', 'referral_code','is_active', + 'phone', 'gender', 'dob', 'guardian_code', 'referral_code','is_active', 'is_password_set', 'is_complete_profile', 'created_at', 'image', 'updated_at', 'user_type', 'country_name','is_invited'] class EmailVerificationSerializer(serializers.ModelSerializer): diff --git a/account/templates/templated_email/junior_notification_email.email b/account/templates/templated_email/junior_notification_email.email index ea9c214..9f489ce 100644 --- a/account/templates/templated_email/junior_notification_email.email +++ b/account/templates/templated_email/junior_notification_email.email @@ -15,7 +15,7 @@

- You are receiving this email for join the ZOD bank platform. Please use {{ url }} link to join the platform. + You are receiving this email for joining the ZOD bank platform. Please use {{ url }} link to join the platform.
Your credentials are:- username = {{email}} and password {{password}}

Below are the steps to complete the account and how to use this platform.

diff --git a/base/constants.py b/base/constants.py index d8ca8a8..29da8db 100644 --- a/base/constants.py +++ b/base/constants.py @@ -24,7 +24,7 @@ NUMBER = { 'sixteen': 16, 'seventeen': 17, 'eighteen': 18, 'nineteen': 19, 'twenty': 20, 'twenty_one': 21, 'twenty_two': 22,'twenty_three': 23, 'twenty_four': 24, 'twenty_five': 25, 'thirty': 30, 'forty': 40, 'fifty': 50, 'sixty': 60, 'seventy': 70, 'eighty': 80, 'ninty': 90, - 'ninety_nine': 99, 'hundred': 100, + 'ninety_nine': 99, 'hundred': 100, 'thirty_six_hundred': 3600 } diff --git a/guardian/migrations/0016_juniortask_completed_on_juniortask_rejected_on_and_more.py b/guardian/migrations/0016_juniortask_completed_on_juniortask_rejected_on_and_more.py new file mode 100644 index 0000000..2223e0e --- /dev/null +++ b/guardian/migrations/0016_juniortask_completed_on_juniortask_rejected_on_and_more.py @@ -0,0 +1,28 @@ +# Generated by Django 4.2.2 on 2023-07-18 07:17 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('guardian', '0015_alter_guardian_options_alter_juniortask_options'), + ] + + operations = [ + migrations.AddField( + model_name='juniortask', + name='completed_on', + field=models.DateTimeField(blank=True, null=True), + ), + migrations.AddField( + model_name='juniortask', + name='rejected_on', + field=models.DateTimeField(blank=True, null=True), + ), + migrations.AddField( + model_name='juniortask', + name='requested_on', + field=models.DateTimeField(blank=True, null=True), + ), + ] diff --git a/guardian/models.py b/guardian/models.py index 1746c44..b4a31dd 100644 --- a/guardian/models.py +++ b/guardian/models.py @@ -108,6 +108,12 @@ class JuniorTask(models.Model): is_active = models.BooleanField(default=True) """Task is approved or not""" is_approved = models.BooleanField(default=False) + """request task on particular date""" + requested_on = models.DateTimeField(auto_now_add=False, null=True, blank=True) + """reject task on particular date""" + rejected_on = models.DateTimeField(auto_now_add=False, null=True, blank=True) + """complete task on particular date""" + completed_on = models.DateTimeField(auto_now_add=False, null=True, blank=True) """Profile created and updated time""" created_at = models.DateTimeField(auto_now_add=True) updated_at = models.DateTimeField(auto_now=True) diff --git a/guardian/serializers.py b/guardian/serializers.py index ae96969..9459334 100644 --- a/guardian/serializers.py +++ b/guardian/serializers.py @@ -6,6 +6,7 @@ from rest_framework import serializers from rest_framework_simplejwt.tokens import RefreshToken from django.db import transaction from django.contrib.auth.models import User +from datetime import datetime, time """Import Django app""" # Import guardian's model, # Import junior's model, @@ -23,6 +24,8 @@ from junior.serializers import JuniorDetailSerializer from base.messages import ERROR_CODE, SUCCESS_CODE from base.constants import NUMBER, JUN, ZOD, GRD from junior.models import Junior, JuniorPoints +from .utils import real_time, convert_timedelta_into_datetime + # In this serializer file @@ -201,11 +204,27 @@ class TaskDetailsSerializer(serializers.ModelSerializer): """Task detail serializer""" junior = JuniorDetailSerializer() + remaining_time = serializers.SerializerMethodField('get_remaining_time') + + def get_remaining_time(self, obj): + """ remaining time to complete task""" + due_date_datetime = datetime.combine(obj.due_date, datetime.max.time()) + # fetch real time + current_datetime = real_time() + # Perform the subtraction + if due_date_datetime > current_datetime: + time_difference = due_date_datetime - current_datetime + time_only = convert_timedelta_into_datetime(time_difference) + return str(time_difference.days) + ' days ' + str(time_only) + return str(NUMBER['zero']) + ' days ' + '00:00:00:00000' + + 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'] + 'requested_on', 'rejected_on', 'completed_on', + 'junior', 'task_status', 'is_active', 'remaining_time', 'created_at','updated_at'] class TopJuniorSerializer(serializers.ModelSerializer): @@ -303,12 +322,14 @@ class ApproveTaskSerializer(serializers.ModelSerializer): instance.task_status = str(NUMBER['five']) instance.is_approved = True junior_data.total_task_points = junior_data.total_task_points + instance.points + instance.completed_on = datetime.today() junior_data.save() else: # reject the task instance.task_status = str(NUMBER['three']) instance.is_approved = False junior_data.total_task_points = junior_data.total_task_points - instance.points + instance.rejected_on = datetime.today() junior_data.save() instance.save() return instance diff --git a/guardian/utils.py b/guardian/utils.py index c3f9f39..8619b66 100644 --- a/guardian/utils.py +++ b/guardian/utils.py @@ -5,6 +5,12 @@ import oss2 from django.conf import settings """Import tempfile""" import tempfile +# Import date time module's function +from datetime import datetime, time +# Import real time client module +import ntplib +# import Number constant +from base.constants import NUMBER # Define upload image on # ali baba cloud @@ -13,6 +19,8 @@ import tempfile # then check bucket name # then upload on ali baba # bucket and reform the image url""" +# fetch real time data without depend on system time +# convert time delta into date time object def upload_image_to_alibaba(image, filename): """upload image on oss alibaba bucket""" @@ -30,3 +38,22 @@ def upload_image_to_alibaba(image, filename): new_filename = filename.replace(' ', '%20') return f"https://{settings.ALIYUN_OSS_BUCKET_NAME}.{settings.ALIYUN_OSS_ENDPOINT}/{new_filename}" +def real_time(): + # Fetch real time. + # time is not depend on system time + # Get the current datetime + ntp_client = ntplib.NTPClient() + ntp_server = 'pool.ntp.org' + response = ntp_client.request(ntp_server) + current_datetime = datetime.fromtimestamp(response.tx_time) + return current_datetime + +def convert_timedelta_into_datetime(time_difference): + # convert timedelta into datetime format + hours = time_difference.seconds // NUMBER['thirty_six_hundred'] + minutes = (time_difference.seconds // NUMBER['sixty']) % NUMBER['sixty'] + seconds = time_difference.seconds % NUMBER['sixty'] + microseconds = time_difference.microseconds + # Create a new time object with the extracted time components + time_only = time(hours, minutes, seconds, microseconds) + return time_only diff --git a/guardian/views.py b/guardian/views.py index 3450be7..ec14ef7 100644 --- a/guardian/views.py +++ b/guardian/views.py @@ -119,9 +119,16 @@ class TaskListAPIView(viewsets.ModelViewSet): def list(self, request, *args, **kwargs): """Create guardian profile""" status_value = self.request.GET.get('status') - if str(status_value) == '0': + search = self.request.GET.get('search') + if search and str(status_value) == '0': + queryset = JuniorTask.objects.filter(guardian__user=request.user, + task_name__icontains=search).order_by('due_date', 'created_at') + elif search and str(status_value) != '0': + queryset = JuniorTask.objects.filter(guardian__user=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': queryset = JuniorTask.objects.filter(guardian__user=request.user).order_by('due_date', 'created_at') - else: + elif search is None and str(status_value) != '0': queryset = JuniorTask.objects.filter(guardian__user=request.user, task_status=status_value).order_by('due_date','created_at') paginator = self.pagination_class() diff --git a/junior/migrations/0014_junior_is_password_set.py b/junior/migrations/0014_junior_is_password_set.py new file mode 100644 index 0000000..a71e6c0 --- /dev/null +++ b/junior/migrations/0014_junior_is_password_set.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.2 on 2023-07-18 09:28 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('junior', '0013_alter_junior_options_alter_juniorpoints_options'), + ] + + operations = [ + migrations.AddField( + model_name='junior', + name='is_password_set', + field=models.BooleanField(default=True), + ), + ] diff --git a/junior/models.py b/junior/models.py index 41dddc8..f4ef488 100644 --- a/junior/models.py +++ b/junior/models.py @@ -63,6 +63,8 @@ class Junior(models.Model): is_invited = models.BooleanField(default=False) # Profile activity""" is_active = models.BooleanField(default=True) + # check password is set or not + is_password_set = models.BooleanField(default=True) # junior profile is complete or not""" is_complete_profile = models.BooleanField(default=False) # passcode of the junior profile""" diff --git a/junior/serializers.py b/junior/serializers.py index 013cd58..ef1b5de 100644 --- a/junior/serializers.py +++ b/junior/serializers.py @@ -277,12 +277,13 @@ class AddJuniorSerializer(serializers.ModelSerializer): relationship=validated_data.get('relationship'), junior_code=generate_code(JUN, user_data.id), referral_code=generate_code(ZOD, user_data.id), - referral_code_used=guardian_data.referral_code) + referral_code_used=guardian_data.referral_code, + is_password_set=False, is_verified=True) """Generate otp""" otp_value = generate_otp() expiry_time = timezone.now() + timezone.timedelta(days=1) UserEmailOtp.objects.create(email=email, otp=otp_value, - user_type='1', expired_at=expiry_time) + user_type='1', expired_at=expiry_time, is_verified=True) """Send email to the register user""" send_otp_email(email, otp_value) """Notification email""" diff --git a/junior/views.py b/junior/views.py index 0e1de75..50e42be 100644 --- a/junior/views.py +++ b/junior/views.py @@ -197,9 +197,16 @@ class JuniorTaskListAPIView(viewsets.ModelViewSet): def list(self, request, *args, **kwargs): """Create guardian profile""" status_value = self.request.GET.get('status') - if str(status_value) == '0': + search = self.request.GET.get('search') + if search and str(status_value) == '0': + queryset = JuniorTask.objects.filter(junior__auth=request.user, + task_name__icontains=search).order_by('due_date', 'created_at') + elif search and str(status_value) != '0': + 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': queryset = JuniorTask.objects.filter(junior__auth=request.user).order_by('due_date', 'created_at') - else: + elif search is None and str(status_value) != '0': queryset = JuniorTask.objects.filter(junior__auth=request.user, task_status=status_value).order_by('due_date','created_at') paginator = self.pagination_class() diff --git a/zod_bank/settings.py b/zod_bank/settings.py index b107ffd..9961b80 100644 --- a/zod_bank/settings.py +++ b/zod_bank/settings.py @@ -104,11 +104,12 @@ REST_FRAMEWORK = { 'rest_framework.authentication.BasicAuthentication', 'rest_framework_simplejwt.authentication.JWTAuthentication',], 'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.PageNumberPagination', - 'PAGE_SIZE': 5, + 'PAGE_SIZE': 10, } # define jwt token SIMPLE_JWT = { - 'ACCESS_TOKEN_LIFETIME': timedelta(hours=2, minutes=59, seconds=59, microseconds=999999), + # 'ACCESS_TOKEN_LIFETIME': timedelta(hours=2, minutes=59, seconds=59, microseconds=999999), + 'ACCESS_TOKEN_LIFETIME': timedelta(minutes=5), 'REFRESH_TOKEN_LIFETIME': timedelta(hours=71, minutes=59, seconds=59, microseconds=999999), } # Database From 5cc43aa2b8e2a748d07692c8ea265c341f2e0a4e Mon Sep 17 00:00:00 2001 From: jain Date: Tue, 18 Jul 2023 15:59:26 +0530 Subject: [PATCH 21/38] jira-33 mark as complete the task --- junior/serializers.py | 16 +++++++++++++++- junior/urls.py | 6 ++++-- junior/views.py | 31 +++++++++++++++++++++++++++++-- 3 files changed, 48 insertions(+), 5 deletions(-) diff --git a/junior/serializers.py b/junior/serializers.py index ef1b5de..011cf97 100644 --- a/junior/serializers.py +++ b/junior/serializers.py @@ -3,7 +3,7 @@ from rest_framework import serializers from django.contrib.auth.models import User from django.db import transaction -import random +from datetime import datetime from django.utils import timezone from rest_framework_simplejwt.tokens import RefreshToken @@ -306,3 +306,17 @@ class RemoveJuniorSerializer(serializers.ModelSerializer): instance.save() return instance + +class CompleteTaskSerializer(serializers.ModelSerializer): + """User task Serializer""" + class Meta(object): + """Meta class""" + model = JuniorTask + fields = ('id', 'image') + def update(self, instance, validated_data): + instance.image = validated_data.get('image', instance.image) + instance.requested_on = datetime.today() + instance.task_status = str(NUMBER['four']) + instance.is_approved = False + instance.save() + return instance diff --git a/junior/urls.py b/junior/urls.py index 33d52e7..013b497 100644 --- a/junior/urls.py +++ b/junior/urls.py @@ -2,7 +2,8 @@ """Django import""" from django.urls import path, include from .views import (UpdateJuniorProfile, ValidateGuardianCode, JuniorListAPIView, AddJuniorAPIView, - InvitedJuniorAPIView, FilterJuniorAPIView, RemoveJuniorAPIView, JuniorTaskListAPIView) + InvitedJuniorAPIView, FilterJuniorAPIView, RemoveJuniorAPIView, JuniorTaskListAPIView, + CompleteJuniorTaskAPIView) """Third party import""" from rest_framework import routers @@ -36,5 +37,6 @@ router.register('junior-task-list', JuniorTaskListAPIView, basename='junior-task # Define url pattern""" urlpatterns = [ path('api/v1/', include(router.urls)), - path('api/v1/remove-junior/', RemoveJuniorAPIView.as_view()) + path('api/v1/remove-junior/', RemoveJuniorAPIView.as_view()), + path('api/v1/complete-task/', CompleteJuniorTaskAPIView.as_view()) ] diff --git a/junior/views.py b/junior/views.py index 50e42be..6e4c494 100644 --- a/junior/views.py +++ b/junior/views.py @@ -17,7 +17,7 @@ from rest_framework.pagination import PageNumberPagination # Import account's task from junior.models import Junior from .serializers import (CreateJuniorSerializer, JuniorDetailListSerializer, AddJuniorSerializer,\ - RemoveJuniorSerializer) + RemoveJuniorSerializer, CompleteTaskSerializer) from guardian.models import Guardian, JuniorTask from guardian.serializers import TaskDetailsSerializer from base.messages import ERROR_CODE, SUCCESS_CODE @@ -164,7 +164,7 @@ class FilterJuniorAPIView(viewsets.ModelViewSet): class RemoveJuniorAPIView(views.APIView): - """Eater Update API""" + """Remove junior API""" serializer_class = RemoveJuniorSerializer model = Junior permission_classes = [IsAuthenticated] @@ -215,3 +215,30 @@ class JuniorTaskListAPIView(viewsets.ModelViewSet): # use TaskDetailsSerializer serializer serializer = TaskDetailsSerializer(paginated_queryset, many=True) return custom_response(None, serializer.data, response_status=status.HTTP_200_OK) + + +class CompleteJuniorTaskAPIView(views.APIView): + """Update junior task API""" + serializer_class = CompleteTaskSerializer + model = JuniorTask + permission_classes = [IsAuthenticated] + + def put(self, request, format=None): + task_id = self.request.data.get('task_id') + image = request.data['image'] + if image and image.size == NUMBER['zero']: + return custom_error_response(ERROR_CODE['2035'], response_status=status.HTTP_400_BAD_REQUEST) + filename = f"images/{image.name}" + image_url = upload_image_to_alibaba(image, filename) + # fetch junior query + task_queryset = JuniorTask.objects.filter(id=task_id, junior__auth__email=self.request.user).last() + if task_queryset: + # use RemoveJuniorSerializer serializer + serializer = CompleteTaskSerializer(task_queryset, data={'image': image_url}, partial=True) + if serializer.is_valid(): + # save serializer + serializer.save() + 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: + return custom_error_response(ERROR_CODE['2034'], response_status=status.HTTP_400_BAD_REQUEST) From 3d84c0316318dff300b4a1641308b52c622c2cfc Mon Sep 17 00:00:00 2001 From: abutalib-kiwi Date: Tue, 18 Jul 2023 16:03:39 +0530 Subject: [PATCH 22/38] remove fcm token --- account/views.py | 6 ++++++ notifications/utils.py | 10 ++++++++++ web_admin/urls.py | 2 +- zod_bank/settings.py | 6 ++++-- 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/account/views.py b/account/views.py index 7bc9ab5..95b4694 100644 --- a/account/views.py +++ b/account/views.py @@ -1,4 +1,6 @@ """Account view """ +from notifications.utils import remove_fcm_token + """Django import""" from datetime import datetime, timedelta from rest_framework import viewsets, status, views @@ -531,6 +533,10 @@ class LogoutAPIView(views.APIView): permission_classes = (IsAuthenticated,) def post(self, request): + remove_fcm_token( + request.auth.payload['user_id'], + request.META['HTTP_AUTHORIZATION'].split(" ")[1], + request.data.get('registration_id', "")) logout(request) request.session.flush() return custom_response(SUCCESS_CODE['3020'], response_status=status.HTTP_200_OK) diff --git a/notifications/utils.py b/notifications/utils.py index b3a0ede..d68756c 100644 --- a/notifications/utils.py +++ b/notifications/utils.py @@ -15,3 +15,13 @@ def register_fcm_token(user_id, registration_id, device_id, device_type): 'registration_id': registration_id}) return device + +def remove_fcm_token(user_id: int, access_token: str, registration_id) -> None: + """ + remove access_token and registration_token + """ + try: + # remove fcm token for this device + FCMDevice.objects.filter(user_id=user_id).delete() + except Exception as e: + print(e) diff --git a/web_admin/urls.py b/web_admin/urls.py index fa272f4..95bc7d9 100644 --- a/web_admin/urls.py +++ b/web_admin/urls.py @@ -11,7 +11,7 @@ from web_admin.views import ArticleViewSet # initiate router router = routers.SimpleRouter() -router.register('articles', ArticleViewSet, basename='articles') +router.register('article', ArticleViewSet, basename='article') urlpatterns = [ path('api/v1/', include(router.urls)), diff --git a/zod_bank/settings.py b/zod_bank/settings.py index aea5896..091b908 100644 --- a/zod_bank/settings.py +++ b/zod_bank/settings.py @@ -33,6 +33,10 @@ 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') + +# cors allow setting +CORS_ORIGIN_ALLOW_ALL = True + # allow all host ALLOWED_HOSTS = ['*'] @@ -184,8 +188,6 @@ USE_TZ = True # cors header settings SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https') -# cors allow setting -CORS_ORIGIN_ALLOW_ALL = True # cors allow method CORS_ALLOW_METHODS = ( From 130dcd83e7da56885386929193545bf8ba08514e Mon Sep 17 00:00:00 2001 From: jain Date: Tue, 18 Jul 2023 16:56:24 +0530 Subject: [PATCH 23/38] sonar fixes --- account/serializers.py | 2 +- base/messages.py | 3 +++ guardian/serializers.py | 4 ++++ guardian/utils.py | 2 ++ guardian/views.py | 3 +++ requirements.txt | 2 ++ 6 files changed, 15 insertions(+), 1 deletion(-) diff --git a/account/serializers.py b/account/serializers.py index 5810f1d..d4b6179 100644 --- a/account/serializers.py +++ b/account/serializers.py @@ -41,7 +41,7 @@ from .utils import delete_user_account_condition_social, delete_user_account_con # email verification serializer, # phone otp serializer - +# create all serializer here class GoogleLoginSerializer(serializers.Serializer): """google login serializer""" access_token = serializers.CharField(max_length=5000, required=True) diff --git a/base/messages.py b/base/messages.py index a13c1d6..66585c6 100644 --- a/base/messages.py +++ b/base/messages.py @@ -50,6 +50,7 @@ ERROR_CODE = { # email not verified "2024": "Email not verified", "2025": "Invalid input. Expected a list of strings.", + # check old and new password "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", @@ -66,8 +67,10 @@ ERROR_CODE = { # log in multiple device msg "2037": "You are already log in another device", "2038": "Choose valid action for task", + # card length limit "2039": "Add at least one article card or maximum 6", "2040": "Add at least 5 article survey or maximum 10", + # add article msg "2041": "Article with given id doesn't exist.", "2042": "Article Card with given id doesn't exist.", "2043": "Article Survey with given id doesn't exist." diff --git a/guardian/serializers.py b/guardian/serializers.py index 9459334..9343f8f 100644 --- a/guardian/serializers.py +++ b/guardian/serializers.py @@ -321,14 +321,18 @@ class ApproveTaskSerializer(serializers.ModelSerializer): # approve the task instance.task_status = str(NUMBER['five']) instance.is_approved = True + # update total task point junior_data.total_task_points = junior_data.total_task_points + instance.points + # update complete time of task instance.completed_on = datetime.today() junior_data.save() else: # reject the task instance.task_status = str(NUMBER['three']) instance.is_approved = False + # update total task point junior_data.total_task_points = junior_data.total_task_points - instance.points + # update reject time of task instance.rejected_on = datetime.today() junior_data.save() instance.save() diff --git a/guardian/utils.py b/guardian/utils.py index 8619b66..f45caa8 100644 --- a/guardian/utils.py +++ b/guardian/utils.py @@ -39,6 +39,7 @@ def upload_image_to_alibaba(image, filename): return f"https://{settings.ALIYUN_OSS_BUCKET_NAME}.{settings.ALIYUN_OSS_ENDPOINT}/{new_filename}" def real_time(): + """ real time """ # Fetch real time. # time is not depend on system time # Get the current datetime @@ -49,6 +50,7 @@ def real_time(): return current_datetime def convert_timedelta_into_datetime(time_difference): + """convert date time""" # convert timedelta into datetime format hours = time_difference.seconds // NUMBER['thirty_six_hundred'] minutes = (time_difference.seconds // NUMBER['sixty']) % NUMBER['sixty'] diff --git a/guardian/views.py b/guardian/views.py index ec14ef7..7ef470e 100644 --- a/guardian/views.py +++ b/guardian/views.py @@ -19,6 +19,7 @@ from django.utils import timezone # Import account's serializer # Import account's task + from .serializers import (UserSerializer, CreateGuardianSerializer, TaskSerializer, TaskDetailsSerializer, TopJuniorSerializer, ApproveJuniorSerializer, ApproveTaskSerializer) from .models import Guardian, JuniorTask @@ -42,6 +43,7 @@ from .utils import upload_image_to_alibaba # approve junior API # approve task API # Create your views here. +# create approve task API class SignupViewset(viewsets.ModelViewSet): """Signup view set""" queryset = User.objects.all() @@ -197,6 +199,7 @@ class TopJuniorListAPIView(viewsets.ModelViewSet): queryset = JuniorPoints.objects.all() def get_serializer_context(self): + # context list context = super().get_serializer_context() context.update({'view': self}) return context diff --git a/requirements.txt b/requirements.txt index 5dd7f76..6e1a2ed 100644 --- a/requirements.txt +++ b/requirements.txt @@ -51,6 +51,8 @@ jmespath==0.10.0 kombu==5.3.1 MarkupSafe==2.1.3 msgpack==1.0.5 +ntplib==0.4.0 +numpy==1.25.1 oss2==2.18.0 packaging==23.1 phonenumbers==8.13.15 From 06d841f444e17964d1e3951bd97738246bf480d7 Mon Sep 17 00:00:00 2001 From: jain Date: Tue, 18 Jul 2023 17:32:34 +0530 Subject: [PATCH 24/38] email setting changes --- zod_bank/settings.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/zod_bank/settings.py b/zod_bank/settings.py index 8bbd82a..9ef0f6b 100644 --- a/zod_bank/settings.py +++ b/zod_bank/settings.py @@ -233,14 +233,14 @@ GOOGLE_CLIENT_ID = os.getenv('GOOGLE_CLIENT_ID') GOOGLE_CLIENT_SECRET = os.getenv('GOOGLE_CLIENT_SECRET') # email settings -EMAIL_BACKEND="django.core.mail.backends.smtp.EmailBackend" -EMAIL_HOST="smtp.sendgrid.net" -EMAIL_PORT="587" -EMAIL_USE_TLS="True" -EMAIL_HOST_USER="apikey" -EMAIL_HOST_PASSWORD="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" -EMAIL_FROM_ADDRESS="support@zodbank.com" -DEFAULT_ADDRESS="zodbank@yopmail.com" +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") +EMAIL_HOST_PASSWORD = os.getenv("EMAIL_HOST_PASSWORD") +EMAIL_FROM_ADDRESS = os.getenv("EMAIL_FROM_ADDRESS") +DEFAULT_ADDRESS = os.getenv("DEFAULT_ADDRESS") # ali baba cloud settings ALIYUN_OSS_ACCESS_KEY_ID = os.getenv('ALIYUN_OSS_ACCESS_KEY_ID') From 0df748ccbfc6ed3651bb95333d4976c11be5ec82 Mon Sep 17 00:00:00 2001 From: abutalib-kiwi Date: Tue, 18 Jul 2023 18:27:27 +0530 Subject: [PATCH 25/38] checking email settings --- zod_bank/settings.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/zod_bank/settings.py b/zod_bank/settings.py index 9ef0f6b..b4be9b4 100644 --- a/zod_bank/settings.py +++ b/zod_bank/settings.py @@ -242,6 +242,15 @@ EMAIL_HOST_PASSWORD = os.getenv("EMAIL_HOST_PASSWORD") EMAIL_FROM_ADDRESS = os.getenv("EMAIL_FROM_ADDRESS") DEFAULT_ADDRESS = os.getenv("DEFAULT_ADDRESS") +print(EMAIL_BACKEND, "EMAIL_BACKEND") +print(EMAIL_HOST, "EMAIL_HOST") +print(EMAIL_PORT, "EMAIL_PORT") +print(EMAIL_USE_TLS, "EMAIL_USE_TLS") +print(EMAIL_HOST_USER, "EMAIL_HOST_USER") +print(EMAIL_HOST_PASSWORD, "EMAIL_HOST_PASSWORD") +print(EMAIL_FROM_ADDRESS, "EMAIL_FROM_ADDRESS") +print(DEFAULT_ADDRESS, "DEFAULT_ADDRESS") + # ali baba cloud settings ALIYUN_OSS_ACCESS_KEY_ID = os.getenv('ALIYUN_OSS_ACCESS_KEY_ID') ALIYUN_OSS_ACCESS_KEY_SECRET = os.getenv('ALIYUN_OSS_ACCESS_KEY_SECRET') From 9b84d176af95058660925456c4d12472e81b664d Mon Sep 17 00:00:00 2001 From: jain Date: Tue, 18 Jul 2023 19:18:38 +0530 Subject: [PATCH 26/38] jira-34 points earned --- base/messages.py | 4 +++- guardian/views.py | 2 +- junior/serializers.py | 46 +++++++++++++++++++++++++++++++++++++++++++ junior/urls.py | 4 +++- junior/views.py | 34 +++++++++++++++++++++++++++++--- 5 files changed, 84 insertions(+), 6 deletions(-) diff --git a/base/messages.py b/base/messages.py index c5516e9..f04c2b8 100644 --- a/base/messages.py +++ b/base/messages.py @@ -73,7 +73,8 @@ ERROR_CODE = { # add article msg "2041": "Article with given id doesn't exist.", "2042": "Article Card with given id doesn't exist.", - "2043": "Article Survey with given id doesn't exist." + "2043": "Article Survey with given id doesn't exist.", + "2044": "Task does not exist" } """Success message code""" SUCCESS_CODE = { @@ -119,6 +120,7 @@ SUCCESS_CODE = { "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" } """status code error""" STATUS_CODE_ERROR = { diff --git a/guardian/views.py b/guardian/views.py index 7ef470e..b0e2c34 100644 --- a/guardian/views.py +++ b/guardian/views.py @@ -62,7 +62,7 @@ class SignupViewset(viewsets.ModelViewSet): user_type=str(request.data['user_type']), expired_at=expiry) """Send email to the register user""" send_otp_email(request.data['email'], otp) - return custom_response(SUCCESS_CODE['3001'], {"email_otp": otp}, + 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: diff --git a/junior/serializers.py b/junior/serializers.py index 011cf97..cd99999 100644 --- a/junior/serializers.py +++ b/junior/serializers.py @@ -320,3 +320,49 @@ class CompleteTaskSerializer(serializers.ModelSerializer): instance.is_approved = False instance.save() return instance + +class JuniorPointsSerializer(serializers.ModelSerializer): + """Junior points serializer""" + + total_points = serializers.SerializerMethodField('get_points') + in_progress_task = serializers.SerializerMethodField('get_in_progress_task') + completed_task = serializers.SerializerMethodField('get_completed_task') + 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_position(self, obj): + data = JuniorPoints.objects.filter(junior=obj.junior).last() + if data: + return data.position + return 99999 + def get_points(self, obj): + """total points""" + points = JuniorPoints.objects.filter(junior=obj.junior).last() + if points: + return points.total_task_points + + def get_in_progress_task(self, obj): + return JuniorTask.objects.filter(junior=obj.junior, task_status=IN_PROGRESS).count() + + def get_completed_task(self, obj): + return JuniorTask.objects.filter(junior=obj.junior, task_status=COMPLETED).count() + + + def get_requested_task(self, obj): + return JuniorTask.objects.filter(junior=obj.junior, task_status=REQUESTED).count() + + + def get_rejected_task(self, obj): + return JuniorTask.objects.filter(junior=obj.junior, task_status=REJECTED).count() + + + def get_pending_task(self, obj): + return JuniorTask.objects.filter(junior=obj.junior, task_status=PENDING).count() + + class Meta(object): + """Meta info""" + model = Junior + fields = ['id', 'total_points', 'position', 'pending_task', 'in_progress_task', 'completed_task', + 'requested_task', 'rejected_task'] diff --git a/junior/urls.py b/junior/urls.py index 013b497..6057c05 100644 --- a/junior/urls.py +++ b/junior/urls.py @@ -3,7 +3,7 @@ from django.urls import path, include from .views import (UpdateJuniorProfile, ValidateGuardianCode, JuniorListAPIView, AddJuniorAPIView, InvitedJuniorAPIView, FilterJuniorAPIView, RemoveJuniorAPIView, JuniorTaskListAPIView, - CompleteJuniorTaskAPIView) + CompleteJuniorTaskAPIView, JuniorPointsListAPIView) """Third party import""" from rest_framework import routers @@ -34,6 +34,8 @@ router.register('invited-junior', InvitedJuniorAPIView, basename='invited-junior router.register('filter-junior', FilterJuniorAPIView, basename='filter-junior') # junior's task list API""" router.register('junior-task-list', JuniorTaskListAPIView, basename='junior-task-list') +# junior's task list API""" +router.register('junior-points', JuniorPointsListAPIView, basename='junior-points') # Define url pattern""" urlpatterns = [ path('api/v1/', include(router.urls)), diff --git a/junior/views.py b/junior/views.py index 6e4c494..8160107 100644 --- a/junior/views.py +++ b/junior/views.py @@ -1,7 +1,10 @@ """Junior view file""" +import os + from rest_framework import viewsets, status, generics,views from rest_framework.permissions import IsAuthenticated from rest_framework.pagination import PageNumberPagination +import requests """Django app import""" # Import guardian's model, @@ -17,7 +20,7 @@ from rest_framework.pagination import PageNumberPagination # Import account's task from junior.models import Junior from .serializers import (CreateJuniorSerializer, JuniorDetailListSerializer, AddJuniorSerializer,\ - RemoveJuniorSerializer, CompleteTaskSerializer) + RemoveJuniorSerializer, CompleteTaskSerializer, JuniorPointsSerializer) from guardian.models import Guardian, JuniorTask from guardian.serializers import TaskDetailsSerializer from base.messages import ERROR_CODE, SUCCESS_CODE @@ -90,6 +93,11 @@ class JuniorListAPIView(viewsets.ModelViewSet): def list(self, request, *args, **kwargs): """ junior list""" + auth_token = self.request.META['HTTP_AUTHORIZATION'] + headers_token = { + 'Authorization': auth_token + } + requests.get(os.getenv('BASE_URL') + '/api/v1/top-junior/', headers=headers_token) guardian_data = Guardian.objects.filter(user__email=request.user).last() queryset = Junior.objects.filter(guardian_code__icontains=str(guardian_data.guardian_code)) # use JuniorDetailListSerializer serializer @@ -238,7 +246,27 @@ class CompleteJuniorTaskAPIView(views.APIView): if serializer.is_valid(): # save serializer serializer.save() - return custom_response(SUCCESS_CODE['3022'], serializer.data, response_status=status.HTTP_200_OK) + return custom_response(SUCCESS_CODE['3032'], serializer.data, 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['2034'], response_status=status.HTTP_400_BAD_REQUEST) + return custom_error_response(ERROR_CODE['2044'], response_status=status.HTTP_400_BAD_REQUEST) + + +class JuniorPointsListAPIView(viewsets.ModelViewSet): + """Junior Points viewset""" + serializer_class = JuniorPointsSerializer + permission_classes = [IsAuthenticated] + + def get_queryset(self): + """get queryset""" + return JuniorTask.objects.filter(junior__auth__email=self.request.user).last() + def list(self, request, *args, **kwargs): + """profile view""" + queryset = self.get_queryset() + token = self.request.META['HTTP_AUTHORIZATION'] + headers = { + 'Authorization': token + } + requests.get(os.getenv('BASE_URL') + '/api/v1/top-junior/', headers=headers) + serializer = JuniorPointsSerializer(queryset) + return custom_response(None, serializer.data, response_status=status.HTTP_200_OK) From 49fc8d9dcab4bf76ef0267937141891c788d493b Mon Sep 17 00:00:00 2001 From: abutalib-kiwi Date: Tue, 18 Jul 2023 19:37:30 +0530 Subject: [PATCH 27/38] checking email settings --- zod_bank/settings.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/zod_bank/settings.py b/zod_bank/settings.py index b4be9b4..5917e92 100644 --- a/zod_bank/settings.py +++ b/zod_bank/settings.py @@ -233,13 +233,13 @@ GOOGLE_CLIENT_ID = os.getenv('GOOGLE_CLIENT_ID') GOOGLE_CLIENT_SECRET = os.getenv('GOOGLE_CLIENT_SECRET') # email settings -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") -EMAIL_HOST_PASSWORD = os.getenv("EMAIL_HOST_PASSWORD") -EMAIL_FROM_ADDRESS = os.getenv("EMAIL_FROM_ADDRESS") +EMAIL_BACKEND = os.getenv("MAIL_BACKEND") +EMAIL_HOST = os.getenv("MAIL_HOST") +EMAIL_PORT = os.getenv("MAIL_PORT") +EMAIL_USE_TLS = os.getenv("MAIL_USE_TLS") +EMAIL_HOST_USER = os.getenv("MAIL_HOST_USER") +EMAIL_HOST_PASSWORD = os.getenv("MAIL_HOST_PASSWORD") +EMAIL_FROM_ADDRESS = os.getenv("MAIL_FROM_ADDRESS") DEFAULT_ADDRESS = os.getenv("DEFAULT_ADDRESS") print(EMAIL_BACKEND, "EMAIL_BACKEND") From 74fc656bd16adf4588e0680c757a6ccce27ce616 Mon Sep 17 00:00:00 2001 From: abutalib-kiwi Date: Wed, 19 Jul 2023 13:11:36 +0530 Subject: [PATCH 28/38] checking email settings --- zod_bank/settings.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/zod_bank/settings.py b/zod_bank/settings.py index 5917e92..bc12176 100644 --- a/zod_bank/settings.py +++ b/zod_bank/settings.py @@ -64,6 +64,7 @@ INSTALLED_APPS = [ 'account', 'junior', 'guardian', + 'notifications', 'web_admin', # 'social_django' ] @@ -242,14 +243,6 @@ EMAIL_HOST_PASSWORD = os.getenv("MAIL_HOST_PASSWORD") EMAIL_FROM_ADDRESS = os.getenv("MAIL_FROM_ADDRESS") DEFAULT_ADDRESS = os.getenv("DEFAULT_ADDRESS") -print(EMAIL_BACKEND, "EMAIL_BACKEND") -print(EMAIL_HOST, "EMAIL_HOST") -print(EMAIL_PORT, "EMAIL_PORT") -print(EMAIL_USE_TLS, "EMAIL_USE_TLS") -print(EMAIL_HOST_USER, "EMAIL_HOST_USER") -print(EMAIL_HOST_PASSWORD, "EMAIL_HOST_PASSWORD") -print(EMAIL_FROM_ADDRESS, "EMAIL_FROM_ADDRESS") -print(DEFAULT_ADDRESS, "DEFAULT_ADDRESS") # ali baba cloud settings ALIYUN_OSS_ACCESS_KEY_ID = os.getenv('ALIYUN_OSS_ACCESS_KEY_ID') From 5429140a5c34314876938ab58f37d036e5d7748f Mon Sep 17 00:00:00 2001 From: abutalib-kiwi Date: Wed, 19 Jul 2023 14:58:14 +0530 Subject: [PATCH 29/38] cors error settings --- zod_bank/settings.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/zod_bank/settings.py b/zod_bank/settings.py index bc12176..1f2fdc6 100644 --- a/zod_bank/settings.py +++ b/zod_bank/settings.py @@ -13,6 +13,8 @@ https://docs.djangoproject.com/en/3.0/ref/settings/ import os from dotenv import load_dotenv from datetime import timedelta +from firebase_admin import initialize_app + load_dotenv() # OR, the same with increased verbosity: load_dotenv(verbose=True) @@ -71,6 +73,7 @@ INSTALLED_APPS = [ # define middle ware here MIDDLEWARE = [ # Add your middleware classes here. + 'corsheaders.middleware.CorsMiddleware', 'django.middleware.security.SecurityMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', 'django.middleware.common.CommonMiddleware', @@ -217,6 +220,9 @@ CORS_EXPOSE_HEADERS = ( 'Access-Control-Allow-Origin: *', ) +# Firebase settings +FIREBASE_APP = initialize_app() + # fcm django settings FCM_DJANGO_SETTINGS = { "APP_VERBOSE_NAME": "ZOD_Bank", From 86e2c75afcf4a3cdc38190a1c7e84ea4eab27317 Mon Sep 17 00:00:00 2001 From: jain Date: Wed, 19 Jul 2023 15:01:18 +0530 Subject: [PATCH 30/38] jira-34 allocated points --- account/views.py | 4 ++-- guardian/serializers.py | 7 +++---- junior/serializers.py | 11 ++++++++--- junior/views.py | 40 +++++++++++++++++++++------------------- zod_bank/settings.py | 3 +-- 5 files changed, 35 insertions(+), 30 deletions(-) diff --git a/account/views.py b/account/views.py index 95b4694..10a538f 100644 --- a/account/views.py +++ b/account/views.py @@ -433,11 +433,11 @@ class ProfileAPIViewSet(viewsets.ModelViewSet): return custom_response(None, serializer.data, response_status=status.HTTP_200_OK) class UploadImageAPIViewSet(viewsets.ModelViewSet): - """Profile viewset""" + """upload task image""" queryset = DefaultTaskImages.objects.all() serializer_class = DefaultTaskImagesSerializer def create(self, request, *args, **kwargs): - """profile view""" + """upload images""" image_data = request.data['image_url'] filename = f"default_task_images/{image_data.name}" if image_data.size == NUMBER['zero']: diff --git a/guardian/serializers.py b/guardian/serializers.py index 9343f8f..ff9edaf 100644 --- a/guardian/serializers.py +++ b/guardian/serializers.py @@ -324,8 +324,7 @@ class ApproveTaskSerializer(serializers.ModelSerializer): # update total task point junior_data.total_task_points = junior_data.total_task_points + instance.points # update complete time of task - instance.completed_on = datetime.today() - junior_data.save() + instance.completed_on = real_time() else: # reject the task instance.task_status = str(NUMBER['three']) @@ -333,8 +332,8 @@ class ApproveTaskSerializer(serializers.ModelSerializer): # update total task point junior_data.total_task_points = junior_data.total_task_points - instance.points # update reject time of task - instance.rejected_on = datetime.today() - junior_data.save() + instance.rejected_on = real_time() instance.save() + junior_data.save() return instance diff --git a/junior/serializers.py b/junior/serializers.py index cd99999..cd12a2e 100644 --- a/junior/serializers.py +++ b/junior/serializers.py @@ -16,6 +16,7 @@ from base.constants import PENDING, IN_PROGRESS, REJECTED, REQUESTED, COMPLETED, from guardian.models import Guardian, JuniorTask from account.models import UserEmailOtp from junior.utils import junior_notification_email, junior_approval_mail +from guardian.utils import real_time class ListCharField(serializers.ListField): @@ -315,7 +316,7 @@ class CompleteTaskSerializer(serializers.ModelSerializer): fields = ('id', 'image') def update(self, instance, validated_data): instance.image = validated_data.get('image', instance.image) - instance.requested_on = datetime.today() + instance.requested_on = real_time() instance.task_status = str(NUMBER['four']) instance.is_approved = False instance.save() @@ -323,7 +324,7 @@ class CompleteTaskSerializer(serializers.ModelSerializer): class JuniorPointsSerializer(serializers.ModelSerializer): """Junior points serializer""" - + junior_id = serializers.SerializerMethodField('get_junior_id') total_points = serializers.SerializerMethodField('get_points') in_progress_task = serializers.SerializerMethodField('get_in_progress_task') completed_task = serializers.SerializerMethodField('get_completed_task') @@ -332,6 +333,10 @@ class JuniorPointsSerializer(serializers.ModelSerializer): pending_task = serializers.SerializerMethodField('get_pending_task') position = serializers.SerializerMethodField('get_position') + def get_junior_id(self, obj): + """junior id""" + return obj.junior.id + def get_position(self, obj): data = JuniorPoints.objects.filter(junior=obj.junior).last() if data: @@ -364,5 +369,5 @@ class JuniorPointsSerializer(serializers.ModelSerializer): class Meta(object): """Meta info""" model = Junior - fields = ['id', 'total_points', 'position', 'pending_task', 'in_progress_task', 'completed_task', + fields = ['junior_id', 'total_points', 'position', 'pending_task', 'in_progress_task', 'completed_task', 'requested_task', 'rejected_task'] diff --git a/junior/views.py b/junior/views.py index 8160107..e1064af 100644 --- a/junior/views.py +++ b/junior/views.py @@ -232,25 +232,27 @@ class CompleteJuniorTaskAPIView(views.APIView): permission_classes = [IsAuthenticated] def put(self, request, format=None): - task_id = self.request.data.get('task_id') - image = request.data['image'] - if image and image.size == NUMBER['zero']: - return custom_error_response(ERROR_CODE['2035'], response_status=status.HTTP_400_BAD_REQUEST) - filename = f"images/{image.name}" - image_url = upload_image_to_alibaba(image, filename) - # fetch junior query - task_queryset = JuniorTask.objects.filter(id=task_id, junior__auth__email=self.request.user).last() - if task_queryset: - # use RemoveJuniorSerializer serializer - serializer = CompleteTaskSerializer(task_queryset, data={'image': image_url}, partial=True) - if serializer.is_valid(): - # save serializer - serializer.save() - return custom_response(SUCCESS_CODE['3032'], serializer.data, 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['2044'], response_status=status.HTTP_400_BAD_REQUEST) - + try: + task_id = self.request.data.get('task_id') + image = request.data['image'] + if image and image.size == NUMBER['zero']: + return custom_error_response(ERROR_CODE['2035'], response_status=status.HTTP_400_BAD_REQUEST) + filename = f"images/{image.name}" + image_url = upload_image_to_alibaba(image, filename) + # fetch junior query + task_queryset = JuniorTask.objects.filter(id=task_id, junior__auth__email=self.request.user).last() + if task_queryset: + # use RemoveJuniorSerializer serializer + serializer = CompleteTaskSerializer(task_queryset, data={'image': image_url}, partial=True) + if serializer.is_valid(): + # save serializer + serializer.save() + return custom_response(SUCCESS_CODE['3032'], serializer.data, 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['2044'], 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 JuniorPointsListAPIView(viewsets.ModelViewSet): """Junior Points viewset""" diff --git a/zod_bank/settings.py b/zod_bank/settings.py index 5917e92..1de920f 100644 --- a/zod_bank/settings.py +++ b/zod_bank/settings.py @@ -113,8 +113,7 @@ REST_FRAMEWORK = { } # define jwt token SIMPLE_JWT = { - # 'ACCESS_TOKEN_LIFETIME': timedelta(hours=2, minutes=59, seconds=59, microseconds=999999), - 'ACCESS_TOKEN_LIFETIME': timedelta(minutes=5), + 'ACCESS_TOKEN_LIFETIME': timedelta(hours=2, minutes=59, seconds=59, microseconds=999999), 'REFRESH_TOKEN_LIFETIME': timedelta(hours=71, minutes=59, seconds=59, microseconds=999999), } # Database From 3223a2b05069e2465c82f1f1a301eb20c7160fc9 Mon Sep 17 00:00:00 2001 From: abutalib-kiwi Date: Wed, 19 Jul 2023 16:24:53 +0530 Subject: [PATCH 31/38] notification set up and celery configuration --- docker-compose.yml | 19 ++++++++++ guardian/views.py | 8 +++-- notifications/admin.py | 8 ++++- notifications/constants.py | 16 +++++++++ notifications/migrations/0001_initial.py | 30 ++++++++++++++++ notifications/models.py | 20 ++++++++++- notifications/utils.py | 45 ++++++++++++++++++++++++ notifications/views.py | 12 +++++++ zod-bank-fcm-credentials.json | 13 +++++++ zod_bank/celery.py | 34 ++++++++++++++++++ 10 files changed, 200 insertions(+), 5 deletions(-) create mode 100644 notifications/constants.py create mode 100644 notifications/migrations/0001_initial.py create mode 100644 zod-bank-fcm-credentials.json create mode 100644 zod_bank/celery.py diff --git a/docker-compose.yml b/docker-compose.yml index 700bf1b..b9bc35b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,3 +16,22 @@ services: 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: rabbitmq + volumes: + - .:/usr/src/app + ports: + - 5673:5673 + + worker: + build: . + image: celery + container_name: dev_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 diff --git a/guardian/views.py b/guardian/views.py index b0e2c34..2776d38 100644 --- a/guardian/views.py +++ b/guardian/views.py @@ -1,11 +1,11 @@ """Views of Guardian""" -"""Third party Django app""" + +# django imports 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 django.utils import timezone -"""Import Django app""" # Import guardian's model, # Import junior's model, @@ -19,7 +19,6 @@ from django.utils import timezone # Import account's serializer # Import account's task - from .serializers import (UserSerializer, CreateGuardianSerializer, TaskSerializer, TaskDetailsSerializer, TopJuniorSerializer, ApproveJuniorSerializer, ApproveTaskSerializer) from .models import Guardian, JuniorTask @@ -31,6 +30,8 @@ from account.utils import custom_response, custom_error_response from base.messages import ERROR_CODE, SUCCESS_CODE from base.constants import NUMBER from .utils import upload_image_to_alibaba +from notifications.constants import REGISTRATION +from notifications.utils import send_notification """ Define APIs """ # Define Signup API, @@ -62,6 +63,7 @@ class SignupViewset(viewsets.ModelViewSet): user_type=str(request.data['user_type']), expired_at=expiry) """Send email to the register user""" send_otp_email(request.data['email'], otp) + send_notification(REGISTRATION, None, request.auth.payload['user_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) diff --git a/notifications/admin.py b/notifications/admin.py index 7bd27a7..382e97b 100644 --- a/notifications/admin.py +++ b/notifications/admin.py @@ -3,4 +3,10 @@ notification admin file """ from django.contrib import admin -# Register your models here. +from notifications.models import Notification + + +@admin.register(Notification) +class NotificationAdmin(admin.ModelAdmin): + """Notification Admin""" + list_display = ['id', 'notification_type', 'notification_to', 'data', 'is_read'] diff --git a/notifications/constants.py b/notifications/constants.py new file mode 100644 index 0000000..b72ed61 --- /dev/null +++ b/notifications/constants.py @@ -0,0 +1,16 @@ +""" +notification constants file +""" +REGISTRATION = 1 +TEST_NOTIFICATION = 99 + +NOTIFICATION_DICT = { + REGISTRATION: { + "title": "Successfully registered!", + "body": "You have registered successfully. Now login and complete your profile." + }, + TEST_NOTIFICATION: { + "title": "Test Notification", + "body": "This notification is for testing purpose" + } +} diff --git a/notifications/migrations/0001_initial.py b/notifications/migrations/0001_initial.py new file mode 100644 index 0000000..ea73b4a --- /dev/null +++ b/notifications/migrations/0001_initial.py @@ -0,0 +1,30 @@ +# Generated by Django 4.2.2 on 2023-07-19 07:40 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion +import django.utils.timezone + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.CreateModel( + name='Notification', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('notification_type', models.CharField(blank=True, max_length=50, null=True)), + ('data', models.JSONField(blank=True, default=dict, null=True)), + ('is_read', models.BooleanField(default=False)), + ('created_at', models.DateTimeField(default=django.utils.timezone.now)), + ('notification_from', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='from_notification', to=settings.AUTH_USER_MODEL)), + ('notification_to', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='to_notification', to=settings.AUTH_USER_MODEL)), + ], + ), + ] diff --git a/notifications/models.py b/notifications/models.py index 90a6f02..5d6d02c 100644 --- a/notifications/models.py +++ b/notifications/models.py @@ -1,6 +1,24 @@ """ notification models file """ +# django imports from django.db import models +from django.contrib.auth import get_user_model +from django.utils import timezone -# Create your models here. +USER = get_user_model() + + +class Notification(models.Model): + """ used to save the notifications """ + notification_type = models.CharField(max_length=50, blank=True, null=True) + notification_to = models.ForeignKey(USER, related_name='to_notification', on_delete=models.CASCADE) + notification_from = models.ForeignKey(USER, related_name='from_notification', on_delete=models.SET_NULL, + blank=True, null=True) + data = models.JSONField(default=dict, blank=True, null=True) + is_read = models.BooleanField(default=False) + created_at = models.DateTimeField(default=timezone.now) + + def __str__(self): + """ string representation """ + return f"{self.notification_to.id} | {self.notification_to.email}" diff --git a/notifications/utils.py b/notifications/utils.py index d68756c..893947a 100644 --- a/notifications/utils.py +++ b/notifications/utils.py @@ -1,12 +1,25 @@ """ notifications utils file """ +import constant as constant # third party imports from fcm_django.models import FCMDevice +from celery import shared_task +from firebase_admin.messaging import Message, Notification as FirebaseNotification + +# django imports +from django.contrib.auth import get_user_model + +from account.models import UserNotification +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, @@ -25,3 +38,35 @@ def remove_fcm_token(user_id: int, access_token: str, registration_id) -> None: FCMDevice.objects.filter(user_id=user_id).delete() except Exception as e: print(e) + + +def get_basic_detail(notification_type, from_user_id, to_user_id): + """ used to get the basic details """ + notification_data = NOTIFICATION_DICT[notification_type] + from_user = User.objects.get(id=from_user_id) if from_user_id else None + to_user = User.objects.get(id=to_user_id) + return notification_data, from_user, to_user + + +@shared_task() +def send_notification(notification_type, from_user_id, to_user_id, extra_data): + """ used to send the push for the given notification type """ + (notification_data, from_user, to_user) = get_basic_detail(notification_type, from_user_id, to_user_id) + print(notification_data, to_user) + user_notification_type = UserNotification.objects.filter(user=to_user).first() + # data = notification_data.data + data = notification_data + Notification.objects.create(notification_type=notification_type, notification_from=from_user, + notification_to=to_user, data=data) + if user_notification_type.push_notification: + data.update({'badge': Notification.objects.filter(notification_to=to_user, is_read=False).count()}) + send_push(to_user, data) + + +def send_push(user, data): + """ used to send push notification to specific user """ + # if user.push_notification: + notification_data = data.pop('data', None) + user.fcmdevice_set.filter(active=True).send_message( + Message(notification=FirebaseNotification(data['title'], data['body']), data=notification_data) + ) diff --git a/notifications/views.py b/notifications/views.py index 8ac3786..d9e5fd7 100644 --- a/notifications/views.py +++ b/notifications/views.py @@ -8,9 +8,12 @@ from rest_framework.decorators import action from rest_framework.permissions import IsAuthenticated from rest_framework.response import Response +# local imports from account.utils import custom_response from base.messages import SUCCESS_CODE +from notifications.constants import TEST_NOTIFICATION from notifications.serializers import RegisterDevice +from notifications.utils import send_notification class NotificationViewSet(viewsets.GenericViewSet): @@ -28,3 +31,12 @@ class NotificationViewSet(viewsets.GenericViewSet): serializer.is_valid(raise_exception=True) serializer.save() return custom_response(SUCCESS_CODE["3000"]) + + @action(methods=['get'], detail=False, url_path='test', url_name='test', serializer_class=None) + def send_test_notification(self, request): + """ + to send test notification + :return: + """ + send_notification.delay(TEST_NOTIFICATION, None, request.auth.payload['user_id'], {}) + return custom_response(SUCCESS_CODE["3000"]) diff --git a/zod-bank-fcm-credentials.json b/zod-bank-fcm-credentials.json new file mode 100644 index 0000000..75b13ab --- /dev/null +++ b/zod-bank-fcm-credentials.json @@ -0,0 +1,13 @@ +{ + "type": "service_account", + "project_id": "zod-bank-ebb2a", + "private_key_id": "f1115f1b1fece77ba7a119b70e2502ce0777a7d4", + "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCvLWEobyVN7D4+\nSZ4NwcugwuVk9MV7CjhQGB8lqzf/1Z0plBytjpjM75+orFk5n2tnOgTxsWCqR1R7\nLry4x2QH3HgJebd/TZTIyfepcAeuzUVhq9prgWVRsvxjpihMPZufA/Q1GEX5TBwX\nEasBW91Qwas2NBhUrzotnUBxOshVB4zCo3Ls9dbAN9O2O6paUMvcofSsRZ9XkB6P\nFFKy6nbQ3Bo+Lw3ntUfG1JQgkkxto2Vudiiq6J2dE6Eih2acEhEezQoJVpkMK+si\nlGp88T3j8nTx3o6ol99ke+3ZejPVE5sUbuhokSV/tS1Goy3whP+ys9lQtIyt3/mJ\nlmkoB9ShAgMBAAECggEAAk3H0GFF08C3EBWyDqH5dbLXbtH92e/UeNAMNcV4mGbY\n5GKGFywmEVmg2N22EPqa/s+Y6QxxrD9u9G1+EhbnIIx7olOBkScJ9C0c9CWztCon\ntPaofd1E1cI7I7UfVTg2ZLAHrBN4H70eadYc4va8bBtHj0EHYONz7S8sEBQ1Qna2\nIQuCEWY6MzhwCNEFIJd8ikd0GnkAJCuInK3F+2c37kugdgjRKxkTIfWmhNIfyWn3\ngoui5wltuuDKETVj9VUMyN6P7kffIJzS4mMRm/9F92scpPRbK+X1TrHpFsO826oP\nUuSBi5oOZYNyAvMBXGdnemoUNtAE+xg4kqwYJu5T0QKBgQDlbO08yH5MSLUxXZfL\nkCYg1mCUC4ySpL/qVFNuyvY+ex9gIg6gj4vEpK8s1lt0yvxrTng/MXxMMg7o9dO8\nmSlv/665twk/7NfkexJPWs1ph+54tud3Sa0TiVw6U5ObPMr1EYc7RnoELDR9Exc1\nUDJB+T3f3SGJicZn4pALyx132wKBgQDDd9lhqWLXJeG7JkInhLywuSVmnk077hY8\nxAfHqlO+/EEkM/YBtUvtC4KNiSkVftQwSM80NRiHlPvlWZ0G8l9RAfM/xxL/XUq6\nOu1fW1uJuukJgXFePV9SQLzfgd1fk1f/dKuiPSNhCzgTD7dFks0Ip6FD6/PCdN7x\neqRUqDccMwKBgQCTk1mW+7CiCTLkKjv2KScdgEhncnZd7bO1W8C/R7bVwgUQpVeb\nWDqjpvs3cDssCVYNAFDA9Wfq61hD6bzlV/AbpvARbfd5MzQ8OB4zBUmUVGfFJoIF\nbVLzeivlKNWNybETqs6+Bjt+a6Dnw1vuY0OwxE5Urb1g50rEkCvwKhsueQKBgQDB\nUt3rG46oX80cPkCbuUquNs/o6JRWu6m+u9s9/RYLBI6g8ctT8S2A6ytaNNgvbFsM\nzlYwunriTdW9Bp6p6jmfcyBUad4+NtTbz8BJ2Z91Xylwv1eS73xBa8nh/R0nlCEq\nhQfj1DgTmPcC0z5eT0z+TFzRQqK6JsEBcFzrZdvrxQKBgQDGEtWElG5XoDwnwO5e\nmfFLRKHfG+Xa6FChl2eeDIGOxv/Y6SMwT68t0gtnDFQGtcIMvC+kC/1Rv1v8yrOD\nCzEToh91Fw1c1eayNnsLq07qYnVWoMa7xFFSDhtBAnepqlU+81qaDvp+yILTIYSP\nwUuk3NpdJs2LkMetm5zJC9PJ2w==\n-----END PRIVATE KEY-----\n", + "client_email": "firebase-adminsdk-umcph@zod-bank-ebb2a.iam.gserviceaccount.com", + "client_id": "102629742363778142120", + "auth_uri": "https://accounts.google.com/o/oauth2/auth", + "token_uri": "https://oauth2.googleapis.com/token", + "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs", + "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/firebase-adminsdk-umcph%40zod-bank-ebb2a.iam.gserviceaccount.com", + "universe_domain": "googleapis.com" +} diff --git a/zod_bank/celery.py b/zod_bank/celery.py new file mode 100644 index 0000000..177c318 --- /dev/null +++ b/zod_bank/celery.py @@ -0,0 +1,34 @@ +""" +Celery Basic configuration +""" + +# python imports +import os + +# third party imports +from celery import Celery +from dotenv import load_dotenv +from celery.schedules import crontab + +# OR, the same with increased verbosity: +load_dotenv(verbose=True) + +env_path = os.path.join(os.path.abspath(os.path.join('.env', os.pardir)), '.env') + +load_dotenv(dotenv_path=env_path) + +os.environ.setdefault('DJANGO_SETTINGS_MODULE', os.getenv('SETTINGS')) + +# celery app +app = Celery() + +app.config_from_object('django.conf:settings') + +# Load task modules from all registered Django apps. +app.autodiscover_tasks() + + +@app.task(bind=True) +def debug_task(self): + """ celery debug task """ + print(f'Request: {self.request!r}') From 9f9926da14b9230077c9df0216563f123e09cf77 Mon Sep 17 00:00:00 2001 From: jain Date: Wed, 19 Jul 2023 17:45:20 +0530 Subject: [PATCH 32/38] jira-34 referral code validation API --- base/messages.py | 5 ++-- guardian/serializers.py | 12 +++++---- guardian/utils.py | 18 +++++++++++++ guardian/views.py | 4 +-- junior/admin.py | 2 +- ...l_task_points_juniorpoints_total_points.py | 18 +++++++++++++ .../0016_juniorpoints_referral_points.py | 18 +++++++++++++ junior/models.py | 6 +++-- junior/serializers.py | 8 +++--- junior/urls.py | 4 ++- junior/views.py | 27 +++++++++++++++++++ 11 files changed, 106 insertions(+), 16 deletions(-) create mode 100644 junior/migrations/0015_rename_total_task_points_juniorpoints_total_points.py create mode 100644 junior/migrations/0016_juniorpoints_referral_points.py diff --git a/base/messages.py b/base/messages.py index f04c2b8..998a5b2 100644 --- a/base/messages.py +++ b/base/messages.py @@ -42,7 +42,7 @@ ERROR_CODE = { "2016": "Invalid search.", "2017": "{model} object with {pk} does not exist", "2018": "Attached File not found", - "2019": "Either File extension or File size doesn't meet the requirements", + "2019": "Invalid Referral code", "2020": "Enter valid mobile number", "2021": "Already register", "2022": "Invalid Guardian code", @@ -120,7 +120,8 @@ SUCCESS_CODE = { "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", } """status code error""" STATUS_CODE_ERROR = { diff --git a/guardian/serializers.py b/guardian/serializers.py index ff9edaf..a5ad978 100644 --- a/guardian/serializers.py +++ b/guardian/serializers.py @@ -24,7 +24,7 @@ from junior.serializers import JuniorDetailSerializer from base.messages import ERROR_CODE, SUCCESS_CODE from base.constants import NUMBER, JUN, ZOD, GRD from junior.models import Junior, JuniorPoints -from .utils import real_time, convert_timedelta_into_datetime +from .utils import real_time, convert_timedelta_into_datetime, update_referral_points @@ -141,7 +141,6 @@ class CreateGuardianSerializer(serializers.ModelSerializer): guardian.country_code = validated_data.get('country_code', guardian.country_code) 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.gender, guardian.country_name, @@ -150,6 +149,9 @@ class CreateGuardianSerializer(serializers.ModelSerializer): guardian.is_complete_profile = False if complete_profile_field: guardian.is_complete_profile = True + referral_code_used = validated_data.get('referral_code_used') + update_referral_points(guardian.referral_code, referral_code_used) + guardian.referral_code_used = validated_data.get('referral_code_used', guardian.referral_code_used) guardian.save() return guardian @@ -235,7 +237,7 @@ class TopJuniorSerializer(serializers.ModelSerializer): class Meta(object): """Meta info""" model = JuniorPoints - fields = ['id', 'junior', 'total_task_points', 'position', 'created_at', 'updated_at'] + fields = ['id', 'junior', 'total_points', 'position', 'created_at', 'updated_at'] def to_representation(self, instance): """Convert instance to representation""" @@ -322,7 +324,7 @@ class ApproveTaskSerializer(serializers.ModelSerializer): instance.task_status = str(NUMBER['five']) instance.is_approved = True # update total task point - junior_data.total_task_points = junior_data.total_task_points + instance.points + junior_data.total_points = junior_data.total_points + instance.points # update complete time of task instance.completed_on = real_time() else: @@ -330,7 +332,7 @@ class ApproveTaskSerializer(serializers.ModelSerializer): instance.task_status = str(NUMBER['three']) instance.is_approved = False # update total task point - junior_data.total_task_points = junior_data.total_task_points - instance.points + junior_data.total_points = junior_data.total_points - instance.points # update reject time of task instance.rejected_on = real_time() instance.save() diff --git a/guardian/utils.py b/guardian/utils.py index f45caa8..45bf69b 100644 --- a/guardian/utils.py +++ b/guardian/utils.py @@ -11,6 +11,8 @@ from datetime import datetime, time import ntplib # import Number constant from base.constants import NUMBER +# Import Junior's model +from junior.models import Junior, JuniorPoints # Define upload image on # ali baba cloud @@ -21,6 +23,10 @@ from base.constants import NUMBER # bucket and reform the image url""" # fetch real time data without depend on system time # convert time delta into date time object +# update junior total points +# update referral points +# if any one use referral code of the junior +# junior earn 5 points def upload_image_to_alibaba(image, filename): """upload image on oss alibaba bucket""" @@ -59,3 +65,15 @@ def convert_timedelta_into_datetime(time_difference): # Create a new time object with the extracted time components time_only = time(hours, minutes, seconds, microseconds) return time_only + +def update_referral_points(referral_code, referral_code_used): + """Update benefit of referral points""" + junior_queryset = Junior.objects.filter(referral_code=referral_code_used).last() + if junior_queryset and junior_queryset.referral_code != referral_code: + # create data if junior points is not exist + junior_query, created = JuniorPoints.objects.get_or_create(junior=junior_queryset) + if junior_query: + # update junior total points and referral points + junior_query.total_points = junior_query.total_points + NUMBER['five'] + junior_query.referral_points = junior_query.referral_points + NUMBER['five'] + junior_query.save() diff --git a/guardian/views.py b/guardian/views.py index b0e2c34..725eab2 100644 --- a/guardian/views.py +++ b/guardian/views.py @@ -94,7 +94,7 @@ class UpdateGuardianProfile(viewsets.ViewSet): if serializer.is_valid(): """save serializer""" serializer.save() - return custom_response(None, serializer.data,response_status=status.HTTP_200_OK) + 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) @@ -206,7 +206,7 @@ class TopJuniorListAPIView(viewsets.ModelViewSet): def list(self, request, *args, **kwargs): """Fetch junior list of those who complete their tasks""" - junior_total_points = self.get_queryset().order_by('-total_task_points') + junior_total_points = self.get_queryset().order_by('-total_points') # Update the position field for each JuniorPoints object for index, junior in enumerate(junior_total_points): diff --git a/junior/admin.py b/junior/admin.py index 3764f48..99f1cd0 100644 --- a/junior/admin.py +++ b/junior/admin.py @@ -16,7 +16,7 @@ class JuniorAdmin(admin.ModelAdmin): @admin.register(JuniorPoints) class JuniorPointsAdmin(admin.ModelAdmin): """Junior Points Admin""" - list_display = ['junior', 'total_task_points', 'position'] + list_display = ['junior', 'total_points', 'position'] def __str__(self): """Return email id""" diff --git a/junior/migrations/0015_rename_total_task_points_juniorpoints_total_points.py b/junior/migrations/0015_rename_total_task_points_juniorpoints_total_points.py new file mode 100644 index 0000000..038adba --- /dev/null +++ b/junior/migrations/0015_rename_total_task_points_juniorpoints_total_points.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.2 on 2023-07-19 09:40 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('junior', '0014_junior_is_password_set'), + ] + + operations = [ + migrations.RenameField( + model_name='juniorpoints', + old_name='total_task_points', + new_name='total_points', + ), + ] diff --git a/junior/migrations/0016_juniorpoints_referral_points.py b/junior/migrations/0016_juniorpoints_referral_points.py new file mode 100644 index 0000000..a70f45d --- /dev/null +++ b/junior/migrations/0016_juniorpoints_referral_points.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.2 on 2023-07-19 11:00 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('junior', '0015_rename_total_task_points_juniorpoints_total_points'), + ] + + operations = [ + migrations.AddField( + model_name='juniorpoints', + name='referral_points', + field=models.IntegerField(blank=True, default=0, null=True), + ), + ] diff --git a/junior/models.py b/junior/models.py index f4ef488..28754b1 100644 --- a/junior/models.py +++ b/junior/models.py @@ -89,8 +89,10 @@ class Junior(models.Model): class JuniorPoints(models.Model): """Junior 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) + # Total earned points""" + total_points = models.IntegerField(blank=True, null=True, default=0) + # referral points""" + referral_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""" diff --git a/junior/serializers.py b/junior/serializers.py index cd12a2e..b0ddfa1 100644 --- a/junior/serializers.py +++ b/junior/serializers.py @@ -16,7 +16,7 @@ from base.constants import PENDING, IN_PROGRESS, REJECTED, REQUESTED, COMPLETED, from guardian.models import Guardian, JuniorTask from account.models import UserEmailOtp from junior.utils import junior_notification_email, junior_approval_mail -from guardian.utils import real_time +from guardian.utils import real_time, update_referral_points class ListCharField(serializers.ListField): @@ -92,7 +92,6 @@ class CreateJuniorSerializer(serializers.ModelSerializer): """Update country code and phone number""" 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.gender, junior.country_name, junior.image, @@ -100,6 +99,9 @@ class CreateJuniorSerializer(serializers.ModelSerializer): junior.is_complete_profile = False if complete_profile_field: junior.is_complete_profile = True + referral_code_used = validated_data.get('referral_code_used') + update_referral_points(junior.referral_code, referral_code_used) + junior.referral_code_used = validated_data.get('referral_code_used', junior.referral_code_used) junior.save() return junior @@ -346,7 +348,7 @@ class JuniorPointsSerializer(serializers.ModelSerializer): """total points""" points = JuniorPoints.objects.filter(junior=obj.junior).last() if points: - return points.total_task_points + return points.total_points def get_in_progress_task(self, obj): return JuniorTask.objects.filter(junior=obj.junior, task_status=IN_PROGRESS).count() diff --git a/junior/urls.py b/junior/urls.py index 6057c05..e4a160d 100644 --- a/junior/urls.py +++ b/junior/urls.py @@ -3,7 +3,7 @@ from django.urls import path, include from .views import (UpdateJuniorProfile, ValidateGuardianCode, JuniorListAPIView, AddJuniorAPIView, InvitedJuniorAPIView, FilterJuniorAPIView, RemoveJuniorAPIView, JuniorTaskListAPIView, - CompleteJuniorTaskAPIView, JuniorPointsListAPIView) + CompleteJuniorTaskAPIView, JuniorPointsListAPIView, ValidateReferralCode) """Third party import""" from rest_framework import routers @@ -36,6 +36,8 @@ router.register('filter-junior', FilterJuniorAPIView, basename='filter-junior') router.register('junior-task-list', JuniorTaskListAPIView, basename='junior-task-list') # junior's task list API""" router.register('junior-points', JuniorPointsListAPIView, basename='junior-points') +# validate referral code API""" +router.register('validate-referral-code', ValidateReferralCode, basename='validate-referral-code') # Define url pattern""" urlpatterns = [ path('api/v1/', include(router.urls)), diff --git a/junior/views.py b/junior/views.py index e1064af..29f8331 100644 --- a/junior/views.py +++ b/junior/views.py @@ -37,6 +37,8 @@ from guardian.utils import upload_image_to_alibaba # search junior API # remove junior API, # approve junior API +# create referral code +# validation API # Create your views here. class UpdateJuniorProfile(viewsets.ViewSet): @@ -272,3 +274,28 @@ class JuniorPointsListAPIView(viewsets.ModelViewSet): requests.get(os.getenv('BASE_URL') + '/api/v1/top-junior/', headers=headers) serializer = JuniorPointsSerializer(queryset) return custom_response(None, serializer.data, response_status=status.HTTP_200_OK) + +class ValidateReferralCode(viewsets.ViewSet): + """Check guardian code exist or not""" + permission_classes = [IsAuthenticated] + + def get_queryset(self): + """Get queryset based on referral_code.""" + referral_code = self.request.GET.get('referral_code') + if referral_code: + # search referral code in guardian model + guardian_queryset = Guardian.objects.filter(referral_code=referral_code).last() + if guardian_queryset: + return guardian_queryset + else: + # search referral code in junior model + junior_queryset = Junior.objects.filter(referral_code=referral_code).last() + if junior_queryset: + return junior_queryset + return None + + def list(self, request, *args, **kwargs): + """check guardian code""" + if self.get_queryset(): + return custom_response(SUCCESS_CODE['3033'], response_status=status.HTTP_200_OK) + return custom_error_response(ERROR_CODE["2019"], response_status=status.HTTP_400_BAD_REQUEST) From 4002d1e56103ca6060bf9b529e76e1cfadac868f Mon Sep 17 00:00:00 2001 From: abutalib-kiwi Date: Wed, 19 Jul 2023 17:48:27 +0530 Subject: [PATCH 33/38] celery settings --- notifications/utils.py | 1 - zod_bank/settings.py | 7 +++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/notifications/utils.py b/notifications/utils.py index 893947a..26d6778 100644 --- a/notifications/utils.py +++ b/notifications/utils.py @@ -1,7 +1,6 @@ """ notifications utils file """ -import constant as constant # third party imports from fcm_django.models import FCMDevice from celery import shared_task diff --git a/zod_bank/settings.py b/zod_bank/settings.py index 9b01f69..bc7c038 100644 --- a/zod_bank/settings.py +++ b/zod_bank/settings.py @@ -238,6 +238,13 @@ GOOGLE_CLIENT_ID = os.getenv('GOOGLE_CLIENT_ID') # google client secret key GOOGLE_CLIENT_SECRET = os.getenv('GOOGLE_CLIENT_SECRET') +# CELERY SETUP +CELERY_BROKER_URL = os.getenv('CELERY_BROKER_URL') +CELERY_RESULT_BACKEND = os.getenv('CELERY_RESULT_BACKEND') +CELERY_ACCEPT_CONTENT = ['application/json'] +CELERY_TASK_SERIALIZER = 'json' +CELERY_RESULT_SERIALIZER = 'json' + # email settings EMAIL_BACKEND = os.getenv("MAIL_BACKEND") EMAIL_HOST = os.getenv("MAIL_HOST") From 49abf12ce86253d6070f261c74b7fc6839db3d0f Mon Sep 17 00:00:00 2001 From: jain Date: Wed, 19 Jul 2023 17:50:10 +0530 Subject: [PATCH 34/38] jira-34 referral code validation API --- junior/views.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/junior/views.py b/junior/views.py index 29f8331..e920c97 100644 --- a/junior/views.py +++ b/junior/views.py @@ -18,6 +18,7 @@ import requests # from utils file # Import account's serializer # Import account's task +# import junior serializer from junior.models import Junior from .serializers import (CreateJuniorSerializer, JuniorDetailListSerializer, AddJuniorSerializer,\ RemoveJuniorSerializer, CompleteTaskSerializer, JuniorPointsSerializer) @@ -55,6 +56,7 @@ class UpdateJuniorProfile(viewsets.ViewSet): if image: if image.size == NUMBER['zero']: return custom_error_response(ERROR_CODE['2035'], response_status=status.HTTP_400_BAD_REQUEST) + # convert into file filename = f"images/{image.name}" # upload image on ali baba image_url = upload_image_to_alibaba(image, filename) @@ -101,6 +103,7 @@ class JuniorListAPIView(viewsets.ModelViewSet): } requests.get(os.getenv('BASE_URL') + '/api/v1/top-junior/', headers=headers_token) guardian_data = Guardian.objects.filter(user__email=request.user).last() + # fetch junior object queryset = Junior.objects.filter(guardian_code__icontains=str(guardian_data.guardian_code)) # use JuniorDetailListSerializer serializer serializer = JuniorDetailListSerializer(queryset, many=True) @@ -141,6 +144,7 @@ class InvitedJuniorAPIView(viewsets.ModelViewSet): """ junior list""" queryset = self.get_queryset() paginator = self.pagination_class() + # pagination paginated_queryset = paginator.paginate_queryset(queryset, request) # use JuniorDetailListSerializer serializer serializer = JuniorDetailListSerializer(paginated_queryset, many=True) @@ -158,6 +162,7 @@ class FilterJuniorAPIView(viewsets.ModelViewSet): """Get the queryset for the view""" title = self.request.GET.get('title') guardian_data = Guardian.objects.filter(user__email=self.request.user).last() + # fetch junior query queryset = Junior.objects.filter(guardian_code__icontains=str(guardian_data.guardian_code), is_invited=True, auth__first_name=title) return queryset @@ -209,14 +214,18 @@ class JuniorTaskListAPIView(viewsets.ModelViewSet): status_value = self.request.GET.get('status') search = self.request.GET.get('search') if search and str(status_value) == '0': + # search with title and for all task list queryset = JuniorTask.objects.filter(junior__auth=request.user, task_name__icontains=search).order_by('due_date', 'created_at') 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() @@ -239,7 +248,9 @@ class CompleteJuniorTaskAPIView(views.APIView): image = request.data['image'] if image and image.size == NUMBER['zero']: return custom_error_response(ERROR_CODE['2035'], response_status=status.HTTP_400_BAD_REQUEST) + # create file filename = f"images/{image.name}" + # upload image image_url = upload_image_to_alibaba(image, filename) # fetch junior query task_queryset = JuniorTask.objects.filter(id=task_id, junior__auth__email=self.request.user).last() @@ -267,6 +278,7 @@ class JuniorPointsListAPIView(viewsets.ModelViewSet): def list(self, request, *args, **kwargs): """profile view""" queryset = self.get_queryset() + # update position of junior token = self.request.META['HTTP_AUTHORIZATION'] headers = { 'Authorization': token From b488b08f3f84c8af3e037a7604807a91948745db Mon Sep 17 00:00:00 2001 From: jain Date: Thu, 20 Jul 2023 12:25:41 +0530 Subject: [PATCH 35/38] google login chnages --- account/views.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/account/views.py b/account/views.py index 10a538f..9d985fb 100644 --- a/account/views.py +++ b/account/views.py @@ -40,10 +40,10 @@ from account.utils import (send_otp_email, send_support_email, custom_response, from junior.serializers import JuniorProfileSerializer from guardian.serializers import GuardianProfileSerializer -class GoogleLoginMixin(object): +class GoogleLoginMixin: """google login mixin""" @staticmethod - def google_login(self, request): + def google_login(request): """google login function""" access_token = request.data.get('access_token') user_type = request.data.get('user_type') From 0f5dfc2e9ac0a12c2a9514f1456d9f69b0074fb3 Mon Sep 17 00:00:00 2001 From: jain Date: Thu, 20 Jul 2023 12:27:22 +0530 Subject: [PATCH 36/38] google login chnages --- account/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/account/views.py b/account/views.py index 9d985fb..c19cd4f 100644 --- a/account/views.py +++ b/account/views.py @@ -40,7 +40,7 @@ from account.utils import (send_otp_email, send_support_email, custom_response, from junior.serializers import JuniorProfileSerializer from guardian.serializers import GuardianProfileSerializer -class GoogleLoginMixin: +class GoogleLoginMixin(object): """google login mixin""" @staticmethod def google_login(request): From 4410712b11f06ecbbcd5ffc0d7907d456da83399 Mon Sep 17 00:00:00 2001 From: abutalib-kiwi Date: Thu, 20 Jul 2023 12:26:19 +0530 Subject: [PATCH 37/38] sign up issue resolved --- guardian/views.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guardian/views.py b/guardian/views.py index 2776d38..e311833 100644 --- a/guardian/views.py +++ b/guardian/views.py @@ -54,7 +54,7 @@ class SignupViewset(viewsets.ModelViewSet): if request.data['user_type'] in ['1', '2']: serializer = UserSerializer(context=request.data['user_type'], data=request.data) if serializer.is_valid(): - serializer.save() + user = serializer.save() """Generate otp""" otp = generate_otp() expiry = timezone.now() + timezone.timedelta(days=1) @@ -63,7 +63,7 @@ class SignupViewset(viewsets.ModelViewSet): user_type=str(request.data['user_type']), expired_at=expiry) """Send email to the register user""" send_otp_email(request.data['email'], otp) - send_notification(REGISTRATION, None, request.auth.payload['user_id'], {}) + send_notification(REGISTRATION, None, user.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) From 4b09ff41cbd8ea4d0ecc030e653c01f33b06dd0a Mon Sep 17 00:00:00 2001 From: jain Date: Thu, 20 Jul 2023 12:44:48 +0530 Subject: [PATCH 38/38] admin login --- account/serializers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/account/serializers.py b/account/serializers.py index d4b6179..d4fd335 100644 --- a/account/serializers.py +++ b/account/serializers.py @@ -144,12 +144,12 @@ class SuperUserSerializer(serializers.ModelSerializer): refresh_token = serializers.SerializerMethodField('get_refresh_token') def get_auth_token(self, obj): - refresh = RefreshToken.for_user(obj.auth) + refresh = RefreshToken.for_user(obj) access_token = str(refresh.access_token) return access_token def get_refresh_token(self, obj): - refresh = RefreshToken.for_user(obj.user) + refresh = RefreshToken.for_user(obj) refresh_token = str(refresh) return refresh_token