0004-api-add-category-parameter-on-add-agenda-endpoint-57.patch

Nicolas Roche, 08 octobre 2021 10:43

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

Subject: [PATCH 4/5] api: add category parameter on add agenda endpoint
 (#57670)

 chrono/api/serializers.py | 10 +++++++++-
 tests/api/test_all.py     |  7 +++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

     from django.contrib.auth.models import Group
     from django.utils.translation import ugettext_lazy as _
     from rest_framework import serializers
     from rest_framework.exceptions import ValidationError
     from chrono.agendas.models import AbsenceReason, Agenda, Booking, Event
     from chrono.agendas.models import AbsenceReason, Agenda, Booking, Category, Event
     class StringOrListField(serializers.ListField):
         def to_internal_value(self, data):
             if isinstance(data, str):
                 data = [s.strip() for s in data.split(',') if s.strip()]
             return super().to_internal_value(data)
-...
                 'pricing',
                 'url',
+            ]
     class AgendaSerializer(serializers.ModelSerializer):
         edit_role = serializers.CharField(required=False, max_length=150)
         view_role = serializers.CharField(required=False, max_length=150)
         category = serializers.SlugField(required=False, max_length=160)
         class Meta:
             model = Agenda
             fields = [
                 'slug',
                 'label',
                 'kind',
                 'minimal_booking_delay',
                 'minimal_booking_delay_in_working_days',
                 'maximal_booking_delay',
                 'anonymize_delay',
                 'edit_role',
                 'view_role',
                 'category',
+            ]
         def get_role(self, value):
             try:
                 return Group.objects.get(name=value)
             except Group.DoesNotExist:
                 raise serializers.ValidationError(_('unknown role: %s' % value))
         def validate_edit_role(self, value):
             return self.get_role(value)
         def validate_view_role(self, value):
             return self.get_role(value)
         def validate_category(self, value):
             try:
                 return Category.objects.get(slug=value)
             except Category.DoesNotExist:
                 raise serializers.ValidationError(_('unknown category: %s' % value))
         def validate(self, attrs):
             super().validate(attrs)
             if attrs['minimal_booking_delay_in_working_days'] and attrs.get('kind', 'events') != 'events':
                 raise ValidationError(
+                    {
                         'minimal_booking_delay_in_working_days': _('Option not available on %s agenda')
                         % attrs['kind']
+                    }

                     },
                 },
+            ]
+        }
     @pytest.mark.freeze_time('2021-07-09')
     def test_add_agenda(app, user, settings):
         category_a = Category.objects.create(label='Category A')
         api_url = '/api/agenda/'
         # no authentication
         resp = app.post(api_url, status=401)
         assert resp.json['detail'] == 'Authentication credentials were not provided.'
         # wrong password
         app.authorization = ('Basic', ('john.doe', 'wrong'))
-...
             'label': 'foo',
             'slug': 'foo',
             'kind': 'oups',
             'minimal_booking_delay': 'oups',
             'minimal_booking_delay_in_working_days': 'oups',
             'anonymize_delay': 'oups',
             'edit_role': 'oups',
             'view_role': 'plop',
             'category': 'oups',
+        }
         resp = app.post(api_url, params=params, status=400)
         assert resp.json['err']
         assert resp.json['errors'] == {
             'kind': ['"oups" is not a valid choice.'],
             'minimal_booking_delay': ['A valid integer is required.'],
             'minimal_booking_delay_in_working_days': ['Must be a valid boolean.'],
             'anonymize_delay': ['A valid integer is required.'],
             'edit_role': ['unknown role: oups'],
             'view_role': ['unknown role: plop'],
             'category': ['unknown category: oups'],
+        }
         # slug already used
         meeting_agenda = Agenda(label='Foo bar Meeting', kind='meetings')
         meeting_agenda.save()
         params = {
             'label': 'foo',
             'slug': meeting_agenda.slug,
-...
             'label': 'foo Meetings',
             'slug': 'foo-meetings',
             'kind': 'meetings',
             'minimal_booking_delay': 1,
             'maximal_booking_delay': 3,
             'anonymize_delay': 30,
             'edit_role': 'Edit',
             'view_role': 'View',
             'category': 'category-a',
+        }
         resp = app.post(api_url, params=params)
         assert not resp.json['err']
         assert len(resp.json['data']) == 1
         agenda = Agenda.objects.get(slug='foo-meetings')
         assert agenda.min_booking_datetime.date() == datetime.date(2021, 7, 10)
         assert agenda.edit_role == edit_group
         assert agenda.view_role == view_group
         assert agenda.category == category_a
         # add an events agenda
         params = {
             'label': 'foo Events',
             'slug': 'foo-events',
             'kind': 'events',
             'minimal_booking_delay': 1,
             'minimal_booking_delay_in_working_days': True,
             'maximal_booking_delay': 3,
             'anonymize_delay': 30,
             'edit_role': 'Edit',
             'view_role': 'View',
             'category': 'category-a',
+        }
         resp = app.post(api_url, params=params)
         assert not resp.json['err']
         assert len(resp.json['data']) == 1
         agenda = Agenda.objects.get(slug='foo-events')
         assert agenda.min_booking_datetime.date() == datetime.date(2021, 7, 12)
         assert agenda.edit_role == edit_group
         assert agenda.view_role == view_group
         assert agenda.category == category_a
+    -

Projet

Général

Profil

Produits Entr'ouvert » Chrono

0004-api-add-category-parameter-on-add-agenda-endpoint-57.patch