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

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

10
web_admin/serializers/user_management_serializer.py
View File

@ -50,8 +50,6 @@ class UserManagementListSerializer(serializers.ModelSerializer):
return profile.country_code if profile.country_code else None
elif profile := obj.junior_profile.all().first():
return profile.country_code if profile.country_code else None
else:
return None
@staticmethod
def get_phone(obj):
@ -63,8 +61,6 @@ class UserManagementListSerializer(serializers.ModelSerializer):
return profile.phone if profile.phone else None
elif profile := obj.junior_profile.all().first():
return profile.phone if profile.phone else None
else:
return None
@staticmethod
def get_user_type(obj):
@ -76,8 +72,6 @@ class UserManagementListSerializer(serializers.ModelSerializer):
return dict(USER_TYPE).get('2')
elif obj.junior_profile.all().first():
return dict(USER_TYPE).get('1')
else:
return None
@staticmethod
def get_is_active(obj):
@ -89,8 +83,6 @@ class UserManagementListSerializer(serializers.ModelSerializer):
return profile.is_active
elif profile := obj.junior_profile.all().first():
return profile.is_active
else:
return obj.is_active
class GuardianSerializer(serializers.ModelSerializer):
@ -292,5 +284,3 @@ class UserManagementDetailSerializer(serializers.ModelSerializer):
is_verified=True).select_related('user')
serializer = GuardianSerializer(guardian, many=True)
return serializer.data
else:
return None