add parent_role

apps/authorization/api/v1/api.py

@@ -30,6 +30,8 @@ class RoleViewSet(SoftDeleteMixin, viewsets.ModelViewSet):
 
     queryset = Role.objects.all()
     serializer_class = RoleSerializer
+    filter_backends = [filters.SearchFilter]
+    search_fields = ['role_name', 'type__name']
 
 
 class PageViewSet(SoftDeleteMixin, viewsets.ModelViewSet):
@@ -132,12 +134,13 @@ class UserRelationViewSet(BaseViewSet, SoftDeleteMixin, viewsets.ModelViewSet, D
         'user__username',
         'user__mobile',
         'user__phone',
+        'user__first_name',
+        'user__last_name',
         'user__national_code',
         'user__province__name',
+        'user__city__name',
         'user__unit_name',
         'user__unit_national_id',
-        'user__city__name',
-        'role__name'
     ]
 
     def list(self, request, *args, **kwargs):
@@ -148,7 +151,7 @@ class UserRelationViewSet(BaseViewSet, SoftDeleteMixin, viewsets.ModelViewSet, D
         else:
             queryset = self.get_queryset().order_by('-create_date')
 
-        queryset = self.filter_query(queryset)  # noqa
+        queryset = self.filter_queryset(queryset)  # noqa
 
         page = self.paginate_queryset(queryset)
         if page is not None:

apps/authorization/api/v1/serializers.py

@@ -90,6 +90,7 @@ class RoleSerializer(serializers.ModelSerializer):
         fields = [
             'id',
             'role_name',
+            'parent_role',
             'description',
             'type',
             'permissions'  # noqa