From 11605540d77f95f2cfbd2b517dd818d45bf2ac81 Mon Sep 17 00:00:00 2001 From: jain Date: Thu, 24 Aug 2023 13:18:23 +0530 Subject: [PATCH] remove guardian code request --- junior/serializers.py | 9 ++------- junior/views.py | 25 +++---------------------- 2 files changed, 5 insertions(+), 29 deletions(-) diff --git a/junior/serializers.py b/junior/serializers.py index 48eaea9..379b393 100644 --- a/junior/serializers.py +++ b/junior/serializers.py @@ -499,8 +499,6 @@ class ReAssignTaskSerializer(serializers.ModelSerializer): instance.save() return instance - - class RemoveGuardianCodeSerializer(serializers.ModelSerializer): """User task Serializer""" class Meta(object): @@ -508,11 +506,8 @@ class RemoveGuardianCodeSerializer(serializers.ModelSerializer): model = Junior fields = ('id', ) def update(self, instance, validated_data): - guardian_code = self.context['guardian_code'] - if self.instance and guardian_code in self.instance.guardian_code: - instance.guardian_code.remove(guardian_code) - if len(instance.guardian_code) == 0: - instance.guardian_code_status = str(NUMBER['one']) + instance.guardian_code = None + instance.guardian_code_status = str(NUMBER['one']) instance.save() return instance diff --git a/junior/views.py b/junior/views.py index 8b44e93..2abd61d 100644 --- a/junior/views.py +++ b/junior/views.py @@ -725,29 +725,10 @@ class RemoveGuardianCodeAPIView(views.APIView): def put(self, request, format=None): try: - user_type = request.META.get('HTTP_USER_TYPE') - junior_id = request.data.get('junior_id') - guardian_id = request.data.get('guardian_id') - my_dict = {} - if user_type and str(user_type) == str(NUMBER['one']) and guardian_id: - queryset = Junior.objects.filter(auth__email=self.request.user, is_active=True, is_deleted=False).last() - guardian_code = Guardian.objects.filter(id=guardian_id).last().guardian_code - my_dict.update({"guardian_code": guardian_code}) - elif user_type and str(user_type) == str(NUMBER['two']) and junior_id: - guardian_code = Guardian.objects.filter(user=self.request.user, - is_active=True, is_deleted=False).last().guardian_code - queryset = Junior.objects.filter(id=junior_id).last() - my_dict.update({"guardian_code": guardian_code}) - else: - return custom_error_response( - ERROR_CODE["2069"], - response_status=status.HTTP_400_BAD_REQUEST - ) - if queryset: + junior_queryset = Junior.objects.filter(auth=self.request.user).last() + if junior_queryset: # use RemoveGuardianCodeSerializer serializer - serializer = RemoveGuardianCodeSerializer(queryset, data=request.data, - context=my_dict, - partial=True) + serializer = RemoveGuardianCodeSerializer(junior_queryset, data=request.data, partial=True) if serializer.is_valid(): # save serializer serializer.save()