From 5e5161a77ed00bae811778fea65a091a3dd28987 Mon Sep 17 00:00:00 2001 From: jain Date: Tue, 4 Jul 2023 18:26:00 +0530 Subject: [PATCH 1/8] list of the task and task table --- account/serializers.py | 19 +++--- base/constants.py | 10 +++ base/messages.py | 6 +- guardian/admin.py | 11 +++- guardian/migrations/0008_juniortask.py | 36 +++++++++++ guardian/models.py | 29 ++++++++- guardian/serializers.py | 84 +++++++++++++++++++++++++- guardian/urls.py | 6 +- guardian/views.py | 56 +++++++++++++---- junior/serializers.py | 58 ++++++++++++++++++ junior/urls.py | 4 +- junior/views.py | 15 ++++- zod_bank/settings.py | 1 + 13 files changed, 304 insertions(+), 31 deletions(-) create mode 100644 guardian/migrations/0008_juniortask.py diff --git a/account/serializers.py b/account/serializers.py index e2aee49..c328e37 100644 --- a/account/serializers.py +++ b/account/serializers.py @@ -126,12 +126,11 @@ 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): - return get_token()['access'] - def get_refresh_token(self, obj): - return get_token()['refresh'] + refresh = RefreshToken.for_user(obj.user) + access_token = str(refresh.access_token) + return access_token def get_user_type(self, obj): @@ -153,7 +152,7 @@ class GuardianSerializer(serializers.ModelSerializer): class Meta(object): """Meta info""" model = Guardian - fields = ['auth_token', 'refresh_token', 'email', 'first_name', 'last_name', 'country_code', 'phone', 'family_name', 'gender', 'dob', + 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'] @@ -165,12 +164,12 @@ 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): - return get_token()['access'] - def get_refresh_token(self, obj): - return get_token()['refresh'] + print("obj===>",obj,'===>',type(obj)) + refresh = RefreshToken.for_user(obj.auth) + access_token = str(refresh.access_token) + return access_token def get_user_type(self, obj): return JUNIOR @@ -187,7 +186,7 @@ class JuniorSerializer(serializers.ModelSerializer): class Meta(object): """Meta info""" model = Junior - fields = ['auth_token', 'refresh_token', 'email', 'first_name', 'last_name', 'country_code', 'phone', 'gender', 'dob', + 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'] diff --git a/base/constants.py b/base/constants.py index b66ed5f..4e7bdcd 100644 --- a/base/constants.py +++ b/base/constants.py @@ -35,6 +35,16 @@ GENDERS = ( ('1', 'Male'), ('2', 'Female') ) +TASK_STATUS = ( + ('1', 'pending'), + ('2', 'in-progress'), + ('3', 'rejected'), + ('4', 'requested'), + ('5', 'completed') +) + +PENDING = 'pending' +TASK_POINTS = 5 # duplicate name used defined in constant PROJECT_NAME PROJECT_NAME = 'Zod Bank' GUARDIAN = 'guardian' diff --git a/base/messages.py b/base/messages.py index ffdc1c5..b6fd487 100644 --- a/base/messages.py +++ b/base/messages.py @@ -50,7 +50,8 @@ ERROR_CODE = { "2024": "Email not verified", "2025": "Invalid input. Expected a list of strings.", "2026": "New password should not same as old password", - "2027": "data should contain `identityToken`" + "2027": "data should contain `identityToken`", + "2028": "You are not authorized person to sign up on this platform" } SUCCESS_CODE = { # Success code for password @@ -79,7 +80,8 @@ SUCCESS_CODE = { "3014": "Password has been updated successfully.", "3015": "Verification code sent on your email.", "3016": "Send otp on your Email successfully", - "3017": "Profile image update successfully" + "3017": "Profile image update successfully", + "3018": "Created task successfully" } STATUS_CODE_ERROR = { diff --git a/guardian/admin.py b/guardian/admin.py index a3bd40c..6ece960 100644 --- a/guardian/admin.py +++ b/guardian/admin.py @@ -2,7 +2,7 @@ """Third party Django app""" from django.contrib import admin """Import Django app""" -from .models import Guardian +from .models import Guardian, JuniorTask # Register your models here. @admin.register(Guardian) class GuardianAdmin(admin.ModelAdmin): @@ -12,3 +12,12 @@ class GuardianAdmin(admin.ModelAdmin): def __str__(self): """Return email id""" return self.user__email + +@admin.register(JuniorTask) +class TaskAdmin(admin.ModelAdmin): + """Junior Admin""" + list_display = ['task_name', 'task_status'] + + def __str__(self): + """Return email id""" + return str(self.task_name) + str(self.points) diff --git a/guardian/migrations/0008_juniortask.py b/guardian/migrations/0008_juniortask.py new file mode 100644 index 0000000..44a10d7 --- /dev/null +++ b/guardian/migrations/0008_juniortask.py @@ -0,0 +1,36 @@ +# Generated by Django 4.2.2 on 2023-07-04 09:24 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('junior', '0006_alter_junior_country_name'), + ('guardian', '0007_alter_guardian_country_name'), + ] + + operations = [ + migrations.CreateModel( + name='JuniorTask', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('task_name', models.CharField(max_length=100)), + ('task_description', models.CharField(max_length=500)), + ('points', models.IntegerField(default=5)), + ('due_date', models.DateField(blank=True, null=True)), + ('image', models.ImageField(blank=True, default=None, null=True, upload_to='')), + ('task_status', models.CharField(blank=True, choices=[('1', 'pending'), ('2', 'in-progress'), ('3', 'rejected'), ('4', 'requested'), ('5', 'completed')], default='pending', max_length=15, null=True)), + ('is_active', models.BooleanField(default=True)), + ('created_at', models.DateTimeField(auto_now_add=True)), + ('updated_at', models.DateTimeField(auto_now=True)), + ('guardian', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='guardian', to='guardian.guardian', verbose_name='Guardian')), + ('junior', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='junior', to='junior.junior', verbose_name='Junior')), + ], + options={ + 'verbose_name': 'Junior Task', + 'db_table': 'junior_task', + }, + ), + ] diff --git a/guardian/models.py b/guardian/models.py index 1ecf47f..501e080 100644 --- a/guardian/models.py +++ b/guardian/models.py @@ -3,7 +3,8 @@ from django.db import models from django.contrib.auth import get_user_model """Import Django app""" -from base.constants import GENDERS +from base.constants import GENDERS, TASK_STATUS, PENDING, TASK_POINTS +from junior.models import Junior User = get_user_model() # Create your models here. @@ -41,3 +42,29 @@ class Guardian(models.Model): def __str__(self): """Return email id""" return f'{self.user}' + +class JuniorTask(models.Model): + """Guardian model""" + guardian = models.ForeignKey(Guardian, on_delete=models.CASCADE, related_name='guardian', verbose_name='Guardian') + task_name = models.CharField(max_length=100) + task_description = models.CharField(max_length=500) + points = models.IntegerField(default=TASK_POINTS) + due_date = models.DateField(auto_now_add=False, null=True, blank=True) + image = models.ImageField(null=True, blank=True, default=None) + junior = models.ForeignKey(Junior, on_delete=models.CASCADE, related_name='junior', verbose_name='Junior') + task_status = models.CharField(choices=TASK_STATUS, max_length=15, null=True, blank=True, default=PENDING) + is_active = models.BooleanField(default=True) + """Profile created and updated time""" + created_at = models.DateTimeField(auto_now_add=True) + updated_at = models.DateTimeField(auto_now=True) + + class Meta(object): + """ Meta class """ + db_table = 'junior_task' + verbose_name = 'Junior Task' + + def __str__(self): + """Return email id""" + return f'{self.task_name}' + + diff --git a/guardian/serializers.py b/guardian/serializers.py index ba72ef5..d8429d1 100644 --- a/guardian/serializers.py +++ b/guardian/serializers.py @@ -6,9 +6,13 @@ 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 django.core.validators import URLValidator +from django.core.exceptions import ValidationError """Import Django app""" -from .models import Guardian +from .models import Guardian, JuniorTask from account.models import UserProfile, UserEmailOtp +from account.serializers import JuniorSerializer +from junior.serializers import JuniorDetailSerializer from base.messages import ERROR_CODE, SUCCESS_CODE from .utils import upload_image_to_alibaba from junior.models import Junior @@ -134,3 +138,81 @@ class CreateGuardianSerializer(serializers.ModelSerializer): with transaction.atomic(): instance = super().save(**kwargs) return instance + + + + +class ImageField(serializers.Field): + def to_representation(self, value): + return value + def to_internal_value(self, data): + # If data is a valid URL, return it as is + if validators.URLValidator()(data): + return data + # else: + # raise serializers.ValidationError("Enter a valid URL.") + + + +class TaskSerializer(serializers.ModelSerializer): + class Meta(object): + model = JuniorTask + fields = ['task_name','task_description','points', 'due_date', 'junior', 'image'] + def validate_image(self, value): + if 'http' in str(value): + print("999999999999") + return value + else: + print("00000000000000000") + filename = f"images/{value.name}" + image_url = upload_image_to_alibaba(value, filename) + return image_url + def create(self, validated_data): + print("validated_data NOW===>", validated_data, '===>', type(validated_data)) + validated_data['guardian'] = Guardian.objects.filter(user=self.context['user']).last() + # images = self.context['image'] + # if 'http' in str(images): + # print("999999999999") + # validated_data['image'] = images + # else: + # print("00000000000000000") + # filename = f"images/{images.name}" + # image_url = upload_image_to_alibaba(images, filename) + # validated_data['image'] = image_url + + print("validated_data NOW===>", validated_data, '===>', type(validated_data)) + instance = JuniorTask.objects.create(**validated_data) + return instance + +class GuardianDetailSerializer(serializers.ModelSerializer): + """junior serializer""" + + email = serializers.SerializerMethodField('get_auth') + first_name = serializers.SerializerMethodField('get_first_name') + last_name = serializers.SerializerMethodField('get_last_name') + + def get_auth(self, obj): + """user email address""" + return obj.user.username + + def get_first_name(self, obj): + """user first name""" + return obj.user.first_name + + def get_last_name(self, obj): + """user last name""" + return obj.user.last_name + class Meta(object): + """Meta info""" + model = Guardian + fields = ['id', 'email', 'first_name', 'last_name', 'country_code', 'phone', 'gender', 'dob', + 'guardian_code', 'referral_code','is_active', 'is_complete_profile', 'created_at', 'image', + 'updated_at'] +class TaskDetailsSerializer(serializers.ModelSerializer): + + guardian = GuardianDetailSerializer() + junior = JuniorDetailSerializer() + class Meta(object): + model = JuniorTask + fields = ['id', 'guardian', 'task_name', 'task_description', 'points', 'due_date', 'image','junior', + 'task_status', 'is_active'] diff --git a/guardian/urls.py b/guardian/urls.py index 5399f2b..54470cb 100644 --- a/guardian/urls.py +++ b/guardian/urls.py @@ -1,7 +1,7 @@ """ Urls files""" """Django import""" from django.urls import path, include -from .views import SignupViewset, UpdateGuardianProfile +from .views import SignupViewset, UpdateGuardianProfile, TaskListAPIView, CreateTaskAPIView """Third party import""" from rest_framework import routers @@ -13,6 +13,10 @@ router = routers.SimpleRouter() router.register('sign-up', SignupViewset, basename='sign-up') """Create guardian profile API""" router.register('create-guardian-profile', UpdateGuardianProfile, basename='update-guardian-profile') +"""Create Task API""" +router.register('create-task', CreateTaskAPIView, basename='create-task') +"""Task list API""" +router.register('task-list', TaskListAPIView, basename='task-list') """Define Url pattern""" urlpatterns = [ path('api/v1/', include(router.urls)), diff --git a/guardian/views.py b/guardian/views.py index e8dda1e..f764d36 100644 --- a/guardian/views.py +++ b/guardian/views.py @@ -3,8 +3,8 @@ from rest_framework.permissions import IsAuthenticated from rest_framework import viewsets, status """Import Django app""" -from .serializers import UserSerializer, CreateGuardianSerializer -from .models import Guardian +from .serializers import UserSerializer, CreateGuardianSerializer, TaskSerializer, TaskDetailsSerializer +from .models import Guardian, JuniorTask from junior.models import Junior from account.models import UserEmailOtp from .tasks import generate_otp @@ -18,17 +18,20 @@ class SignupViewset(viewsets.ModelViewSet): def create(self, request, *args, **kwargs): """Create user profile""" - serializer = UserSerializer(context=request.data['user_type'], data=request.data) - if serializer.is_valid(): - serializer.save() - """Generate otp""" - otp = generate_otp() - UserEmailOtp.objects.create(email=request.data['email'], otp=otp, user_type=str(request.data['user_type'])) - """Send email to the register user""" - send_otp_email(request.data['email'], otp) - return custom_response(SUCCESS_CODE['3001'], {"email_otp": otp}, - response_status=status.HTTP_200_OK) - return custom_error_response(serializer.errors, response_status=status.HTTP_400_BAD_REQUEST) + if request.data['user_type'] in ['1', '2']: + serializer = UserSerializer(context=request.data['user_type'], data=request.data) + if serializer.is_valid(): + serializer.save() + """Generate otp""" + otp = generate_otp() + UserEmailOtp.objects.create(email=request.data['email'], otp=otp, user_type=str(request.data['user_type'])) + """Send email to the register user""" + send_otp_email(request.data['email'], otp) + return custom_response(SUCCESS_CODE['3001'], {"email_otp": otp}, + response_status=status.HTTP_200_OK) + return custom_error_response(serializer.errors, response_status=status.HTTP_400_BAD_REQUEST) + else: + return custom_error_response(ERROR_CODE['2028'], response_status=status.HTTP_400_BAD_REQUEST) class UpdateGuardianProfile(viewsets.ViewSet): """Update guardian profile""" @@ -46,3 +49,30 @@ class UpdateGuardianProfile(viewsets.ViewSet): serializer.save() 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) + + +class TaskListAPIView(viewsets.ModelViewSet): + """Update guardian profile""" + serializer_class = TaskDetailsSerializer + permission_classes = [IsAuthenticated] + + def list(self, request, *args, **kwargs): + """Create guardian profile""" + queryset = JuniorTask.objects.filter(guardian__user=request.user) + print("queryset==>",queryset) + serializer = TaskDetailsSerializer(queryset, many=True) + print("serializer.data===>",serializer.data) + return custom_response(None, serializer.data, response_status=status.HTTP_200_OK) + +class CreateTaskAPIView(viewsets.ModelViewSet): + """create task for junior""" + serializer_class = TaskSerializer + + def create(self, request, *args, **kwargs): + print("request.data===>",request.data) + image = request.data['image'] + serializer = TaskSerializer(context={"user":request.user, "image":image}, data=request.data) + if serializer.is_valid(): + 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) diff --git a/junior/serializers.py b/junior/serializers.py index 34596e9..b8c6864 100644 --- a/junior/serializers.py +++ b/junior/serializers.py @@ -59,6 +59,11 @@ class CreateJuniorSerializer(serializers.ModelSerializer): def create(self, validated_data): """Create junior profile""" image = validated_data.get('image', None) + guardian_code = validated_data.get('guardian_code',None) + print("guardian_code===>",guardian_code,'==>',type(guardian_code)) + + + # phone_number = validated_data.get('phone', None) # guardian_data = Guardian.objects.filter(phone=phone_number) # junior_data = Junior.objects.filter(phone=phone_number) @@ -82,6 +87,9 @@ class CreateJuniorSerializer(serializers.ModelSerializer): junior.gender = validated_data.get('gender',junior.gender) """Update guardian code""" junior.guardian_code = validated_data.get('guardian_code', junior.guardian_code) + """condition for guardian code""" + if guardian_code: + junior.guardian_code = guardian_code junior.dob = validated_data.get('dob',junior.dob) junior.passcode = validated_data.get('passcode', junior.passcode) junior.country_name = validated_data.get('country_name', junior.country_name) @@ -107,3 +115,53 @@ class CreateJuniorSerializer(serializers.ModelSerializer): with transaction.atomic(): instance = super().save(**kwargs) return instance + +class JuniorDetailSerializer(serializers.ModelSerializer): + """junior serializer""" + email = serializers.SerializerMethodField('get_auth') + first_name = serializers.SerializerMethodField('get_first_name') + last_name = serializers.SerializerMethodField('get_last_name') + + def get_auth(self, obj): + """user email address""" + return obj.auth.username + + def get_first_name(self, obj): + """user first name""" + return obj.auth.first_name + + def get_last_name(self, obj): + """user last name""" + return obj.auth.last_name + + class Meta(object): + """Meta info""" + model = Junior + fields = ['id', 'email', 'first_name', 'last_name', 'country_code', 'phone', 'gender', 'dob', + 'guardian_code', 'referral_code','is_active', 'is_complete_profile', 'created_at', 'image', + 'updated_at'] + +class JuniorDetailListSerializer(serializers.ModelSerializer): + """junior serializer""" + + email = serializers.SerializerMethodField('get_auth') + first_name = serializers.SerializerMethodField('get_first_name') + last_name = serializers.SerializerMethodField('get_last_name') + + + + def get_auth(self, obj): + return obj.auth.username + + def get_first_name(self, obj): + return obj.auth.first_name + + def get_last_name(self, obj): + return obj.auth.last_name + + class Meta(object): + """Meta info""" + model = Junior + fields = ['id', 'email', 'first_name', 'last_name', 'country_code', 'phone', 'gender', 'dob', + 'guardian_code', 'referral_code','is_active', 'is_complete_profile', 'created_at', 'image', + 'updated_at'] \ No newline at end of file diff --git a/junior/urls.py b/junior/urls.py index 2b64fe4..5eb0f4c 100644 --- a/junior/urls.py +++ b/junior/urls.py @@ -1,7 +1,7 @@ """ Urls files""" """Django import""" from django.urls import path, include -from .views import UpdateJuniorProfile, ValidateGuardianCode +from .views import UpdateJuniorProfile, ValidateGuardianCode, JuniorListAPIView """Third party import""" from rest_framework import routers @@ -13,6 +13,8 @@ router = routers.SimpleRouter() router.register('create-junior-profile', UpdateJuniorProfile, basename='profile-update') """validate guardian code API""" router.register('validate-guardian-code', ValidateGuardianCode, basename='validate-guardian-code') +"""junior list API""" +router.register('junior-list', JuniorListAPIView, basename='junior-list') """Define url pattern""" urlpatterns = [ path('api/v1/', include(router.urls)), diff --git a/junior/views.py b/junior/views.py index 153bb41..fd2555e 100644 --- a/junior/views.py +++ b/junior/views.py @@ -3,7 +3,7 @@ from rest_framework import viewsets, status from rest_framework.permissions import IsAuthenticated """Django app import""" from junior.models import Junior -from .serializers import CreateJuniorSerializer +from .serializers import CreateJuniorSerializer, JuniorDetailListSerializer from guardian.models import Guardian from base.messages import ERROR_CODE, SUCCESS_CODE from account.utils import custom_response, custom_error_response @@ -38,3 +38,16 @@ class ValidateGuardianCode(viewsets.ViewSet): return custom_response(SUCCESS_CODE['3013'], response_status=status.HTTP_200_OK) else: return custom_error_response(ERROR_CODE["2022"], response_status=status.HTTP_400_BAD_REQUEST) + +class JuniorListAPIView(viewsets.ModelViewSet): + """Junior list of assosicated guardian""" + + serializer_class = JuniorDetailListSerializer + + def list(self, request, *args, **kwargs): + """ junior list""" + guardian_data = Guardian.objects.filter(user__email=request.user).last() + queryset = Junior.objects.filter(guardian_code__icontains=str(guardian_data.guardian_code)) + print("queryset===>",queryset) + serializer = JuniorDetailListSerializer(queryset, many=True) + return custom_response(None, serializer.data, response_status=status.HTTP_200_OK) diff --git a/zod_bank/settings.py b/zod_bank/settings.py index 71b561c..7a05e1a 100644 --- a/zod_bank/settings.py +++ b/zod_bank/settings.py @@ -201,3 +201,4 @@ ALIYUN_OSS_REGION = os.getenv('ALIYUN_OSS_REGION') STATIC_URL = 'static/' STATIC_ROOT = 'static' + From 0d143a39ac062327d990daa9b7b0d3641f5431ee Mon Sep 17 00:00:00 2001 From: jain Date: Tue, 4 Jul 2023 19:25:51 +0530 Subject: [PATCH 2/8] jira-20 create task --- .../migrations/0009_alter_juniortask_image.py | 18 +++++++++++ .../0010_alter_juniortask_task_status.py | 18 +++++++++++ guardian/models.py | 4 +-- guardian/serializers.py | 32 +++---------------- guardian/urls.py | 6 ++-- guardian/views.py | 27 ++++++++++++++-- 6 files changed, 70 insertions(+), 35 deletions(-) create mode 100644 guardian/migrations/0009_alter_juniortask_image.py create mode 100644 guardian/migrations/0010_alter_juniortask_task_status.py diff --git a/guardian/migrations/0009_alter_juniortask_image.py b/guardian/migrations/0009_alter_juniortask_image.py new file mode 100644 index 0000000..496fee1 --- /dev/null +++ b/guardian/migrations/0009_alter_juniortask_image.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.2 on 2023-07-04 12:56 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('guardian', '0008_juniortask'), + ] + + operations = [ + migrations.AlterField( + model_name='juniortask', + name='image', + field=models.URLField(blank=True, default=None, null=True), + ), + ] diff --git a/guardian/migrations/0010_alter_juniortask_task_status.py b/guardian/migrations/0010_alter_juniortask_task_status.py new file mode 100644 index 0000000..da84f2c --- /dev/null +++ b/guardian/migrations/0010_alter_juniortask_task_status.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.2 on 2023-07-04 13:41 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('guardian', '0009_alter_juniortask_image'), + ] + + operations = [ + migrations.AlterField( + model_name='juniortask', + name='task_status', + field=models.CharField(choices=[('1', 'pending'), ('2', 'in-progress'), ('3', 'rejected'), ('4', 'requested'), ('5', 'completed')], default='pending', max_length=15), + ), + ] diff --git a/guardian/models.py b/guardian/models.py index 501e080..3752b02 100644 --- a/guardian/models.py +++ b/guardian/models.py @@ -50,9 +50,9 @@ class JuniorTask(models.Model): task_description = models.CharField(max_length=500) points = models.IntegerField(default=TASK_POINTS) due_date = models.DateField(auto_now_add=False, null=True, blank=True) - image = models.ImageField(null=True, blank=True, default=None) + image = models.URLField(null=True, blank=True, default=None) junior = models.ForeignKey(Junior, on_delete=models.CASCADE, related_name='junior', verbose_name='Junior') - task_status = models.CharField(choices=TASK_STATUS, max_length=15, null=True, blank=True, default=PENDING) + task_status = models.CharField(choices=TASK_STATUS, max_length=15, default=PENDING) is_active = models.BooleanField(default=True) """Profile created and updated time""" created_at = models.DateTimeField(auto_now_add=True) diff --git a/guardian/serializers.py b/guardian/serializers.py index d8429d1..be0272d 100644 --- a/guardian/serializers.py +++ b/guardian/serializers.py @@ -141,46 +141,22 @@ class CreateGuardianSerializer(serializers.ModelSerializer): - -class ImageField(serializers.Field): - def to_representation(self, value): - return value - def to_internal_value(self, data): - # If data is a valid URL, return it as is - if validators.URLValidator()(data): - return data - # else: - # raise serializers.ValidationError("Enter a valid URL.") - - - class TaskSerializer(serializers.ModelSerializer): class Meta(object): model = JuniorTask fields = ['task_name','task_description','points', 'due_date', 'junior', 'image'] - def validate_image(self, value): - if 'http' in str(value): - print("999999999999") - return value - else: - print("00000000000000000") - filename = f"images/{value.name}" - image_url = upload_image_to_alibaba(value, filename) - return image_url def create(self, validated_data): - print("validated_data NOW===>", validated_data, '===>', type(validated_data)) validated_data['guardian'] = Guardian.objects.filter(user=self.context['user']).last() - # images = self.context['image'] + images = self.context['image'] + validated_data['image'] = images + print("images===>",images) + print("validated_data===>",validated_data) # if 'http' in str(images): - # print("999999999999") # validated_data['image'] = images # else: - # print("00000000000000000") # filename = f"images/{images.name}" # image_url = upload_image_to_alibaba(images, filename) # validated_data['image'] = image_url - - print("validated_data NOW===>", validated_data, '===>', type(validated_data)) instance = JuniorTask.objects.create(**validated_data) return instance diff --git a/guardian/urls.py b/guardian/urls.py index 54470cb..6acd172 100644 --- a/guardian/urls.py +++ b/guardian/urls.py @@ -1,7 +1,7 @@ """ Urls files""" """Django import""" from django.urls import path, include -from .views import SignupViewset, UpdateGuardianProfile, TaskListAPIView, CreateTaskAPIView +from .views import SignupViewset, UpdateGuardianProfile, AllTaskListAPIView, CreateTaskAPIView, TaskListAPIView """Third party import""" from rest_framework import routers @@ -15,7 +15,9 @@ router.register('sign-up', SignupViewset, basename='sign-up') router.register('create-guardian-profile', UpdateGuardianProfile, basename='update-guardian-profile') """Create Task API""" router.register('create-task', CreateTaskAPIView, basename='create-task') -"""Task list API""" +"""All Task list API""" +router.register('all-task-list', AllTaskListAPIView, basename='all-task-list') +"""Task list bases on the status API""" router.register('task-list', TaskListAPIView, basename='task-list') """Define Url pattern""" urlpatterns = [ diff --git a/guardian/views.py b/guardian/views.py index f764d36..22ffaa0 100644 --- a/guardian/views.py +++ b/guardian/views.py @@ -11,6 +11,7 @@ from .tasks import generate_otp from account.utils import send_otp_email from account.utils import custom_response, custom_error_response from base.messages import ERROR_CODE, SUCCESS_CODE +from .utils import upload_image_to_alibaba # Create your views here. class SignupViewset(viewsets.ModelViewSet): """Signup view set""" @@ -51,7 +52,7 @@ class UpdateGuardianProfile(viewsets.ViewSet): return custom_error_response(serializer.errors, response_status=status.HTTP_400_BAD_REQUEST) -class TaskListAPIView(viewsets.ModelViewSet): +class AllTaskListAPIView(viewsets.ModelViewSet): """Update guardian profile""" serializer_class = TaskDetailsSerializer permission_classes = [IsAuthenticated] @@ -64,14 +65,34 @@ class TaskListAPIView(viewsets.ModelViewSet): print("serializer.data===>",serializer.data) return custom_response(None, serializer.data, response_status=status.HTTP_200_OK) +class TaskListAPIView(viewsets.ModelViewSet): + """Update guardian profile""" + serializer_class = TaskDetailsSerializer + permission_classes = [IsAuthenticated] + + def list(self, request, *args, **kwargs): + """Create guardian profile""" + print("request.GET.get(status)==>",self.request.GET.get('status')) + queryset = JuniorTask.objects.filter(guardian__user=request.user, task_status=self.request.GET.get('status')) + print("queryset==>",queryset) + serializer = TaskDetailsSerializer(queryset, many=True) + print("serializer.data===>",serializer.data) + return custom_response(None, serializer.data, response_status=status.HTTP_200_OK) class CreateTaskAPIView(viewsets.ModelViewSet): """create task for junior""" serializer_class = TaskSerializer def create(self, request, *args, **kwargs): - print("request.data===>",request.data) image = request.data['image'] - serializer = TaskSerializer(context={"user":request.user, "image":image}, data=request.data) + data = request.data + if 'https' in str(image): + image_data = image + else: + filename = f"images/{image}" + image_url = upload_image_to_alibaba(image, filename) + image_data = image_url + data.pop('image') + serializer = TaskSerializer(context={"user":request.user, "image":image_data}, data=data) if serializer.is_valid(): serializer.save() return custom_response(SUCCESS_CODE['3018'], serializer.data, response_status=status.HTTP_200_OK) From a80f603614813007a362cee43ca08c6bf128658d Mon Sep 17 00:00:00 2001 From: jain Date: Thu, 6 Jul 2023 07:57:53 +0530 Subject: [PATCH 3/8] jira-15 top junior API and default images field --- base/constants.py | 6 +- guardian/admin.py | 2 +- ...t_image_juniortask_is_approved_and_more.py | 28 ++++++ guardian/models.py | 2 + guardian/serializers.py | 70 +++++++++++++++ guardian/urls.py | 7 +- guardian/utils.py | 1 + guardian/views.py | 90 ++++++++++++++++++- junior/serializers.py | 43 ++++++++- zod_bank/settings.py | 3 +- 10 files changed, 243 insertions(+), 9 deletions(-) create mode 100644 guardian/migrations/0011_juniortask_default_image_juniortask_is_approved_and_more.py diff --git a/base/constants.py b/base/constants.py index 4e7bdcd..f455316 100644 --- a/base/constants.py +++ b/base/constants.py @@ -43,7 +43,11 @@ TASK_STATUS = ( ('5', 'completed') ) -PENDING = 'pending' +PENDING = 1 +IN_PROGRESS = 2 +REJECTED = 3 +REQUESTED = 4 +COMPLETED = 5 TASK_POINTS = 5 # duplicate name used defined in constant PROJECT_NAME PROJECT_NAME = 'Zod Bank' diff --git a/guardian/admin.py b/guardian/admin.py index 6ece960..45f5c95 100644 --- a/guardian/admin.py +++ b/guardian/admin.py @@ -16,7 +16,7 @@ class GuardianAdmin(admin.ModelAdmin): @admin.register(JuniorTask) class TaskAdmin(admin.ModelAdmin): """Junior Admin""" - list_display = ['task_name', 'task_status'] + list_display = ['task_name', 'task_status', 'junior', 'points'] def __str__(self): """Return email id""" diff --git a/guardian/migrations/0011_juniortask_default_image_juniortask_is_approved_and_more.py b/guardian/migrations/0011_juniortask_default_image_juniortask_is_approved_and_more.py new file mode 100644 index 0000000..7d10d3c --- /dev/null +++ b/guardian/migrations/0011_juniortask_default_image_juniortask_is_approved_and_more.py @@ -0,0 +1,28 @@ +# Generated by Django 4.2.2 on 2023-07-05 11:17 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('guardian', '0010_alter_juniortask_task_status'), + ] + + operations = [ + migrations.AddField( + model_name='juniortask', + name='default_image', + field=models.ImageField(blank=True, default=None, null=True, upload_to=''), + ), + migrations.AddField( + model_name='juniortask', + name='is_approved', + field=models.BooleanField(default=False), + ), + migrations.AlterField( + model_name='juniortask', + name='task_status', + field=models.CharField(choices=[('1', 'pending'), ('2', 'in-progress'), ('3', 'rejected'), ('4', 'requested'), ('5', 'completed')], default=1, max_length=15), + ), + ] diff --git a/guardian/models.py b/guardian/models.py index 3752b02..c2ac60b 100644 --- a/guardian/models.py +++ b/guardian/models.py @@ -50,10 +50,12 @@ class JuniorTask(models.Model): task_description = models.CharField(max_length=500) points = models.IntegerField(default=TASK_POINTS) due_date = models.DateField(auto_now_add=False, null=True, blank=True) + default_image = models.ImageField(null=True, blank=True, default=None) image = models.URLField(null=True, blank=True, default=None) junior = models.ForeignKey(Junior, on_delete=models.CASCADE, related_name='junior', verbose_name='Junior') task_status = models.CharField(choices=TASK_STATUS, max_length=15, default=PENDING) is_active = models.BooleanField(default=True) + is_approved = models.BooleanField(default=False) """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 be0272d..fb091fc 100644 --- a/guardian/serializers.py +++ b/guardian/serializers.py @@ -129,7 +129,9 @@ class CreateGuardianSerializer(serializers.ModelSerializer): if image: filename = f"images/{image.name}" image_url = upload_image_to_alibaba(image, filename) + print("image_url=====>",image_url) guardian.image = image_url + print("guardian.image=====>", guardian.image) guardian.save() return guardian @@ -192,3 +194,71 @@ class TaskDetailsSerializer(serializers.ModelSerializer): model = JuniorTask fields = ['id', 'guardian', 'task_name', 'task_description', 'points', 'due_date', 'image','junior', 'task_status', 'is_active'] + + + + + +class TopJuniorSerializer(serializers.ModelSerializer): + total_points = serializers.SerializerMethodField() + + email = serializers.SerializerMethodField('get_auth') + first_name = serializers.SerializerMethodField('get_first_name') + last_name = serializers.SerializerMethodField('get_last_name') + + def get_auth(self, obj): + return obj.auth.username + + def get_first_name(self, obj): + return obj.auth.first_name + + def get_last_name(self, obj): + return obj.auth.last_name + + class Meta: + model = Junior + fields = ['id', 'email', 'first_name', 'last_name', 'phone', 'country_code', 'country_name', 'gender', 'dob', 'image', 'junior_code', 'guardian_code', 'referral_code', 'referral_code_used', 'is_active', 'is_complete_profile', 'passcode', 'is_verified', 'created_at', 'updated_at', 'total_points'] + + def get_total_points(self, obj): + junior_ids_with_total_points = self.context.get('junior_ids_with_total_points') + if junior_ids_with_total_points: + junior_id = obj.id + for item in junior_ids_with_total_points: + if item['junior'] == junior_id: + return item['total_points'] + return 0 + +# +# class TopJuniorSerializer(serializers.ModelSerializer): +# total_points = serializers.SerializerMethodField() +# +# email = serializers.SerializerMethodField('get_auth') +# first_name = serializers.SerializerMethodField('get_first_name') +# last_name = serializers.SerializerMethodField('get_last_name') +# +# +# def get_auth(self, obj): +# return obj.auth.username +# +# def get_first_name(self, obj): +# return obj.auth.first_name +# +# def get_last_name(self, obj): +# print("onbj==>",obj) +# return obj.auth.last_name +# +# class Meta: +# model = Junior +# fields = ['id', 'email', 'first_name', 'last_name', 'phone', 'country_code', 'country_name', 'gender', 'dob', 'image', 'junior_code', 'guardian_code', 'referral_code', 'referral_code_used', 'is_active', 'is_complete_profile', 'passcode', 'is_verified', 'created_at', 'updated_at', 'total_points'] +# +# def get_total_points(self, obj): +# total_highest_points = self.context.get('total_highest_points') +# if total_highest_points: +# print("total_highest_points==>",total_highest_points) +# junior_id = obj.id +# print("junior_id==>", junior_id) +# total_points = next((item['total_points'] for item in total_highest_points if item['junior'] == junior_id), 0) +# print("total_points==>", total_points) +# return total_points +# return 0 +# diff --git a/guardian/urls.py b/guardian/urls.py index 6acd172..b69b041 100644 --- a/guardian/urls.py +++ b/guardian/urls.py @@ -1,7 +1,8 @@ """ Urls files""" """Django import""" from django.urls import path, include -from .views import SignupViewset, UpdateGuardianProfile, AllTaskListAPIView, CreateTaskAPIView, TaskListAPIView +from .views import (SignupViewset, UpdateGuardianProfile, AllTaskListAPIView, CreateTaskAPIView, TaskListAPIView, + SearchTaskListAPIView, TopJuniorListAPIView) """Third party import""" from rest_framework import routers @@ -19,6 +20,10 @@ router.register('create-task', CreateTaskAPIView, basename='create-task') router.register('all-task-list', AllTaskListAPIView, basename='all-task-list') """Task list bases on the status API""" router.register('task-list', TaskListAPIView, basename='task-list') +"""Leaderboard API""" +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') """Define Url pattern""" urlpatterns = [ path('api/v1/', include(router.urls)), diff --git a/guardian/utils.py b/guardian/utils.py index 0e46c6c..a4e1ffc 100644 --- a/guardian/utils.py +++ b/guardian/utils.py @@ -11,3 +11,4 @@ def upload_image_to_alibaba(image, filename): # Upload the temporary file to Alibaba OSS bucket.put_object_from_file(filename, temp_file.name) return f"https://{settings.ALIYUN_OSS_BUCKET_NAME}.{settings.ALIYUN_OSS_ENDPOINT}/{filename}" + diff --git a/guardian/views.py b/guardian/views.py index 22ffaa0..9a4ab78 100644 --- a/guardian/views.py +++ b/guardian/views.py @@ -2,16 +2,20 @@ """Third party Django app""" from rest_framework.permissions import IsAuthenticated from rest_framework import viewsets, status +from django.db.models import Max """Import Django app""" -from .serializers import UserSerializer, CreateGuardianSerializer, TaskSerializer, TaskDetailsSerializer +from .serializers import (UserSerializer, CreateGuardianSerializer, TaskSerializer, TaskDetailsSerializer, + TopJuniorSerializer) from .models import Guardian, JuniorTask from junior.models import Junior +from junior.serializers import JuniorDetailSerializer from account.models import UserEmailOtp from .tasks import generate_otp from account.utils import send_otp_email from account.utils import custom_response, custom_error_response from base.messages import ERROR_CODE, SUCCESS_CODE from .utils import upload_image_to_alibaba +from django.db.models import Sum # Create your views here. class SignupViewset(viewsets.ModelViewSet): """Signup view set""" @@ -73,7 +77,12 @@ class TaskListAPIView(viewsets.ModelViewSet): def list(self, request, *args, **kwargs): """Create guardian profile""" print("request.GET.get(status)==>",self.request.GET.get('status')) - queryset = JuniorTask.objects.filter(guardian__user=request.user, task_status=self.request.GET.get('status')) + status_value = self.request.GET.get('status') + if status_value == 0: + queryset = JuniorTask.objects.filter(guardian__user=request.user) + else: + queryset = JuniorTask.objects.filter(guardian__user=request.user, + task_status=status_value) print("queryset==>",queryset) serializer = TaskDetailsSerializer(queryset, many=True) print("serializer.data===>",serializer.data) @@ -97,3 +106,80 @@ class CreateTaskAPIView(viewsets.ModelViewSet): 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) + + +class SearchTaskListAPIView(viewsets.ModelViewSet): + """Update guardian profile""" + serializer_class = TaskDetailsSerializer + permission_classes = [IsAuthenticated] + + def list(self, request, *args, **kwargs): + """Create guardian profile""" + due_date = self.request.GET.get('due_date') + print("request.GET.get(status)==>",self.request.GET.get('status')) + if self.request.GET.get('status'): + queryset = JuniorTask.objects.filter(guardian__user=request.user, + task_status=self.request.GET.get('status')).order_by('due_date') + if due_date: + queryset = JuniorTask.objects.filter(guardian__user=request.user, + due_date=due_date).order_by('due_date').order_by('created_at') + + print("queryset==>",queryset) + serializer = TaskDetailsSerializer(queryset, many=True) + # print("serializer.data===>",serializer.data) + return custom_response(None, serializer.data, response_status=status.HTTP_200_OK) + + +class TopJuniorListAPIView(viewsets.ModelViewSet): + """Top juniors list""" + serializer_class = TopJuniorSerializer + # permission_classes = [IsAuthenticated] + + def list(self, request, *args, **kwargs): + """fetch junior list those complete their task""" + junior_ids_with_total_points = JuniorTask.objects.filter(task_status=1) \ + .values('junior') \ + .annotate(total_points=Sum('points')) \ + .order_by('-total_points') + + junior_ids = [item['junior'] for item in junior_ids_with_total_points] + + juniors = Junior.objects.filter(id__in=junior_ids) \ + .annotate(max_points=Max('junior_task__points')) \ + .order_by('-max_points', 'id') + + serializer = self.get_serializer(juniors, many=True, context={'junior_ids_with_total_points': junior_ids_with_total_points}) + return custom_response(serializer.data, response_status=status.HTTP_200_OK) + +# +# class TopJuniorListAPIView(viewsets.ModelViewSet): +# """Top juniors list""" +# serializer_class = TopJuniorSerializer +# # permission_classes = [IsAuthenticated] +# +# def list(self, request, *args, **kwargs): +# """fetch junior list those complete their task""" +# total_highest_points = list(JuniorTask.objects.filter(task_status=1) +# .values('junior') +# .annotate(total_points=Sum('points')) +# .order_by('-total_points')) +# print("total_highest_points===>",total_highest_points,'===>',type(total_highest_points)) +# junior_ids = [item['junior'] for item in total_highest_points] +# print("junior_ids====>", junior_ids) +# juniors = Junior.objects.filter(id__in=junior_ids) +# # a = [] +# # for i in junior_ids: +# # juniors = Junior.objects.filter(id=i) +# # a.append(juniors) +# print("juniors====>", juniors) +# # print('a===>',a,'==>',type(a)) +# serializer = self.get_serializer(juniors, context={'total_highest_points': total_highest_points}, many=True) +# print("serializer====>",type(serializer.data)) +# # Find the junior with the highest points +# # highest_points_junior = max(serializer.data, key=lambda x: x['total_points']) +# +# return custom_response(serializer.data, response_status=status.HTTP_200_OK) +# # serializer = self.get_serializer(total_highest_points, many=True) +# # return custom_response(None, serializer.data,response_status=status.HTTP_200_OK) + + diff --git a/junior/serializers.py b/junior/serializers.py index b8c6864..8e871cd 100644 --- a/junior/serializers.py +++ b/junior/serializers.py @@ -8,7 +8,8 @@ import random from junior.models import Junior from guardian.utils import upload_image_to_alibaba from base.messages import ERROR_CODE, SUCCESS_CODE -from guardian.models import Guardian +from guardian.models import Guardian, JuniorTask +from base.constants import PENDING, IN_PROGRESS, REJECTED, REQUESTED, COMPLETED class ListCharField(serializers.ListField): """Serializer for Array field""" @@ -147,7 +148,13 @@ class JuniorDetailListSerializer(serializers.ModelSerializer): email = serializers.SerializerMethodField('get_auth') first_name = serializers.SerializerMethodField('get_first_name') last_name = serializers.SerializerMethodField('get_last_name') - + assigned_task = serializers.SerializerMethodField('get_assigned_task') + 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') def get_auth(self, obj): @@ -159,9 +166,39 @@ class JuniorDetailListSerializer(serializers.ModelSerializer): def get_last_name(self, obj): return obj.auth.last_name + def get_assigned_task(self, obj): + print("obj===>",obj,'type==>',type(obj)) + data = JuniorTask.objects.filter(junior=obj).count() + return data + + def get_points(self, obj): + data = sum(JuniorTask.objects.filter(junior=obj, task_status=COMPLETED).values_list('points', flat=True)) + return data + + def get_in_progress_task(self, obj): + data = JuniorTask.objects.filter(junior=obj, task_status=IN_PROGRESS).count() + return data + + def get_completed_task(self, obj): + data = JuniorTask.objects.filter(junior=obj, task_status=COMPLETED).count() + return data + + + def get_requested_task(self, obj): + data = JuniorTask.objects.filter(junior=obj, task_status=REQUESTED).count() + return data + + def get_rejected_task(self, obj): + data = JuniorTask.objects.filter(junior=obj, task_status=REJECTED).count() + return data + + def get_pending_task(self, obj): + data = JuniorTask.objects.filter(junior=obj, task_status=PENDING).count() + return data class Meta(object): """Meta info""" model = Junior fields = ['id', 'email', 'first_name', 'last_name', 'country_code', 'phone', 'gender', 'dob', 'guardian_code', 'referral_code','is_active', 'is_complete_profile', 'created_at', 'image', - 'updated_at'] \ No newline at end of file + 'updated_at', 'assigned_task','points', 'pending_task', 'in_progress_task', 'completed_task', + 'requested_task', 'rejected_task'] diff --git a/zod_bank/settings.py b/zod_bank/settings.py index 7a05e1a..60c3e70 100644 --- a/zod_bank/settings.py +++ b/zod_bank/settings.py @@ -190,7 +190,8 @@ EMAIL_PORT="587" EMAIL_USE_TLS="True" EMAIL_HOST_USER="apikey" # Replace with your Gmail email address EMAIL_HOST_PASSWORD="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" -EMAIL_FROM_ADDRESS="zodbank@yopmail.com" +EMAIL_FROM_ADDRESS="support@zodbank.com" +# EMAIL_FROM_ADDRESS="zodbank@yopmail.com" 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 cf966a52500a186385ff83b78177bdc01241adf8 Mon Sep 17 00:00:00 2001 From: jain Date: Thu, 6 Jul 2023 12:21:54 +0530 Subject: [PATCH 4/8] jira-15 dashboard API --- account/serializers.py | 2 +- base/messages.py | 2 +- guardian/admin.py | 2 +- .../0012_alter_juniortask_default_image.py | 18 +++++++ .../migrations/0013_alter_guardian_image.py | 18 +++++++ guardian/models.py | 4 +- guardian/serializers.py | 14 +++--- guardian/utils.py | 6 ++- guardian/views.py | 47 +++++++++---------- zod_bank/settings.py | 5 +- 10 files changed, 76 insertions(+), 42 deletions(-) create mode 100644 guardian/migrations/0012_alter_juniortask_default_image.py create mode 100644 guardian/migrations/0013_alter_guardian_image.py diff --git a/account/serializers.py b/account/serializers.py index c328e37..70808f3 100644 --- a/account/serializers.py +++ b/account/serializers.py @@ -87,7 +87,7 @@ class ChangePasswordSerializer(serializers.Serializer): if self.context.password not in ('', None): if user.check_password(value): return value - raise serializers.ValidationError({"details":ERROR_CODE['2015']}) + raise serializers.ValidationError(ERROR_CODE['2015']) def create(self, validated_data): new_password = validated_data.pop('new_password') current_password = validated_data.pop('current_password') diff --git a/base/messages.py b/base/messages.py index b6fd487..dc6392a 100644 --- a/base/messages.py +++ b/base/messages.py @@ -81,7 +81,7 @@ SUCCESS_CODE = { "3015": "Verification code sent on your email.", "3016": "Send otp on your Email successfully", "3017": "Profile image update successfully", - "3018": "Created task successfully" + "3018": "Task created successfully" } STATUS_CODE_ERROR = { diff --git a/guardian/admin.py b/guardian/admin.py index 45f5c95..97edbdb 100644 --- a/guardian/admin.py +++ b/guardian/admin.py @@ -16,7 +16,7 @@ class GuardianAdmin(admin.ModelAdmin): @admin.register(JuniorTask) class TaskAdmin(admin.ModelAdmin): """Junior Admin""" - list_display = ['task_name', 'task_status', 'junior', 'points'] + list_display = ['id', 'task_name', 'task_status', 'junior', 'due_date', 'points', 'created_at', 'updated_at'] def __str__(self): """Return email id""" diff --git a/guardian/migrations/0012_alter_juniortask_default_image.py b/guardian/migrations/0012_alter_juniortask_default_image.py new file mode 100644 index 0000000..eefae1b --- /dev/null +++ b/guardian/migrations/0012_alter_juniortask_default_image.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.2 on 2023-07-06 05:12 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('guardian', '0011_juniortask_default_image_juniortask_is_approved_and_more'), + ] + + operations = [ + migrations.AlterField( + model_name='juniortask', + name='default_image', + field=models.URLField(blank=True, default=None, null=True), + ), + ] diff --git a/guardian/migrations/0013_alter_guardian_image.py b/guardian/migrations/0013_alter_guardian_image.py new file mode 100644 index 0000000..0a16630 --- /dev/null +++ b/guardian/migrations/0013_alter_guardian_image.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.2 on 2023-07-06 06:40 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('guardian', '0012_alter_juniortask_default_image'), + ] + + operations = [ + migrations.AlterField( + model_name='guardian', + name='image', + field=models.URLField(blank=True, default=None, null=True), + ), + ] diff --git a/guardian/models.py b/guardian/models.py index c2ac60b..00c5d42 100644 --- a/guardian/models.py +++ b/guardian/models.py @@ -16,7 +16,7 @@ class Guardian(models.Model): phone = models.CharField(max_length=31, null=True, blank=True, default=None) country_name = models.CharField(max_length=100, null=True, blank=True, default=None) """Image info""" - image = models.ImageField(null=True, blank=True, default=None) + 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 = models.CharField(choices=GENDERS, max_length=15, null=True, blank=True, default=None) @@ -50,7 +50,7 @@ class JuniorTask(models.Model): task_description = models.CharField(max_length=500) points = models.IntegerField(default=TASK_POINTS) due_date = models.DateField(auto_now_add=False, null=True, blank=True) - default_image = models.ImageField(null=True, blank=True, default=None) + default_image = models.URLField(null=True, blank=True, default=None) image = models.URLField(null=True, blank=True, default=None) junior = models.ForeignKey(Junior, on_delete=models.CASCADE, related_name='junior', verbose_name='Junior') task_status = models.CharField(choices=TASK_STATUS, max_length=15, default=PENDING) diff --git a/guardian/serializers.py b/guardian/serializers.py index fb091fc..a55c320 100644 --- a/guardian/serializers.py +++ b/guardian/serializers.py @@ -129,9 +129,9 @@ class CreateGuardianSerializer(serializers.ModelSerializer): if image: filename = f"images/{image.name}" image_url = upload_image_to_alibaba(image, filename) - print("image_url=====>",image_url) + print("image_url=====>",image_url,'===>',type(image_url)) guardian.image = image_url - print("guardian.image=====>", guardian.image) + print("guardian.image=====>", guardian.image,'===>',type(guardian.image)) guardian.save() return guardian @@ -146,13 +146,11 @@ class CreateGuardianSerializer(serializers.ModelSerializer): class TaskSerializer(serializers.ModelSerializer): class Meta(object): model = JuniorTask - fields = ['task_name','task_description','points', 'due_date', 'junior', 'image'] + fields = ['task_name','task_description','points', 'due_date', 'junior', 'default_image'] def create(self, validated_data): validated_data['guardian'] = Guardian.objects.filter(user=self.context['user']).last() images = self.context['image'] - validated_data['image'] = images - print("images===>",images) - print("validated_data===>",validated_data) + validated_data['default_image'] = images # if 'http' in str(images): # validated_data['image'] = images # else: @@ -192,8 +190,8 @@ class TaskDetailsSerializer(serializers.ModelSerializer): junior = JuniorDetailSerializer() class Meta(object): model = JuniorTask - fields = ['id', 'guardian', 'task_name', 'task_description', 'points', 'due_date', 'image','junior', - 'task_status', 'is_active'] + fields = ['id', 'guardian', 'task_name', 'task_description', 'points', 'due_date','default_image', 'image', + 'junior', 'task_status', 'is_active', 'created_at','updated_at'] diff --git a/guardian/utils.py b/guardian/utils.py index a4e1ffc..46a8071 100644 --- a/guardian/utils.py +++ b/guardian/utils.py @@ -10,5 +10,9 @@ def upload_image_to_alibaba(image, filename): bucket = oss2.Bucket(auth, settings.ALIYUN_OSS_ENDPOINT, settings.ALIYUN_OSS_BUCKET_NAME) # Upload the temporary file to Alibaba OSS bucket.put_object_from_file(filename, temp_file.name) - return f"https://{settings.ALIYUN_OSS_BUCKET_NAME}.{settings.ALIYUN_OSS_ENDPOINT}/{filename}" + print("filename====>",filename,'===>',type(filename)) + new_filename = filename.replace(' ', '%20') + print() + print("filename====>", filename, '===>', type(filename)) + return f"https://{settings.ALIYUN_OSS_BUCKET_NAME}.{settings.ALIYUN_OSS_ENDPOINT}/{new_filename}" diff --git a/guardian/views.py b/guardian/views.py index 9a4ab78..900734e 100644 --- a/guardian/views.py +++ b/guardian/views.py @@ -2,6 +2,7 @@ """Third party Django app""" from rest_framework.permissions import IsAuthenticated from rest_framework import viewsets, status +from rest_framework.pagination import PageNumberPagination from django.db.models import Max """Import Django app""" from .serializers import (UserSerializer, CreateGuardianSerializer, TaskSerializer, TaskDetailsSerializer, @@ -64,35 +65,34 @@ class AllTaskListAPIView(viewsets.ModelViewSet): def list(self, request, *args, **kwargs): """Create guardian profile""" queryset = JuniorTask.objects.filter(guardian__user=request.user) - print("queryset==>",queryset) serializer = TaskDetailsSerializer(queryset, many=True) - print("serializer.data===>",serializer.data) return custom_response(None, serializer.data, response_status=status.HTTP_200_OK) class TaskListAPIView(viewsets.ModelViewSet): """Update guardian profile""" serializer_class = TaskDetailsSerializer permission_classes = [IsAuthenticated] + pagination_class = PageNumberPagination def list(self, request, *args, **kwargs): """Create guardian profile""" - print("request.GET.get(status)==>",self.request.GET.get('status')) status_value = self.request.GET.get('status') if status_value == 0: - queryset = JuniorTask.objects.filter(guardian__user=request.user) + queryset = JuniorTask.objects.filter(guardian__user=request.user).order_by('created_at') else: queryset = JuniorTask.objects.filter(guardian__user=request.user, - task_status=status_value) - print("queryset==>",queryset) - serializer = TaskDetailsSerializer(queryset, many=True) - print("serializer.data===>",serializer.data) + task_status=status_value).order_by('due_date','created_at') + paginator = self.pagination_class() + paginated_queryset = paginator.paginate_queryset(queryset, request) + serializer = TaskDetailsSerializer(paginated_queryset, many=True) return custom_response(None, serializer.data, response_status=status.HTTP_200_OK) + class CreateTaskAPIView(viewsets.ModelViewSet): """create task for junior""" serializer_class = TaskSerializer def create(self, request, *args, **kwargs): - image = request.data['image'] + image = request.data['default_image'] data = request.data if 'https' in str(image): image_data = image @@ -100,7 +100,7 @@ class CreateTaskAPIView(viewsets.ModelViewSet): filename = f"images/{image}" image_url = upload_image_to_alibaba(image, filename) image_data = image_url - data.pop('image') + data.pop('default_image') serializer = TaskSerializer(context={"user":request.user, "image":image_data}, data=data) if serializer.is_valid(): serializer.save() @@ -112,21 +112,17 @@ class SearchTaskListAPIView(viewsets.ModelViewSet): """Update guardian profile""" serializer_class = TaskDetailsSerializer permission_classes = [IsAuthenticated] + pagination_class = PageNumberPagination def list(self, request, *args, **kwargs): """Create guardian profile""" - due_date = self.request.GET.get('due_date') - print("request.GET.get(status)==>",self.request.GET.get('status')) - if self.request.GET.get('status'): - queryset = JuniorTask.objects.filter(guardian__user=request.user, - task_status=self.request.GET.get('status')).order_by('due_date') - if due_date: - queryset = JuniorTask.objects.filter(guardian__user=request.user, - due_date=due_date).order_by('due_date').order_by('created_at') - - print("queryset==>",queryset) - serializer = TaskDetailsSerializer(queryset, many=True) - # print("serializer.data===>",serializer.data) + title = self.request.GET.get('title') + if title: + queryset = JuniorTask.objects.filter(guardian__user=request.user, task_name__icontains=title)\ + .order_by('due_date','created_at') + paginator = self.pagination_class() + paginated_queryset = paginator.paginate_queryset(queryset, request) + serializer = TaskDetailsSerializer(paginated_queryset, many=True) return custom_response(None, serializer.data, response_status=status.HTTP_200_OK) @@ -144,11 +140,10 @@ class TopJuniorListAPIView(viewsets.ModelViewSet): junior_ids = [item['junior'] for item in junior_ids_with_total_points] - juniors = Junior.objects.filter(id__in=junior_ids) \ - .annotate(max_points=Max('junior_task__points')) \ - .order_by('-max_points', 'id') + juniors = Junior.objects.filter(id__in=junior_ids) - serializer = self.get_serializer(juniors, many=True, context={'junior_ids_with_total_points': junior_ids_with_total_points}) + serializer = self.get_serializer(juniors, many=True, context={'junior_ids_with_total_points': + junior_ids_with_total_points}) return custom_response(serializer.data, response_status=status.HTTP_200_OK) # diff --git a/zod_bank/settings.py b/zod_bank/settings.py index 60c3e70..3a897cb 100644 --- a/zod_bank/settings.py +++ b/zod_bank/settings.py @@ -92,8 +92,9 @@ REST_FRAMEWORK = { 'DEFAULT_AUTHENTICATION_CLASSES': [ # 'rest_framework.authentication.SessionAuthentication', 'rest_framework.authentication.BasicAuthentication', - 'rest_framework_simplejwt.authentication.JWTAuthentication', -] + 'rest_framework_simplejwt.authentication.JWTAuthentication',], + 'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.PageNumberPagination', + 'PAGE_SIZE': 5, # Set the default pagination size } SIMPLE_JWT = { 'ACCESS_TOKEN_LIFETIME': timedelta(minutes=50), From 2edd8c4e0065e0ce20226774fa73c0f06fd51772 Mon Sep 17 00:00:00 2001 From: jain Date: Thu, 6 Jul 2023 15:52:30 +0530 Subject: [PATCH 5/8] jira-15 and email otp validation --- account/serializers.py | 10 ++++++++-- account/urls.py | 4 ++-- account/views.py | 26 ++++++++++++++++++++++++++ base/messages.py | 3 ++- guardian/views.py | 6 +++++- 5 files changed, 43 insertions(+), 6 deletions(-) diff --git a/account/serializers.py b/account/serializers.py index 70808f3..9380ba8 100644 --- a/account/serializers.py +++ b/account/serializers.py @@ -135,7 +135,10 @@ class GuardianSerializer(serializers.ModelSerializer): def get_user_type(self, obj): """user type""" - return GUARDIAN + email_verified = UserEmailOtp.objects.filter(email=obj.user.username).last() + if email_verified and email_verified.user_type != None: + return email_verified.user_type + return '2' def get_auth(self, obj): """user email address""" @@ -172,7 +175,10 @@ class JuniorSerializer(serializers.ModelSerializer): return access_token def get_user_type(self, obj): - return JUNIOR + email_verified = UserEmailOtp.objects.filter(email=obj.auth.username).last() + if email_verified and email_verified.user_type != None: + return email_verified.user_type + return '1' def get_auth(self, obj): return obj.auth.username diff --git a/account/urls.py b/account/urls.py index e0e1c6c..74098c2 100644 --- a/account/urls.py +++ b/account/urls.py @@ -14,8 +14,8 @@ router = routers.SimpleRouter() router.register('user', UserLogin, basename='user') router.register('admin', UserLogin, basename='admin') router.register('google-login', GoogleLoginViewSet, basename='admin') -router.register('send-phone-otp', SendPhoneOtp, basename='send-phone-otp') -router.register('user-phone-verification', UserPhoneVerification, basename='user-phone-verification') +# router.register('send-phone-otp', SendPhoneOtp, basename='send-phone-otp') +# router.register('user-phone-verification', UserPhoneVerification, basename='user-phone-verification') router.register('user-email-verification', UserEmailVerification, basename='user-email-verification') router.register('resend-email-otp', ReSendEmailOtp, basename='resend-email-otp') urlpatterns = [ diff --git a/account/views.py b/account/views.py index f992a05..3c006d7 100644 --- a/account/views.py +++ b/account/views.py @@ -1,3 +1,5 @@ +from datetime import datetime, timedelta + from rest_framework import viewsets, status, views from rest_framework.decorators import action import random @@ -182,9 +184,16 @@ class ForgotPasswordAPIView(views.APIView): 'verification_code': verification_code } ) + + expiry = datetime.today() + timedelta(days=1) + print("expiry===>", expiry, '===>', type(expiry)) user_data, created = UserEmailOtp.objects.get_or_create(email=email) + if created: + user_data.expired_at = expiry + user_data.save() if user_data: user_data.otp = verification_code + user_data.expired_at = expiry user_data.save() return custom_response(SUCCESS_CODE['3015'], response_status=status.HTTP_200_OK) @@ -246,6 +255,7 @@ class UserLogin(viewsets.ViewSet): email_verified = UserEmailOtp.objects.filter(email=username).last() refresh = RefreshToken.for_user(user) access_token = str(refresh.access_token) + print("email_verified.user_type==>",email_verified.user_type) data = {"auth_token":access_token, "is_profile_complete": False, "user_type": email_verified.user_type, } @@ -292,6 +302,15 @@ class UserEmailVerification(viewsets.ModelViewSet): email_data = UserEmailOtp.objects.filter(email=self.request.GET.get('email'), otp=self.request.GET.get('otp')).last() if email_data: + input_datetime_str = str(email_data.expired_at) + input_format = "%Y-%m-%d %H:%M:%S.%f%z" + output_format = "%Y-%m-%d %H:%M:%S.%f" + input_datetime = datetime.strptime(input_datetime_str, input_format) + output_datetime_str = input_datetime.strftime(output_format) + format_str = "%Y-%m-%d %H:%M:%S.%f" + datetime_obj = datetime.strptime(output_datetime_str, format_str) + if datetime.today() > datetime_obj: + return custom_error_response(ERROR_CODE["2029"], response_status=status.HTTP_400_BAD_REQUEST) email_data.is_verified = True email_data.save() if email_data.user_type == '1': @@ -315,12 +334,19 @@ class UserEmailVerification(viewsets.ModelViewSet): class ReSendEmailOtp(viewsets.ModelViewSet): """Send otp on phone""" + serializer_class = EmailVerificationSerializer def create(self, request, *args, **kwargs): otp = generate_otp() if User.objects.filter(email=request.data['email']): + expiry = datetime.today() + timedelta(days=1) + print("expiry===>", expiry, '===>', type(expiry)) email_data, created = UserEmailOtp.objects.get_or_create(email=request.data['email']) + if created: + email_data.expired_at = expiry + email_data.save() if email_data: email_data.otp = otp + email_data.expired_at = expiry email_data.save() send_otp_email(request.data['email'], otp) return custom_response(SUCCESS_CODE['3016'], response_status=status.HTTP_200_OK) diff --git a/base/messages.py b/base/messages.py index dc6392a..f024a3d 100644 --- a/base/messages.py +++ b/base/messages.py @@ -51,7 +51,8 @@ ERROR_CODE = { "2025": "Invalid input. Expected a list of strings.", "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" + "2028": "You are not authorized person to sign up on this platform", + "2029": "Validity of otp verification is expired" } SUCCESS_CODE = { # Success code for password diff --git a/guardian/views.py b/guardian/views.py index 900734e..6b7bf9b 100644 --- a/guardian/views.py +++ b/guardian/views.py @@ -4,6 +4,7 @@ from rest_framework.permissions import IsAuthenticated from rest_framework import viewsets, status from rest_framework.pagination import PageNumberPagination from django.db.models import Max +from datetime import datetime, timedelta """Import Django app""" from .serializers import (UserSerializer, CreateGuardianSerializer, TaskSerializer, TaskDetailsSerializer, TopJuniorSerializer) @@ -30,7 +31,10 @@ class SignupViewset(viewsets.ModelViewSet): serializer.save() """Generate otp""" otp = generate_otp() - UserEmailOtp.objects.create(email=request.data['email'], otp=otp, user_type=str(request.data['user_type'])) + expiry = datetime.today() + timedelta(days=1) + print("expiry===>", expiry, '===>', type(expiry)) + UserEmailOtp.objects.create(email=request.data['email'], otp=otp, + user_type=str(request.data['user_type']), expired_at=expiry) """Send email to the register user""" send_otp_email(request.data['email'], otp) return custom_response(SUCCESS_CODE['3001'], {"email_otp": otp}, From 3b642fcc5f7717f02a014b6114b18ae3cada9c0c Mon Sep 17 00:00:00 2001 From: jain Date: Thu, 6 Jul 2023 16:08:43 +0530 Subject: [PATCH 6/8] changes in requirement file --- account/serializers.py | 1 - account/views.py | 3 --- guardian/serializers.py | 38 -------------------------------------- guardian/views.py | 33 --------------------------------- junior/serializers.py | 10 ---------- junior/views.py | 1 - requirements.txt | 5 +++++ 7 files changed, 5 insertions(+), 86 deletions(-) diff --git a/account/serializers.py b/account/serializers.py index 9380ba8..5d688b4 100644 --- a/account/serializers.py +++ b/account/serializers.py @@ -169,7 +169,6 @@ class JuniorSerializer(serializers.ModelSerializer): auth_token = serializers.SerializerMethodField('get_auth_token') def get_auth_token(self, obj): - print("obj===>",obj,'===>',type(obj)) refresh = RefreshToken.for_user(obj.auth) access_token = str(refresh.access_token) return access_token diff --git a/account/views.py b/account/views.py index 3c006d7..fd0cef2 100644 --- a/account/views.py +++ b/account/views.py @@ -186,7 +186,6 @@ class ForgotPasswordAPIView(views.APIView): ) expiry = datetime.today() + timedelta(days=1) - print("expiry===>", expiry, '===>', type(expiry)) user_data, created = UserEmailOtp.objects.get_or_create(email=email) if created: user_data.expired_at = expiry @@ -255,7 +254,6 @@ class UserLogin(viewsets.ViewSet): email_verified = UserEmailOtp.objects.filter(email=username).last() refresh = RefreshToken.for_user(user) access_token = str(refresh.access_token) - print("email_verified.user_type==>",email_verified.user_type) data = {"auth_token":access_token, "is_profile_complete": False, "user_type": email_verified.user_type, } @@ -339,7 +337,6 @@ class ReSendEmailOtp(viewsets.ModelViewSet): otp = generate_otp() if User.objects.filter(email=request.data['email']): expiry = datetime.today() + timedelta(days=1) - print("expiry===>", expiry, '===>', type(expiry)) email_data, created = UserEmailOtp.objects.get_or_create(email=request.data['email']) if created: email_data.expired_at = expiry diff --git a/guardian/serializers.py b/guardian/serializers.py index a55c320..f85affc 100644 --- a/guardian/serializers.py +++ b/guardian/serializers.py @@ -6,8 +6,6 @@ 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 django.core.validators import URLValidator -from django.core.exceptions import ValidationError """Import Django app""" from .models import Guardian, JuniorTask from account.models import UserProfile, UserEmailOtp @@ -129,9 +127,7 @@ class CreateGuardianSerializer(serializers.ModelSerializer): if image: filename = f"images/{image.name}" image_url = upload_image_to_alibaba(image, filename) - print("image_url=====>",image_url,'===>',type(image_url)) guardian.image = image_url - print("guardian.image=====>", guardian.image,'===>',type(guardian.image)) guardian.save() return guardian @@ -226,37 +222,3 @@ class TopJuniorSerializer(serializers.ModelSerializer): return item['total_points'] return 0 -# -# class TopJuniorSerializer(serializers.ModelSerializer): -# total_points = serializers.SerializerMethodField() -# -# email = serializers.SerializerMethodField('get_auth') -# first_name = serializers.SerializerMethodField('get_first_name') -# last_name = serializers.SerializerMethodField('get_last_name') -# -# -# def get_auth(self, obj): -# return obj.auth.username -# -# def get_first_name(self, obj): -# return obj.auth.first_name -# -# def get_last_name(self, obj): -# print("onbj==>",obj) -# return obj.auth.last_name -# -# class Meta: -# model = Junior -# fields = ['id', 'email', 'first_name', 'last_name', 'phone', 'country_code', 'country_name', 'gender', 'dob', 'image', 'junior_code', 'guardian_code', 'referral_code', 'referral_code_used', 'is_active', 'is_complete_profile', 'passcode', 'is_verified', 'created_at', 'updated_at', 'total_points'] -# -# def get_total_points(self, obj): -# total_highest_points = self.context.get('total_highest_points') -# if total_highest_points: -# print("total_highest_points==>",total_highest_points) -# junior_id = obj.id -# print("junior_id==>", junior_id) -# total_points = next((item['total_points'] for item in total_highest_points if item['junior'] == junior_id), 0) -# print("total_points==>", total_points) -# return total_points -# return 0 -# diff --git a/guardian/views.py b/guardian/views.py index 6b7bf9b..5418565 100644 --- a/guardian/views.py +++ b/guardian/views.py @@ -32,7 +32,6 @@ class SignupViewset(viewsets.ModelViewSet): """Generate otp""" otp = generate_otp() expiry = datetime.today() + timedelta(days=1) - print("expiry===>", expiry, '===>', type(expiry)) 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""" @@ -150,35 +149,3 @@ class TopJuniorListAPIView(viewsets.ModelViewSet): junior_ids_with_total_points}) return custom_response(serializer.data, response_status=status.HTTP_200_OK) -# -# class TopJuniorListAPIView(viewsets.ModelViewSet): -# """Top juniors list""" -# serializer_class = TopJuniorSerializer -# # permission_classes = [IsAuthenticated] -# -# def list(self, request, *args, **kwargs): -# """fetch junior list those complete their task""" -# total_highest_points = list(JuniorTask.objects.filter(task_status=1) -# .values('junior') -# .annotate(total_points=Sum('points')) -# .order_by('-total_points')) -# print("total_highest_points===>",total_highest_points,'===>',type(total_highest_points)) -# junior_ids = [item['junior'] for item in total_highest_points] -# print("junior_ids====>", junior_ids) -# juniors = Junior.objects.filter(id__in=junior_ids) -# # a = [] -# # for i in junior_ids: -# # juniors = Junior.objects.filter(id=i) -# # a.append(juniors) -# print("juniors====>", juniors) -# # print('a===>',a,'==>',type(a)) -# serializer = self.get_serializer(juniors, context={'total_highest_points': total_highest_points}, many=True) -# print("serializer====>",type(serializer.data)) -# # Find the junior with the highest points -# # highest_points_junior = max(serializer.data, key=lambda x: x['total_points']) -# -# return custom_response(serializer.data, response_status=status.HTTP_200_OK) -# # serializer = self.get_serializer(total_highest_points, many=True) -# # return custom_response(None, serializer.data,response_status=status.HTTP_200_OK) - - diff --git a/junior/serializers.py b/junior/serializers.py index 8e871cd..5802a9c 100644 --- a/junior/serializers.py +++ b/junior/serializers.py @@ -61,15 +61,6 @@ class CreateJuniorSerializer(serializers.ModelSerializer): """Create junior profile""" image = validated_data.get('image', None) guardian_code = validated_data.get('guardian_code',None) - print("guardian_code===>",guardian_code,'==>',type(guardian_code)) - - - - # phone_number = validated_data.get('phone', None) - # guardian_data = Guardian.objects.filter(phone=phone_number) - # junior_data = Junior.objects.filter(phone=phone_number) - # if phone_number and (junior_data or guardian_data): - # raise serializers.ValidationError({"details":ERROR_CODE['2012']}) user = User.objects.filter(username=self.context['user']).last() if user: """Save first and last name of junior""" @@ -167,7 +158,6 @@ class JuniorDetailListSerializer(serializers.ModelSerializer): return obj.auth.last_name def get_assigned_task(self, obj): - print("obj===>",obj,'type==>',type(obj)) data = JuniorTask.objects.filter(junior=obj).count() return data diff --git a/junior/views.py b/junior/views.py index fd2555e..89c177f 100644 --- a/junior/views.py +++ b/junior/views.py @@ -48,6 +48,5 @@ 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)) - print("queryset===>",queryset) serializer = JuniorDetailListSerializer(queryset, many=True) return custom_response(None, serializer.data, response_status=status.HTTP_200_OK) diff --git a/requirements.txt b/requirements.txt index 1103c6a..5dd7f76 100644 --- a/requirements.txt +++ b/requirements.txt @@ -19,6 +19,8 @@ click==8.1.3 click-didyoumean==0.3.0 click-plugins==1.1.1 click-repl==0.3.0 +coreapi==2.3.3 +coreschema==0.0.4 crcmod==1.7 cron-descriptor==1.4.0 cryptography==41.0.1 @@ -43,8 +45,11 @@ google-auth==2.21.0 gunicorn==20.1.0 idna==3.4 inflection==0.5.1 +itypes==1.2.0 +Jinja2==3.1.2 jmespath==0.10.0 kombu==5.3.1 +MarkupSafe==2.1.3 msgpack==1.0.5 oss2==2.18.0 packaging==23.1 From c7a5bf68a0853ff654f08de0f14778a7857dd9dc Mon Sep 17 00:00:00 2001 From: jain Date: Thu, 6 Jul 2023 16:17:56 +0530 Subject: [PATCH 7/8] jira-15 remove commented code --- guardian/serializers.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/guardian/serializers.py b/guardian/serializers.py index f85affc..0241874 100644 --- a/guardian/serializers.py +++ b/guardian/serializers.py @@ -147,12 +147,6 @@ class TaskSerializer(serializers.ModelSerializer): validated_data['guardian'] = Guardian.objects.filter(user=self.context['user']).last() images = self.context['image'] validated_data['default_image'] = images - # if 'http' in str(images): - # validated_data['image'] = images - # else: - # filename = f"images/{images.name}" - # image_url = upload_image_to_alibaba(images, filename) - # validated_data['image'] = image_url instance = JuniorTask.objects.create(**validated_data) return instance From 34034dcdb84ded897b42aadbfeecdf4cf11241c0 Mon Sep 17 00:00:00 2001 From: jain Date: Thu, 6 Jul 2023 16:20:07 +0530 Subject: [PATCH 8/8] jira-15 remove commented code --- guardian/utils.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/guardian/utils.py b/guardian/utils.py index 46a8071..66a36ca 100644 --- a/guardian/utils.py +++ b/guardian/utils.py @@ -10,9 +10,6 @@ def upload_image_to_alibaba(image, filename): bucket = oss2.Bucket(auth, settings.ALIYUN_OSS_ENDPOINT, settings.ALIYUN_OSS_BUCKET_NAME) # Upload the temporary file to Alibaba OSS bucket.put_object_from_file(filename, temp_file.name) - print("filename====>",filename,'===>',type(filename)) new_filename = filename.replace(' ', '%20') - print() - print("filename====>", filename, '===>', type(filename)) return f"https://{settings.ALIYUN_OSS_BUCKET_NAME}.{settings.ALIYUN_OSS_ENDPOINT}/{new_filename}"