ammar/zod-backend
1
0
Fork 0
mirror of https://github.com/HamzaSha1/zod-backend.git synced 2025-08-26 06:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #293 from KiwiTechLLC/dev

Browse Source 
Dev
This commit is contained in:
Ankitajain-kiwi
2023-08-29 20:00:01 +05:30
committed by GitHub
parent 7cf3481ec6 f7624bc1e7
commit 674493e1ad
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
account/views.py
View File

@ -322,7 +322,7 @@ class ForgotPasswordAPIView(views.APIView):
send_all_email.delay( send_all_email.delay(
'email_reset_verification.email', email, verification_code 'email_reset_verification.email', email, verification_code
) )
expiry = OTP_EXPIRY expiry = timezone.now() + timezone.timedelta(days=1)
user_data, created = UserEmailOtp.objects.get_or_create( user_data, created = UserEmailOtp.objects.get_or_create(
email=email email=email
) )

6
junior/views.py
View File

@ -219,7 +219,7 @@ class AddJuniorAPIView(viewsets.ModelViewSet):
return False return False
if not junior.guardian_code: if not junior.guardian_code:
junior.guardian_code = [guardian.guardian_code] junior.guardian_code = [guardian.guardian_code]
if type(junior.guardian_code) is list and len(junior.guardian_code) < 3: elif type(junior.guardian_code) is list and len(junior.guardian_code) < 3:
junior.guardian_code.append(guardian.guardian_code) junior.guardian_code.append(guardian.guardian_code)
else: else:
return "Max" return "Max"
@ -595,8 +595,8 @@ class StartAssessmentAPIView(viewsets.ModelViewSet):
article_id = self.request.GET.get('article_id') article_id = self.request.GET.get('article_id')
# if referral_code: # if referral_code:
article = Article.objects.filter(id=article_id, is_deleted=False).prefetch_related( article = Article.objects.filter(id=article_id, is_deleted=False).prefetch_related(
'article_cards', 'article_survey', 'article_survey__options' 'article_survey'
).order_by('-created_at') )
return article return article
def list(self, request, *args, **kwargs): def list(self, request, *args, **kwargs):
"""Params """Params

3
web_admin/serializers/article_serializer.py
View File

@ -306,8 +306,9 @@ class StartAssessmentSerializer(serializers.ModelSerializer):
"""current page""" """current page"""
context_data = self.context.get('user') context_data = self.context.get('user')
data = JuniorArticle.objects.filter(junior__auth=context_data, article=obj).last() data = JuniorArticle.objects.filter(junior__auth=context_data, article=obj).last()
total_count = obj.article_survey.all().count()
if data: if data:
return data.current_que_page return data.current_que_page if data.current_que_page < total_count else data.current_que_page - 1
return NUMBER['zero'] return NUMBER['zero']
class Meta(object): class Meta(object):
""" """