Merge pull request #330 from KiwiTechLLC/ZBKBCK-52

modified get article card current page method
This commit is contained in:
dilipshrivastwa-kiwi
2023-09-13 13:40:10 +05:30
committed by GitHub
2 changed files with 4 additions and 2 deletions

View File

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

View File

@ -279,7 +279,8 @@ class ArticleCardListViewSet(viewsets.ModelViewSet):
try:
queryset = self.get_queryset()
# article card list
serializer = ArticleCardlistSerializer(queryset, context={"user": self.request.user}, many=True)
serializer = ArticleCardlistSerializer(queryset, context={"user": self.request.user,
"card_count": queryset.count()}, 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)