0002-lingo-reduce-queryset-number-38115.patch

Lauréline Guérin, 02 décembre 2019 10:56

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

Subject: [PATCH 2/2] lingo: reduce queryset number (#38115)

 combo/apps/lingo/manager_views.py             | 10 +++++++---
 .../templates/lingo/transaction_list.html     | 19 +++++++++++--------
 tests/test_lingo_manager.py                   |  2 +-
 3 files changed, 19 insertions(+), 12 deletions(-)

     from dateutil import parser as date_parser
     from django.core.urlresolvers import reverse_lazy
     from django.db.models import Q
     from django.db.models import Q, Prefetch
     from django.utils import six
     from django.utils.timezone import make_aware
     from django.views.generic import CreateView, UpdateView, ListView, DeleteView
-...
             return context
         def get_queryset(self):
             qs = Transaction.objects.filter(
                     status__in=(eopayment.PAID, eopayment.ACCEPTED)).order_by('-start_date')
             qs = (
                 Transaction.objects
                 .select_related('user')
                 .prefetch_related(Prefetch('items', to_attr='prefetched_items'))
                 .filter(status__in=(eopayment.PAID, eopayment.ACCEPTED))
                 .order_by('-start_date'))
             query = self.request.GET.get('q')
             if query:
                 try:

     </thead>
     <tbody>
     {% for object in object_list %}
     {% with object.prefetched_items|length|default:1 as nb_items %}
     <tr>
      <td rowspan="{{object.items.all.count|default:1}}">{{object.order_id}}</td>
      <td rowspan="{{object.items.all.count|default:1}}">{{object.bank_transaction_id}}</td>
      <td rowspan="{{object.items.all.count|default:1}}">{{object.start_date}}</td>
      <td rowspan="{{object.items.all.count|default:1}}">{{object.get_user_name}}</td>
      <td rowspan="{{object.items.all.count|default:1}}">{{object.amount}} €</td>
      {% for item in object.items.all %}
      <td rowspan="{{ nb_items }}">{{object.order_id}}</td>
      <td rowspan="{{ nb_items }}">{{object.bank_transaction_id}}</td>
      <td rowspan="{{ nb_items }}">{{object.start_date}}</td>
      <td rowspan="{{ nb_items }}">{{object.get_user_name}}</td>
      <td rowspan="{{ nb_items }}">{{object.amount}} €</td>
      {% for item in object.prefetched_items %}
      {% if not forloop.first %}<tr>{% endif %}
       <td style="font-size: smaller">{{item.subject}}</td> <td style="font-size: smaller" class="price">{{item.amount}} €</td></tr>
       {% endfor %}
       {% if not object.items.all %}</tr>{% endif %}
      {% empty %}
     </tr>
      {% endfor %}
     {% endwith %}
     {% endfor %}
     </tbody>
     </table>

         with CaptureQueriesContext(connection) as ctx:
             resp = app.get('/manage/lingo/', status=200)
         assert resp.text.count('<tr') == 11
         assert len(ctx.captured_queries) == 74
         assert len(ctx.captured_queries) == 5
         resp.form['q'] = 'order id 16'
         resp = resp.form.submit()
+    -

Projet

Général

Profil

Produits Entr'ouvert » Combo

0002-lingo-reduce-queryset-number-38115.patch