0001-lingo-report-errors-on-invoices-retrieval-43967.patch

Benjamin Dauvergne, 18 juin 2020 11:00

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

Subject: [PATCH] lingo: report errors on invoices retrieval (#43967)

 combo/apps/lingo/models.py                    | 41 +++++++++++++++----
 .../lingo/templates/lingo/combo/items.html    |  9 +++-
 tests/test_lingo_remote_regie.py              | 11 +++++
 3 files changed, 53 insertions(+), 8 deletions(-)

     from dateutil import parser
     import eopayment
     from jsonfield import JSONField
     from requests import RequestException
     from django import template
     from django.conf import settings
-...
             return eopayment.Payment(self.service, options)
     class RegieException(Exception):
         pass
     @python_2_unicode_compatible
     class Regie(models.Model):
         label = models.CharField(verbose_name=_('Label'), max_length=64)
-...
                 url = self.webservice_url + '/invoices/'
                 if history:
                     url += 'history/'
                 items = requests.get(url, user=user, remote_service='auto', cache_duration=0).json()
                 regie_exc_msg = _('Regie "%(label)s" is unavailable, please retry later.') % {
                     'label': self.label,
+                }
                 try:
                     response = requests.get(url, user=user, remote_service='auto', cache_duration=0)
                     response.raise_for_status()
                 except RequestException as e:
                     raise RegieException(regie_exc_msg) from e
                 try:
                     items = response.json()
                 except ValueError as e:
                     raise RegieException(regie_exc_msg) from e
                 if items.get('data'):
                     return [build_remote_item(item, self) for item in items.get('data')]
                 return []
-...
             return Regie.objects.all()
         def get_invoices(self, user):
             return []
             return [], []
         def get_cell_extra_context(self, context):
             ctx = super(Items, self).get_cell_extra_context(context)
-...
                 # don't call webservices when we're just looking for placeholders
                 return ctx
             ctx.update({'title': self.title, 'text': self.text})
             items = self.get_invoices(user=context['user'])
             items, errors = self.get_invoices(user=context['user'])
             none_date = datetime.datetime(1900, 1, 1)  # to avoid None-None comparison errors
             items.sort(key=lambda i: i.creation_date or none_date, reverse=True)
             ctx.update({
                 'items': items,
                 'errors': errors,
                 'with_payment_limit_date': any(i.payment_limit_date for i in items),
                 'with_amount_paid': any(getattr(i, 'amount_paid', None) for i in items),
             })
-...
         def get_invoices(self, user):
             items = []
             errors = []
             for r in self.get_regies():
                 items.extend(r.get_invoices(user, history=True))
             return items
                 try:
                     items.extend(r.get_invoices(user, history=True))
                 except RegieException as e:
                     errors.append(e)
             return items, errors
     @register_cell_class
-...
         def get_invoices(self, user):
             items = []
             errors = []
             for r in self.get_regies():
                 items.extend(r.get_invoices(user))
             return items
                 try:
                     items.extend(r.get_invoices(user))
                 except RegieException as e:
                     errors.append(e)
             return items, errors
     @register_cell_class

     {% load i18n %}
     {% block cell-content %}
     {% if items or not cell.hide_if_empty %}
     {% if errors or items or not cell.hide_if_empty %}
     {% if title %}<h2>{{ title|safe }}</h2>{% endif %}
     <div>
     {% if text %}{{ text|safe }}{% endif %}
     {% if errors %}
       <ul class="errorlist">
         {% for error in errors %}
           <li>{{ error }}</li>
         {% endfor %}
       </ul>
     {% endif %}
     {% if items %}
     <table class="invoices">
       <thead>

         content = cell.render(context)
         assert 'No items yet' in content
         # regie is down
         mock_send.side_effect = ConnectionError
         content = cell.render(context)
         assert 'Regie &quot;Remote&quot; is unavailable, please retry later.' in content
     @mock.patch('combo.utils.requests_wrapper.RequestsSession.send')
     def test_remote_regie_past_invoices_cell(mock_send, remote_regie):
         assert remote_regie.is_remote() == True
-...
         content = cell.render(context)
         assert content.strip() == ''
         # regie is down
         mock_send.side_effect = ConnectionError
         content = cell.render(context)
         assert 'Regie &quot;Remote&quot; is unavailable, please retry later.' in content
     @mock.patch('combo.apps.lingo.models.Regie.pay_invoice')
     @mock.patch('combo.apps.lingo.models.requests.get')
+    -

Projet

Général

Profil

Produits Entr'ouvert » Combo

0001-lingo-report-errors-on-invoices-retrieval-43967.patch