0001-api_views-provide-a-default-slug-for-roles-22251.patch

Paul Marillonnet, 17 septembre 2020 15:05

Voir les différences: en ligne côte à côte

Subject: [PATCH] api_views: provide a default slug for roles (#22251)

 src/authentic2/api_views.py | 40 ++++++++++++++++++++++++++-----------
 tests/test_api.py           | 29 +++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 12 deletions(-)

     from django_rbac.utils import get_ou_model, get_role_model
     from rest_framework import serializers, pagination
     from rest_framework.validators import UniqueTogetherValidator
     from rest_framework.views import APIView
     from rest_framework.viewsets import ModelViewSet
     from rest_framework.routers import SimpleRouter
-...
             exclude = ('user_permissions', 'groups')
     class SlugFromNameDefault:
         requires_context = False
         serializer_instance = None
         def set_context(self, instance):
             self.serializer_instance = instance
         def __call__(self):
             name = self.serializer_instance.context['request'].data.get('name', '')
             return slugify(name)
     class RoleSerializer(serializers.ModelSerializer):
         ou = serializers.SlugRelatedField(
             many=False,
-...
             default=CreateOnlyDefault(get_default_ou),
             queryset=get_ou_model().objects.all(),
             slug_field='slug')
         slug = serializers.SlugField(
             required=False,
             allow_blank=False,
             max_length=256,
             default=SlugFromNameDefault())
         @property
         def user(self):
-...
             model = get_role_model()
             fields = ('uuid', 'name', 'slug', 'ou',)
             extra_kwargs = {'uuid': {'read_only': True}}
             validators = [
                 UniqueTogetherValidator(
                     queryset=get_role_model().objects.all(),
                     fields=['name', 'ou']
                 ),
                 UniqueTogetherValidator(
                     queryset=get_role_model().objects.all(),
                     fields=['slug', 'ou']
+                )
+            ]
     # override to handle ambiguous naive DateTime on DST change
-...
     role_memberships = RoleMembershipsAPI.as_view()
     class SlugFromNameDefault:
         requires_context = False
         serializer_instance = None
         def set_context(self, instance):
             self.serializer_instance = instance
         def __call__(self):
             name = self.serializer_instance.context['request'].data.get('name', '')
             return slugify(name)
     class BaseOrganizationalUnitSerializer(serializers.ModelSerializer):
         slug = serializers.SlugField(
                 required=False,

         assert role.ou == get_default_ou()
     def test_api_post_role_no_slug(app, superuser):
         app.authorization = ('Basic', (superuser.username, superuser.username))
         Role = get_role_model()
         role_data = {
             'name': 'Some Role',
+            }
         resp = app.post_json('/api/roles/', params=role_data)
         uuid = resp.json['uuid']
         role = Role.objects.get(uuid=uuid)
         assert role.slug == slugify(role.name)
         assert role.slug == slugify(role_data['name'])
         # another call with same role name
         role_data = {
             'name': 'Some Role',
+            }
         resp = app.post_json('/api/roles/', params=role_data, status=400)
         assert resp.json['errors']['__all__'] == [
                 'The fields name, ou must make a unique set.',
                 'The fields slug, ou must make a unique set.',
+            ]
         # no slug no name
         role_data = {
             'id': 42,
+            }
         resp = app.post_json('/api/roles/', params=role_data, status=400)
         assert resp.json['errors']['name'] == ['This field is required.']
     def test_api_post_ou_no_slug(app, superuser):
         app.authorization = ('Basic', (superuser.username, superuser.username))
         OU = get_ou_model()
+    -

Projet

Général

Profil

Produits Entr'ouvert » Authentic 2

0001-api_views-provide-a-default-slug-for-roles-22251.patch