ammar/zod-backend
1
0
Fork 0
mirror of https://github.com/HamzaSha1/zod-backend.git synced 2025-07-17 02:45:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #277 from KiwiTechLLC/sprint6-bugs

Browse Source 
Sprint6 bugs
This commit is contained in:
dilipshrivastwa-kiwi
2023-08-28 10:48:48 +05:30
committed by GitHub
parent 3dc8268b07 e57344e54f
commit 685a822e52
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
junior/serializers.py
View File

@ -171,6 +171,7 @@ class JuniorDetailListSerializer(serializers.ModelSerializer):
rejected_task = serializers.SerializerMethodField('get_rejected_task')
pending_task = serializers.SerializerMethodField('get_pending_task')
position = serializers.SerializerMethodField('get_position')
guardian_code_status = serializers.SerializerMethodField('get_guardian_code_status')
def get_auth(self, obj):
@ -215,6 +216,13 @@ class JuniorDetailListSerializer(serializers.ModelSerializer):
def get_pending_task(self, obj):
data = JuniorTask.objects.filter(junior=obj, task_status=PENDING).count()
return data
def get_guardian_code_status(self, obj):
if self.context['guardian_code'] in obj.guardian_code:
index = obj.guardian_code.index(self.context['guardian_code'])
if obj.guardian_code_status:
data = obj.guardian_code_status[index]
return data
class Meta(object):
"""Meta info"""
model = Junior

3
junior/views.py
View File

@ -152,7 +152,8 @@ class JuniorListAPIView(viewsets.ModelViewSet):
queryset = self.get_queryset()
queryset = queryset.filter(guardian_code__icontains=str(guardian_data.guardian_code))
# use JuniorDetailListSerializer serializer
serializer = JuniorDetailListSerializer(queryset, many=True)
serializer = JuniorDetailListSerializer(queryset, context={"guardian_code":
guardian_data.guardian_code}, many=True)
return custom_response(None, serializer.data, response_status=status.HTTP_200_OK)
return custom_error_response(ERROR_CODE['2045'], response_status=status.HTTP_200_OK)
except Exception as e: