0001-manager-add-support-for-remote-ICS-file-with-excepti.patch

Serghei Mihai, 04 octobre 2017 12:33

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

Subject: [PATCH] manager: add support for remote ICS file with exceptions
 (#19070)

 chrono/agendas/models.py                           | 11 +++++
 chrono/manager/forms.py                            |  8 +++-
 .../chrono/manager_import_exceptions.html          |  4 +-
 chrono/manager/views.py                            |  5 +-
 requirements.txt                                   |  1 +
 setup.py                                           |  3 +-
 tests/test_agendas.py                              | 47 +++++++++++++++++++
 tests/test_manager.py                              | 54 ++++++++++++++++++++++
 8 files changed, 127 insertions(+), 6 deletions(-)

     import datetime
     import vobject
     import requests
     from django.contrib.auth.models import Group
     from django.core.exceptions import ValidationError
-...
             in_two_weeks = self.get_exceptions_within_two_weeks()
             return self.timeperiodexception_set.count() == len(in_two_weeks)
         def create_timeperiod_exceptions_from_remote_ics(self, url):
             try:
                 response = requests.get(url)
                 response.raise_for_status()
             except requests.exceptions.HTTPError as e:
                 raise ICSError(_('Error %s is returned while trying to get file.') % e.response.status_code)
             except requests.exceptions.ConnectionError:
                 raise ICSError(_('URL is unreachable.'))
             return self.create_timeperiod_exceptions_from_ics(response.text)
         def create_timeperiod_exceptions_from_ics(self, data):
             try:
                 parsed = vobject.readOne(data)

             model = Desk
             fields = []
         ics_file = forms.FileField(label=_('ICS File'),
         ics_file = forms.FileField(label=_('ICS File'), required=False,
                                    help_text=_('ICS file containing events which will be considered as exceptions'))
         ics_url = forms.URLField(label=_('URL'), required=False)
         def clean(self):
             cleaned_data = super(ExceptionsImportForm, self).clean()
             if not cleaned_data['ics_file'] and not cleaned_data['ics_url']:
                 raise ValidationError(_('A file or an url should be filled'))

     {% endblock %}
     {% block content %}
     <form method="post" enctype="multipart/form-data">
       <p>{% trans "You could upload a local file or specify an address to remote file." %}</p>
       {% csrf_token %}
       {{ form.as_p }}
       <p>
       </p>
       <div class="buttons">
         <button>{% trans "Import" %}</button>
         <a class="cancel" href="{% url 'chrono-manager-agenda-view' pk=agenda.id %}">{% trans 'Cancel' %}</a>

         def form_valid(self, form):
             try:
                 exceptions = form.instance.create_timeperiod_exceptions_from_ics(form.cleaned_data['ics_file'])
                 if form.cleaned_data['ics_file']:
                     exceptions = form.instance.create_timeperiod_exceptions_from_ics(form.cleaned_data['ics_file'])
                 else:
                     exceptions = form.instance.create_timeperiod_exceptions_from_remote_ics(form.cleaned_data['ics_url'])
             except ICSError as e:
                 form.add_error(None, unicode(e))
                 return self.form_invalid(form)

requirements.txt
3	3	djangorestframework>=3.1
4	4	django-jsonfield >= 0.9.3
5	5	intervaltree
	6	requests

             'djangorestframework>=3.1',
             'django-jsonfield >= 0.9.3',
             'intervaltree',
             'vobject'
             'vobject',
             'requests'
             ],
         zip_safe=False,
         cmdclass={

     import pytest
     import datetime
     import mock
     import requests
     from django.utils.timezone import now, make_aware, localtime
-...
         with pytest.raises(ICSError) as e:
             exceptions_count = desk.create_timeperiod_exceptions_from_ics(ICS_SAMPLE_WITH_NO_EVENTS)
         assert str(e.value) == "The file doesn't contain any events."
     @mock.patch('chrono.agendas.models.requests.get')
     def test_timeperiodexception_creation_from_remote_ics(mocked_get):
         agenda = Agenda(label=u'Test 8 agenda')
         agenda.save()
         desk = Desk(label='Test 8 desk', agenda=agenda)
         desk.save()
         mocked_response = mock.Mock()
         mocked_response.text = ICS_SAMPLE
         mocked_get.return_value = mocked_response
         exceptions_count = desk.create_timeperiod_exceptions_from_remote_ics('http://example.com/sample.ics')
         assert exceptions_count == 2
     @mock.patch('chrono.agendas.models.requests.get')
     def test_timeperiodexception_creation_from_unreachable_remote_ics(mocked_get):
         agenda = Agenda(label=u'Test 9 agenda')
         agenda.save()
         desk = Desk(label='Test 9 desk', agenda=agenda)
         desk.save()
         mocked_response = mock.Mock()
         mocked_response.content.return_value = ICS_SAMPLE
         mocked_get.return_value = mocked_response
         def mocked_requests_connection_error(*args, **kwargs):
             raise requests.exceptions.ConnectionError('unreachable')
         mocked_get.side_effect = mocked_requests_connection_error
         with pytest.raises(ICSError) as e:
             exceptions_count = desk.create_timeperiod_exceptions_from_remote_ics('http://example.com/sample.ics')
         assert str(e.value) == "URL is unreachable."
     @mock.patch('chrono.agendas.models.requests.get')
     def test_timeperiodexception_creation_from_forbidden_remote_ics(mocked_get):
         agenda = Agenda(label=u'Test 10 agenda')
         agenda.save()
         desk = Desk(label='Test 10 desk', agenda=agenda)
         desk.save()
         mocked_response = mock.Mock()
         mocked_response.status_code = 403
         mocked_get.return_value = mocked_response
         def mocked_requests_http_forbidden_error(*args, **kwargs):
             raise requests.exceptions.HTTPError(response=mocked_response)
         mocked_get.side_effect = mocked_requests_http_forbidden_error
         with pytest.raises(ICSError) as e:
             exceptions_count = desk.create_timeperiod_exceptions_from_remote_ics('http://example.com/sample.ics')
         assert str(e.value) == "Error 403 is returned while trying to get file."

     import datetime
     import pytest
     from webtest import TestApp, Upload
     import mock
     import requests
     from chrono.wsgi import application
-...
         resp = app.get('/manage/agendas/%d/' % agenda.pk)
         assert 'Import exceptions from .ics' in resp.content
         resp = resp.click('upload')
         assert "You could upload a local file or specify an address to remote file." in resp
         resp.form['ics_file'] = Upload('exceptions.ics', 'invalid content', 'text/calendar')
         resp = resp.form.submit(status=200)
         assert 'File format is invalid' in resp.content
-...
         assert TimePeriodException.objects.count() == 1
         resp = resp.follow()
         assert 'An exception has been imported.' in resp.content
     @mock.patch('chrono.agendas.models.requests.get')
     def test_agenda_import_time_period_exception_from_remote_ics(mocked_get, app, admin_user):
         agenda = Agenda.objects.create(label='New Example', kind='meetings')
         desk = Desk.objects.create(agenda=agenda, label='New Desk')
         MeetingType(agenda=agenda, label='Bar').save()
         login(app)
         resp = app.get('/manage/agendas/%d/' % agenda.pk)
         assert 'Import exceptions from .ics' not in resp.content
         TimePeriod.objects.create(weekday=1, desk=desk,
                     start_time=datetime.time(10, 0), end_time=datetime.time(12, 0))
         resp = app.get('/manage/agendas/%d/' % agenda.pk)
         resp = resp.click('upload')
         assert 'ics_file' in resp.form.fields
         assert 'ics_url' in resp.form.fields
         resp.form['ics_url'] = 'http://example.com/foo.ics'
         mocked_response = mock.Mock()
         mocked_get.return_value = mocked_response
         def mocked_requests_connection_error(*args, **kwargs):
             raise requests.exceptions.ConnectionError('unreachable')
         mocked_get.side_effect = mocked_requests_connection_error
         resp = resp.form.submit(status=200)
         assert 'URL is unreachable.' in resp.content
     @mock.patch('chrono.agendas.models.requests.get')
     def test_agenda_import_time_period_exception_from_forbidden_remote_ics(mocked_get, app, admin_user):
         agenda = Agenda.objects.create(label='New Example', kind='meetings')
         desk = Desk.objects.create(agenda=agenda, label='New Desk')
         MeetingType(agenda=agenda, label='Bar').save()
         login(app)
         resp = app.get('/manage/agendas/%d/' % agenda.pk)
         assert 'Import exceptions from .ics' not in resp.content
         TimePeriod.objects.create(weekday=1, desk=desk,
                     start_time=datetime.time(10, 0), end_time=datetime.time(12, 0))
         resp = app.get('/manage/agendas/%d/' % agenda.pk)
         resp = resp.click('upload')
         resp.form['ics_url'] = 'http://example.com/foo.ics'
         mocked_response = mock.Mock()
         mocked_response.status_code = 403
         mocked_get.return_value = mocked_response
         def mocked_requests_http_forbidden_error(*args, **kwargs):
             raise requests.exceptions.HTTPError(response=mocked_response)
         mocked_get.side_effect = mocked_requests_http_forbidden_error
         resp = resp.form.submit(status=200)
         assert 'Error 403 is returned while trying to get' in resp.content
+    -

Projet

Général

Profil

Produits Entr'ouvert » Chrono

0001-manager-add-support-for-remote-ICS-file-with-excepti.patch