diff --git a/apps/common/api/mixin.py b/apps/common/api/mixin.py index 0473bea0c..c10fde7b1 100644 --- a/apps/common/api/mixin.py +++ b/apps/common/api/mixin.py @@ -7,6 +7,7 @@ from typing import Callable from django.db import models from django.db.models.signals import m2m_changed +from common.utils import is_uuid from rest_framework.request import Request from rest_framework.response import Response from rest_framework.settings import api_settings @@ -95,6 +96,13 @@ class QuerySetMixin: request: Request get_serializer_class: Callable get_queryset: Callable + slug_field = 'name' + + def get_object(self): + pk = self.kwargs.get(self.lookup_field) + if not pk or is_uuid(pk) or pk.isdigit(): + return super().get_object() + return self.get_queryset().get(**{self.slug_field: pk}) def get_queryset(self): return super().get_queryset() diff --git a/apps/users/api/user.py b/apps/users/api/user.py index 122f9e7fa..6b49dfd4a 100644 --- a/apps/users/api/user.py +++ b/apps/users/api/user.py @@ -51,12 +51,7 @@ class UserViewSet(CommonApiMixin, UserQuerysetMixin, SuggestionMixin, BulkModelV 'remove': 'users.remove_user', 'bulk_remove': 'users.remove_user', } - - def get_object(self): - pk = self.kwargs.get(self.lookup_field) - if not is_uuid(pk): - return self.get_queryset().get(username=pk) - return super().get_object() + slug_field = 'username' def allow_bulk_destroy(self, qs, filtered): is_valid = filtered.count() < qs.count()