mirror of
https://github.com/HamzaSha1/zod-backend.git
synced 2025-07-15 10:05:21 +00:00
article card api, check answer api
This commit is contained in:
@ -286,6 +286,8 @@ class AddJuniorSerializer(serializers.ModelSerializer):
|
|||||||
guardian_code_status=GUARDIAN_CODE_STATUS[1][0])
|
guardian_code_status=GUARDIAN_CODE_STATUS[1][0])
|
||||||
JuniorGuardianRelationship.objects.create(guardian=guardian_data, junior=junior_data,
|
JuniorGuardianRelationship.objects.create(guardian=guardian_data, junior=junior_data,
|
||||||
relationship=relationship)
|
relationship=relationship)
|
||||||
|
total_junior = Junior.objects.all().count()
|
||||||
|
JuniorPoints.objects.create(junior=junior_data, position=total_junior)
|
||||||
"""Generate otp"""
|
"""Generate otp"""
|
||||||
otp_value = generate_otp()
|
otp_value = generate_otp()
|
||||||
expiry_time = timezone.now() + timezone.timedelta(days=1)
|
expiry_time = timezone.now() + timezone.timedelta(days=1)
|
||||||
@ -479,3 +481,4 @@ class ReAssignTaskSerializer(serializers.ModelSerializer):
|
|||||||
instance.requested_on = None
|
instance.requested_on = None
|
||||||
instance.save()
|
instance.save()
|
||||||
return instance
|
return instance
|
||||||
|
|
||||||
|
@ -4,7 +4,8 @@ from django.urls import path, include
|
|||||||
from .views import (UpdateJuniorProfile, ValidateGuardianCode, JuniorListAPIView, AddJuniorAPIView,
|
from .views import (UpdateJuniorProfile, ValidateGuardianCode, JuniorListAPIView, AddJuniorAPIView,
|
||||||
InvitedJuniorAPIView, FilterJuniorAPIView, RemoveJuniorAPIView, JuniorTaskListAPIView,
|
InvitedJuniorAPIView, FilterJuniorAPIView, RemoveJuniorAPIView, JuniorTaskListAPIView,
|
||||||
CompleteJuniorTaskAPIView, JuniorPointsListAPIView, ValidateReferralCode,
|
CompleteJuniorTaskAPIView, JuniorPointsListAPIView, ValidateReferralCode,
|
||||||
InviteGuardianAPIView, StartTaskAPIView, ReAssignJuniorTaskAPIView, StartArticleAPIView)
|
InviteGuardianAPIView, StartTaskAPIView, ReAssignJuniorTaskAPIView, StartArticleAPIView,
|
||||||
|
StartAssessmentAPIView, CheckAnswerAPIView)
|
||||||
"""Third party import"""
|
"""Third party import"""
|
||||||
from rest_framework import routers
|
from rest_framework import routers
|
||||||
|
|
||||||
@ -43,6 +44,10 @@ router.register('validate-referral-code', ValidateReferralCode, basename='valida
|
|||||||
router.register('invite-guardian', InviteGuardianAPIView, basename='invite-guardian')
|
router.register('invite-guardian', InviteGuardianAPIView, basename='invite-guardian')
|
||||||
# start article"""
|
# start article"""
|
||||||
router.register('start-article', StartArticleAPIView, basename='start-article')
|
router.register('start-article', StartArticleAPIView, basename='start-article')
|
||||||
|
# start assessment api"""
|
||||||
|
router.register('start-assessment', StartAssessmentAPIView, basename='start-assessment')
|
||||||
|
# check answer api"""
|
||||||
|
router.register('check-answer', CheckAnswerAPIView, basename='check-answer')
|
||||||
# Define url pattern"""
|
# Define url pattern"""
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
path('api/v1/', include(router.urls)),
|
path('api/v1/', include(router.urls)),
|
||||||
|
@ -50,7 +50,7 @@ def junior_approval_mail(guardian, full_name):
|
|||||||
def update_positions_based_on_points():
|
def update_positions_based_on_points():
|
||||||
"""Update position of the junior"""
|
"""Update position of the junior"""
|
||||||
# First, retrieve all the JuniorPoints instances ordered by total_points in descending order.
|
# First, retrieve all the JuniorPoints instances ordered by total_points in descending order.
|
||||||
juniors_points = JuniorPoints.objects.order_by('-total_points')
|
juniors_points = JuniorPoints.objects.order_by('-total_points', 'updated_at')
|
||||||
|
|
||||||
# Now, iterate through the queryset and update the position field based on the order.
|
# Now, iterate through the queryset and update the position field based on the order.
|
||||||
position = 1
|
position = 1
|
||||||
|
@ -6,6 +6,7 @@ from rest_framework.permissions import IsAuthenticated
|
|||||||
from rest_framework.pagination import PageNumberPagination
|
from rest_framework.pagination import PageNumberPagination
|
||||||
from django.contrib.auth.models import User
|
from django.contrib.auth.models import User
|
||||||
from rest_framework.filters import SearchFilter
|
from rest_framework.filters import SearchFilter
|
||||||
|
from django.db.models import F
|
||||||
|
|
||||||
import datetime
|
import datetime
|
||||||
import requests
|
import requests
|
||||||
@ -41,6 +42,8 @@ from .utils import update_positions_based_on_points
|
|||||||
from notifications.utils import send_notification
|
from notifications.utils import send_notification
|
||||||
from notifications.constants import REMOVE_JUNIOR
|
from notifications.constants import REMOVE_JUNIOR
|
||||||
from web_admin.models import Article, ArticleSurvey, SurveyOption
|
from web_admin.models import Article, ArticleSurvey, SurveyOption
|
||||||
|
from web_admin.serializers.article_serializer import (ArticleSerializer, ArticleListSerializer,
|
||||||
|
StartAssessmentSerializer)
|
||||||
""" Define APIs """
|
""" Define APIs """
|
||||||
# Define validate guardian code API,
|
# Define validate guardian code API,
|
||||||
# update junior profile,
|
# update junior profile,
|
||||||
@ -351,6 +354,7 @@ class JuniorPointsListAPIView(viewsets.ModelViewSet):
|
|||||||
|
|
||||||
def get_queryset(self):
|
def get_queryset(self):
|
||||||
"""get queryset"""
|
"""get queryset"""
|
||||||
|
update_positions_based_on_points()
|
||||||
return JuniorTask.objects.filter(junior__auth__email=self.request.user).last()
|
return JuniorTask.objects.filter(junior__auth__email=self.request.user).last()
|
||||||
def list(self, request, *args, **kwargs):
|
def list(self, request, *args, **kwargs):
|
||||||
"""profile view"""
|
"""profile view"""
|
||||||
@ -358,7 +362,6 @@ class JuniorPointsListAPIView(viewsets.ModelViewSet):
|
|||||||
try:
|
try:
|
||||||
queryset = self.get_queryset()
|
queryset = self.get_queryset()
|
||||||
# update position of junior
|
# update position of junior
|
||||||
update_positions_based_on_points()
|
|
||||||
serializer = JuniorPointsSerializer(queryset)
|
serializer = JuniorPointsSerializer(queryset)
|
||||||
return custom_response(None, serializer.data, response_status=status.HTTP_200_OK)
|
return custom_response(None, serializer.data, response_status=status.HTTP_200_OK)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
@ -488,3 +491,57 @@ class StartArticleAPIView(viewsets.ModelViewSet):
|
|||||||
return custom_response(SUCCESS_CODE['3040'], response_status=status.HTTP_200_OK)
|
return custom_response(SUCCESS_CODE['3040'], response_status=status.HTTP_200_OK)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
return custom_error_response(str(e), response_status=status.HTTP_400_BAD_REQUEST)
|
return custom_error_response(str(e), response_status=status.HTTP_400_BAD_REQUEST)
|
||||||
|
|
||||||
|
class StartAssessmentAPIView(viewsets.ModelViewSet):
|
||||||
|
"""Junior Points viewset"""
|
||||||
|
serializer_class = StartAssessmentSerializer
|
||||||
|
permission_classes = [IsAuthenticated]
|
||||||
|
http_method_names = ('get',)
|
||||||
|
|
||||||
|
def get_queryset(self):
|
||||||
|
article_id = self.request.GET.get('article_id')
|
||||||
|
# if referral_code:
|
||||||
|
article = Article.objects.filter(id=article_id, is_deleted=False).prefetch_related(
|
||||||
|
'article_cards', 'article_survey', 'article_survey__options'
|
||||||
|
).order_by('-created_at')
|
||||||
|
return article
|
||||||
|
def list(self, request, *args, **kwargs):
|
||||||
|
"""profile view"""
|
||||||
|
|
||||||
|
try:
|
||||||
|
queryset = self.get_queryset()
|
||||||
|
paginator = self.pagination_class()
|
||||||
|
paginated_queryset = paginator.paginate_queryset(queryset, request)
|
||||||
|
serializer = self.serializer_class(paginated_queryset, context={"user":request.user}, many=True)
|
||||||
|
return custom_response(None, serializer.data, response_status=status.HTTP_200_OK)
|
||||||
|
except Exception as e:
|
||||||
|
return custom_error_response(str(e), response_status=status.HTTP_400_BAD_REQUEST)
|
||||||
|
|
||||||
|
class CheckAnswerAPIView(viewsets.ModelViewSet):
|
||||||
|
"""Junior Points viewset"""
|
||||||
|
permission_classes = [IsAuthenticated]
|
||||||
|
http_method_names = ('get',)
|
||||||
|
|
||||||
|
def get_queryset(self):
|
||||||
|
question_id = self.request.GET.get('question_id')
|
||||||
|
article = ArticleSurvey.objects.filter(id=question_id).last()
|
||||||
|
return article
|
||||||
|
def list(self, request, *args, **kwargs):
|
||||||
|
"""profile view"""
|
||||||
|
|
||||||
|
try:
|
||||||
|
answer_id = self.request.GET.get('answer_id')
|
||||||
|
queryset = self.get_queryset()
|
||||||
|
submit_ans = SurveyOption.objects.filter(id=answer_id, is_answer=True).last()
|
||||||
|
junior_article_points = JuniorArticlePoints.objects.filter(junior__auth=self.request.user,
|
||||||
|
question=queryset)
|
||||||
|
if submit_ans:
|
||||||
|
junior_article_points.update(submitted_answer=submit_ans, is_attempt=True, is_answer_correct=True)
|
||||||
|
JuniorPoints.objects.filter(junior__auth=self.request.user).update(total_points=
|
||||||
|
F('total_points')+ queryset.points)
|
||||||
|
else:
|
||||||
|
junior_article_points.update(submitted_answer=submit_ans, is_attempt=True, earn_points=0,
|
||||||
|
is_answer_correct=False)
|
||||||
|
return custom_response(None, response_status=status.HTTP_200_OK)
|
||||||
|
except Exception as e:
|
||||||
|
return custom_error_response(str(e), response_status=status.HTTP_400_BAD_REQUEST)
|
||||||
|
@ -12,7 +12,7 @@ from base.messages import ERROR_CODE
|
|||||||
from guardian.utils import upload_image_to_alibaba
|
from guardian.utils import upload_image_to_alibaba
|
||||||
from web_admin.models import Article, ArticleCard, SurveyOption, ArticleSurvey, DefaultArticleCardImage
|
from web_admin.models import Article, ArticleCard, SurveyOption, ArticleSurvey, DefaultArticleCardImage
|
||||||
from web_admin.utils import pop_id, get_image_url
|
from web_admin.utils import pop_id, get_image_url
|
||||||
|
from junior.models import JuniorArticlePoints
|
||||||
USER = get_user_model()
|
USER = get_user_model()
|
||||||
|
|
||||||
|
|
||||||
@ -64,7 +64,7 @@ class ArticleSurveySerializer(serializers.ModelSerializer):
|
|||||||
meta class
|
meta class
|
||||||
"""
|
"""
|
||||||
model = ArticleSurvey
|
model = ArticleSurvey
|
||||||
fields = ('id', 'question', 'options')
|
fields = ('id', 'question', 'options', 'points')
|
||||||
|
|
||||||
|
|
||||||
class ArticleSerializer(serializers.ModelSerializer):
|
class ArticleSerializer(serializers.ModelSerializer):
|
||||||
@ -220,6 +220,7 @@ class ArticleListSerializer(serializers.ModelSerializer):
|
|||||||
serializer for article API
|
serializer for article API
|
||||||
"""
|
"""
|
||||||
article_cards = ArticleCardSerializer(many=True)
|
article_cards = ArticleCardSerializer(many=True)
|
||||||
|
article_survey = ArticleSurveySerializer(many=True)
|
||||||
total_points = serializers.SerializerMethodField('get_total_points')
|
total_points = serializers.SerializerMethodField('get_total_points')
|
||||||
is_completed = serializers.SerializerMethodField('get_is_completed')
|
is_completed = serializers.SerializerMethodField('get_is_completed')
|
||||||
|
|
||||||
@ -228,7 +229,7 @@ class ArticleListSerializer(serializers.ModelSerializer):
|
|||||||
meta class
|
meta class
|
||||||
"""
|
"""
|
||||||
model = Article
|
model = Article
|
||||||
fields = ('id', 'title', 'description', 'article_cards', 'total_points', 'is_completed')
|
fields = ('id', 'title', 'description', 'article_cards', 'article_survey', 'total_points', 'is_completed')
|
||||||
|
|
||||||
def get_total_points(self, obj):
|
def get_total_points(self, obj):
|
||||||
"""total points of article"""
|
"""total points of article"""
|
||||||
@ -238,3 +239,56 @@ class ArticleListSerializer(serializers.ModelSerializer):
|
|||||||
def get_is_completed(self, obj):
|
def get_is_completed(self, obj):
|
||||||
"""complete all question"""
|
"""complete all question"""
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
class ArticleQuestionSerializer(serializers.ModelSerializer):
|
||||||
|
"""
|
||||||
|
article survey serializer
|
||||||
|
"""
|
||||||
|
id = serializers.IntegerField(required=False)
|
||||||
|
options = SurveyOptionSerializer(many=True)
|
||||||
|
is_attempt = serializers.SerializerMethodField('get_is_attempt')
|
||||||
|
|
||||||
|
def get_is_attempt(self, obj):
|
||||||
|
"""attempt question or not"""
|
||||||
|
context_data = self.context.get('user')
|
||||||
|
junior_article_obj = JuniorArticlePoints.objects.filter(junior__auth=context_data, question=obj).last()
|
||||||
|
if junior_article_obj:
|
||||||
|
return junior_article_obj.is_attempt
|
||||||
|
return False
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
"""
|
||||||
|
meta class
|
||||||
|
"""
|
||||||
|
model = ArticleSurvey
|
||||||
|
fields = ('id', 'question', 'options', 'points', 'is_attempt')
|
||||||
|
|
||||||
|
class StartAssessmentSerializer(serializers.ModelSerializer):
|
||||||
|
"""
|
||||||
|
serializer for article API
|
||||||
|
"""
|
||||||
|
article_survey = ArticleQuestionSerializer(many=True)
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
"""
|
||||||
|
meta class
|
||||||
|
"""
|
||||||
|
model = Article
|
||||||
|
fields = ('article_survey',)
|
||||||
|
|
||||||
|
|
||||||
|
class CheckAnswerSerializer(serializers.ModelSerializer):
|
||||||
|
"""
|
||||||
|
serializer for article API
|
||||||
|
"""
|
||||||
|
article_survey = ArticleSurveySerializer(many=True)
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
"""
|
||||||
|
meta class
|
||||||
|
"""
|
||||||
|
model = ArticleSurvey
|
||||||
|
fields = ('id', 'article_survey')
|
||||||
|
|
||||||
|
def create(self, validated_data):
|
||||||
|
"""create function"""
|
||||||
|
@ -6,7 +6,8 @@ from django.urls import path, include
|
|||||||
from rest_framework import routers
|
from rest_framework import routers
|
||||||
|
|
||||||
# local imports
|
# local imports
|
||||||
from web_admin.views.article import ArticleViewSet, DefaultArticleCardImagesViewSet, ArticleListViewSet
|
from web_admin.views.article import (ArticleViewSet, DefaultArticleCardImagesViewSet, ArticleListViewSet,
|
||||||
|
ArticleCardListViewSet)
|
||||||
from web_admin.views.auth import ForgotAndResetPasswordViewSet
|
from web_admin.views.auth import ForgotAndResetPasswordViewSet
|
||||||
from web_admin.views.user_management import UserManagementViewSet
|
from web_admin.views.user_management import UserManagementViewSet
|
||||||
|
|
||||||
@ -17,6 +18,7 @@ router.register('article', ArticleViewSet, basename='article')
|
|||||||
router.register('default-card-images', DefaultArticleCardImagesViewSet, basename='default-card-images')
|
router.register('default-card-images', DefaultArticleCardImagesViewSet, basename='default-card-images')
|
||||||
router.register('user-management', UserManagementViewSet, basename='user')
|
router.register('user-management', UserManagementViewSet, basename='user')
|
||||||
router.register('article-list', ArticleListViewSet, basename='article-list')
|
router.register('article-list', ArticleListViewSet, basename='article-list')
|
||||||
|
router.register('article-card-list', ArticleCardListViewSet, basename='article-card-list')
|
||||||
# forgot and reset password api for admin
|
# forgot and reset password api for admin
|
||||||
router.register('admin', ForgotAndResetPasswordViewSet, basename='admin')
|
router.register('admin', ForgotAndResetPasswordViewSet, basename='admin')
|
||||||
|
|
||||||
|
@ -4,7 +4,7 @@ web_admin views file
|
|||||||
# django imports
|
# django imports
|
||||||
from rest_framework.viewsets import GenericViewSet, mixins
|
from rest_framework.viewsets import GenericViewSet, mixins
|
||||||
from rest_framework.filters import OrderingFilter, SearchFilter
|
from rest_framework.filters import OrderingFilter, SearchFilter
|
||||||
from rest_framework import status
|
from rest_framework import status, viewsets
|
||||||
from rest_framework.decorators import action
|
from rest_framework.decorators import action
|
||||||
from rest_framework.permissions import IsAuthenticated, AllowAny
|
from rest_framework.permissions import IsAuthenticated, AllowAny
|
||||||
from django.contrib.auth import get_user_model
|
from django.contrib.auth import get_user_model
|
||||||
@ -16,7 +16,8 @@ from base.messages import SUCCESS_CODE, ERROR_CODE
|
|||||||
from web_admin.models import Article, ArticleCard, ArticleSurvey, DefaultArticleCardImage
|
from web_admin.models import Article, ArticleCard, ArticleSurvey, DefaultArticleCardImage
|
||||||
from web_admin.permission import AdminPermission
|
from web_admin.permission import AdminPermission
|
||||||
from web_admin.serializers.article_serializer import (ArticleSerializer, ArticleCardSerializer,
|
from web_admin.serializers.article_serializer import (ArticleSerializer, ArticleCardSerializer,
|
||||||
DefaultArticleCardImageSerializer, ArticleListSerializer)
|
DefaultArticleCardImageSerializer, ArticleListSerializer
|
||||||
|
)
|
||||||
|
|
||||||
USER = get_user_model()
|
USER = get_user_model()
|
||||||
|
|
||||||
@ -224,4 +225,24 @@ class ArticleListViewSet(GenericViewSet, mixins.ListModelMixin):
|
|||||||
paginator = self.pagination_class()
|
paginator = self.pagination_class()
|
||||||
paginated_queryset = paginator.paginate_queryset(queryset, request)
|
paginated_queryset = paginator.paginate_queryset(queryset, request)
|
||||||
serializer = self.serializer_class(paginated_queryset, many=True)
|
serializer = self.serializer_class(paginated_queryset, many=True)
|
||||||
return custom_response(None, data=serializer.data, count=count)
|
return custom_response(None, data=serializer.data)
|
||||||
|
|
||||||
|
class ArticleCardListViewSet(viewsets.ModelViewSet):
|
||||||
|
"""Junior Points viewset"""
|
||||||
|
serializer_class = ArticleCardSerializer
|
||||||
|
permission_classes = [IsAuthenticated]
|
||||||
|
http_method_names = ('get',)
|
||||||
|
|
||||||
|
def get_queryset(self):
|
||||||
|
"""get queryset"""
|
||||||
|
return ArticleCard.objects.filter(article=self.request.GET.get('article_id'))
|
||||||
|
def list(self, request, *args, **kwargs):
|
||||||
|
"""profile view"""
|
||||||
|
|
||||||
|
try:
|
||||||
|
queryset = self.get_queryset()
|
||||||
|
# article card list
|
||||||
|
serializer = ArticleCardSerializer(queryset, many=True)
|
||||||
|
return custom_response(None, serializer.data, response_status=status.HTTP_200_OK)
|
||||||
|
except Exception as e:
|
||||||
|
return custom_error_response(str(e), response_status=status.HTTP_400_BAD_REQUEST)
|
||||||
|
Reference in New Issue
Block a user