From 11c84208b753f8ef536bcaa0efbf55fbb450f503 Mon Sep 17 00:00:00 2001 From: jain Date: Thu, 10 Aug 2023 19:00:37 +0530 Subject: [PATCH 1/2] task points --- junior/serializers.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/junior/serializers.py b/junior/serializers.py index 8b0f9be..a6eff8d 100644 --- a/junior/serializers.py +++ b/junior/serializers.py @@ -184,8 +184,10 @@ class JuniorDetailListSerializer(serializers.ModelSerializer): return data.position return 99999 def get_points(self, obj): - data = sum(JuniorTask.objects.filter(junior=obj, task_status=COMPLETED).values_list('points', flat=True)) - return data + data = JuniorPoints.objects.filter(junior=obj).last() + if data: + return data.total_points + return NUMBER['zero'] def get_in_progress_task(self, obj): data = JuniorTask.objects.filter(junior=obj, task_status=IN_PROGRESS).count() @@ -210,7 +212,7 @@ class JuniorDetailListSerializer(serializers.ModelSerializer): class Meta(object): """Meta info""" model = Junior - fields = ['id', 'email', 'first_name', 'last_name', 'country_code', 'phone', 'gender', 'dob', + fields = ['id', 'email', 'first_name', 'last_name', 'country_code', 'country_name', 'phone', 'gender', 'dob', 'guardian_code', 'referral_code','is_active', 'is_complete_profile', 'created_at', 'image', 'updated_at', 'assigned_task','points', 'pending_task', 'in_progress_task', 'completed_task', 'requested_task', 'rejected_task', 'position', 'is_invited', 'guardian_code_status'] From fbd6f9ece52d456c3bc9d41a4d7be26395c1d6b2 Mon Sep 17 00:00:00 2001 From: jain Date: Thu, 10 Aug 2023 19:05:33 +0530 Subject: [PATCH 2/2] task points --- junior/serializers.py | 1 - 1 file changed, 1 deletion(-) diff --git a/junior/serializers.py b/junior/serializers.py index a6eff8d..57a821b 100644 --- a/junior/serializers.py +++ b/junior/serializers.py @@ -182,7 +182,6 @@ class JuniorDetailListSerializer(serializers.ModelSerializer): data = JuniorPoints.objects.filter(junior=obj).last() if data: return data.position - return 99999 def get_points(self, obj): data = JuniorPoints.objects.filter(junior=obj).last() if data: