diff --git a/api/filters.py b/api/filters.py index b8cac86..fa2055d 100644 --- a/api/filters.py +++ b/api/filters.py @@ -14,6 +14,7 @@ class UserFilter(django_filters.FilterSet): "last_name", "first_name", "email", + "verified", "is_active", "id_card", "mobile", diff --git a/api/serializers.py b/api/serializers.py index 424adcc..b204c99 100644 --- a/api/serializers.py +++ b/api/serializers.py @@ -6,6 +6,21 @@ from django.contrib.auth.models import Permission from rest_framework import serializers +class IslandSerializer(serializers.ModelSerializer): + class Meta: # type: ignore + model = Island + fields = "__all__" + + +class AtollSerializer(serializers.ModelSerializer): + islands = IslandSerializer(many=True, read_only=True) + + class Meta: # type: ignore + model = Atoll + fields = "__all__" + depth = 2 + + class CustomUserSerializer(serializers.ModelSerializer): """serializer for the user object""" @@ -58,11 +73,16 @@ class CustomReadOnlyUserSerializer(serializers.ModelSerializer): "email", "first_name", "last_name", + "atoll", + "island", + "dob", + "verified", "username", "mobile", "address", "id_card", ) + depth = 1 class CustomReadOnlyUserByIDCardSerializer(serializers.ModelSerializer): @@ -135,21 +155,6 @@ class KnoxTokenSerializer(serializers.ModelSerializer): fields = "__all__" -class IslandSerializer(serializers.ModelSerializer): - class Meta: # type: ignore - model = Island - fields = "__all__" - - -class AtollSerializer(serializers.ModelSerializer): - islands = IslandSerializer(many=True, read_only=True) - - class Meta: # type: ignore - model = Atoll - fields = "__all__" - depth = 2 - - class OTPVerificationSerializer(serializers.Serializer): mobile = serializers.CharField(required=True, allow_blank=False) otp = serializers.CharField(required=True, allow_blank=False)