0001-api-APIError-handling-51181.patch

     # You should have received a copy of the GNU Affero General Public License
     # along with this program.  If not, see <http://www.gnu.org/licenses/>.
     from django.utils.encoding import force_text
     from rest_framework.response import Response as DRFResponse
     from rest_framework.views import exception_handler as DRF_exception_handler
     class Response(DRFResponse):
-...
             if data is not None and 'err_class' in data:
                 data['reason'] = data['err_class']
             super(Response, self).__init__(data=data, *args, **kwargs)
     class APIError(Exception):
         err = 1
         http_status = 200
         def __init__(self, *args, **kwargs):
             self.__dict__.update(kwargs)
             super(APIError, self).__init__(*args)
         def to_response(self):
             data = {
                 'err': self.err,
                 'err_class': self.err_class,
                 'err_desc': force_text(self),
+            }
             if hasattr(self, 'errors'):
                 data['errors'] = self.errors
             return Response(data, status=self.http_status)
     def exception_handler(exc, context):
         if isinstance(exc, APIError):
             return exc.to_response()
         return DRF_exception_handler(exc, context)

     from rest_framework.views import APIView
     from chrono.api.utils import Response
     from chrono.api.utils import Response, APIError
     from ..agendas.models import Agenda, Event, Booking, MeetingType, TimePeriodException, Desk, BookingColor
     from ..interval import IntervalSet
     class APIError(Exception):
         err = 1
         http_status = 200
         def __init__(self, *args, **kwargs):
             self.__dict__.update(kwargs)
             super(APIError, self).__init__(*args)
         def to_response(self):
             data = {
                 'err': self.err,
                 'err_class': self.err_class,
                 'err_desc': force_text(self),
+            }
             if hasattr(self, 'errors'):
                 data['errors'] = self.errors
             return Response(data, status=self.http_status)
     def format_response_datetime(dt):
         return localtime(dt).strftime('%Y-%m-%d %H:%M:%S')
-...
             date_start, date_end = request.GET.get('date_start'), request.GET.get('date_end')
             if date_start:
                 date_start = make_aware(datetime.datetime.combine(parse_date(date_start), datetime.time(0, 0)))
                 try:
                     date_start = make_aware(
                         datetime.datetime.combine(parse_date(date_start), datetime.time(0, 0))
+                    )
                 except TypeError:
                     raise APIError(
                         _('date_start format must be YYYY-MM-DD'),
                         err_class='date_start format must be YYYY-MM-DD',
                         http_status=status.HTTP_400_BAD_REQUEST,
+                    )
             if date_end:
                 date_end = make_aware(datetime.datetime.combine(parse_date(date_end), datetime.time(0, 0)))
                 try:
                     date_end = make_aware(datetime.datetime.combine(parse_date(date_end), datetime.time(0, 0)))
                 except TypeError:
                     raise APIError(
                         _('date_end format must be YYYY-MM-DD'),
                         err_class='date_end format must be YYYY-MM-DD',
                         http_status=status.HTTP_400_BAD_REQUEST,
+                    )
             entries = agenda.get_open_events(annotate_queryset=True, min_start=date_start, max_start=date_end)
-...
             now_datetime = now()
             try:
                 resources = get_resources_from_request(request, agenda)
             except APIError as e:
                 return e.to_response()
             resources = get_resources_from_request(request, agenda)
             start_datetime = None
             if 'date_start' in request.GET:
-...
                     start_datetime = make_aware(
                         datetime.datetime.combine(parse_date(request.GET['date_start']), datetime.time(0, 0))
+                    )
                 except TypeError as e:
                 except TypeError:
                     raise APIError(
                         _('date_start format must be YYYY-MM-DD'),
                         err_class='date_start format must be YYYY-MM-DD',
-...
                     end_datetime = make_aware(
                         datetime.datetime.combine(parse_date(request.GET['date_end']), datetime.time(0, 0))
+                    )
                 except TypeError as e:
                 except TypeError:
                     raise APIError(
                         _('date_end format must be YYYY-MM-DD'),
                         err_class='date_end format must be YYYY-MM-DD',
-...
         serializer_class = SlotsSerializer
         def post(self, request, agenda_identifier=None, event_identifier=None, format=None):
             try:
                 return self.fillslot(request=request, agenda_identifier=agenda_identifier, format=format)
             except APIError as e:
                 return e.to_response()
             return self.fillslot(request=request, agenda_identifier=agenda_identifier, format=format)
         def fillslot(self, request, agenda_identifier=None, slots=[], format=None):
             multiple_booking = bool(not slots)
-...
                             http_status=status.HTTP_400_BAD_REQUEST,
+                        )
                 try:
                     resources = get_resources_from_request(request, agenda)
                 except APIError as e:
                     return e.to_response()
                 resources = get_resources_from_request(request, agenda)
                 # get all free slots and separate them by desk
                 try:
-...
         serializer_class = SlotSerializer
         def post(self, request, agenda_identifier=None, event_identifier=None, format=None):
             try:
                 return self.fillslot(
                     request=request,
                     agenda_identifier=agenda_identifier,
                     slots=[event_identifier],  # fill a "list on one slot"
                     format=format,
+                )
             except APIError as e:
                 return e.to_response()
             return self.fillslot(
                 request=request,
                 agenda_identifier=agenda_identifier,
                 slots=[event_identifier],  # fill a "list on one slot"
                 format=format,
+            )
     fillslot = Fillslot.as_view()

     SMS_URL = ''
     SMS_SENDER = ''
     REST_FRAMEWORK = {'EXCEPTION_HANDLER': 'chrono.api.utils.exception_handler'}
     local_settings_file = os.environ.get(
         'CHRONO_SETTINGS_FILE', os.path.join(os.path.dirname(__file__), 'local_settings.py')
+    )

tests/settings.py
5	5
6	6	REST_FRAMEWORK = {
7	7	'DEFAULT_AUTHENTICATION_CLASSES': ['rest_framework.authentication.BasicAuthentication'],
	8	'EXCEPTION_HANDLER': 'chrono.api.utils.exception_handler',
8	9	}
9	10
10	11	DATABASES = {

                 event_dt = datetime.datetime.combine(day, datetime.datetime.strptime(event, '%H:%M').time())
                 Event.objects.create(agenda=agenda2, start_datetime=make_aware(event_dt), places=2)
         params = {'date_start': 'foo'}
         resp = app.get('/api/agenda/%s/datetimes/' % agenda2.slug, params=params, status=400)
         assert resp.json['err'] == 1
         assert resp.json['err_class'] == 'date_start format must be YYYY-MM-DD'
         assert resp.json['err_desc'] == 'date_start format must be YYYY-MM-DD'
         params = {'date_end': 'foo'}
         resp = app.get('/api/agenda/%s/datetimes/' % agenda2.slug, params=params, status=400)
         assert resp.json['err'] == 1
         assert resp.json['err_class'] == 'date_end format must be YYYY-MM-DD'
         assert resp.json['err_desc'] == 'date_end format must be YYYY-MM-DD'
         params = {'date_start': base_date.isoformat()}
         resp = app.get('/api/agenda/%s/datetimes/' % agenda2.slug, params=params)
         assert len(resp.json['data']) == 6
-...
         resp = app.get(virtual_api_url)
         assert len(resp.json['data']) == 24
         params = {'date_start': 'foo'}
         resp = app.get(foo_api_url, params=params, status=400)
         assert resp.json['err'] == 1
         assert resp.json['err_class'] == 'date_start format must be YYYY-MM-DD'
         assert resp.json['err_desc'] == 'date_start format must be YYYY-MM-DD'
         params = {'date_end': 'foo'}
         resp = app.get(foo_api_url, params=params, status=400)
         assert resp.json['err'] == 1
         assert resp.json['err_class'] == 'date_end format must be YYYY-MM-DD'
         assert resp.json['err_desc'] == 'date_end format must be YYYY-MM-DD'
         # exclude weekday1 through date_start, 4 slots each day * 5 days
         params = {'date_start': (localtime(now()) + datetime.timedelta(days=2)).date().isoformat()}
         resp = app.get(foo_api_url, params=params)
+    -

Projet

Général

Profil

Produits Entr'ouvert » Chrono