fixed guardian reject issue, updated ids in notification method, remove unnecessary condition from analytics and user management

This commit is contained in:
abutalib-kiwi
2023-09-13 18:15:07 +05:30
parent e157e98a17
commit d1a4b86b09
9 changed files with 27 additions and 34 deletions

View File

@ -263,7 +263,7 @@ class AddJuniorAPIView(viewsets.ModelViewSet):
if jun_data:
jun_data.relationship = str(self.request.data['relationship'])
jun_data.save()
send_notification.delay(ASSOCIATE_EXISTING_JUNIOR, self.request.user.id, GUARDIAN, junior.auth.id, {})
send_notification.delay(ASSOCIATE_EXISTING_JUNIOR, guardian.user_id, GUARDIAN, junior.auth_id, {})
return True
@ -362,7 +362,7 @@ class RemoveJuniorAPIView(views.APIView):
# save serializer
serializer.save()
JuniorGuardianRelationship.objects.filter(guardian=guardian, junior=junior_queryset).delete()
send_notification.delay(REMOVE_JUNIOR, None, None, junior_queryset.auth.id, {})
send_notification.delay(REMOVE_JUNIOR, None, None, junior_queryset.auth_id, {})
return custom_response(SUCCESS_CODE['3022'], serializer.data, response_status=status.HTTP_200_OK)
return custom_error_response(serializer.errors, response_status=status.HTTP_400_BAD_REQUEST)
else: