From 130dcd83e7da56885386929193545bf8ba08514e Mon Sep 17 00:00:00 2001 From: jain Date: Tue, 18 Jul 2023 16:56:24 +0530 Subject: [PATCH] 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