0001-wcs-add-a-tracking-code-search-engine-25625.patch

Frédéric Péters, 09 août 2018 18:24

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

Subject: [PATCH] wcs: add a tracking code search engine (#25625)

 combo/apps/search/urls.py  |  2 +-
 combo/apps/wcs/__init__.py |  9 +++++++
 combo/apps/wcs/urls.py     |  3 ++-
 combo/apps/wcs/views.py    | 49 ++++++++++++++++++++++++++++----------
 tests/test_wcs.py          |  9 +++++++
 5 files changed, 57 insertions(+), 15 deletions(-)

combo/apps/search/urls.py
19	19	from .models import SearchCell
20	20
21	21	urlpatterns = [
22		url(r'^ajax/search/(?P<cell_pk>\w+)/(?P<service_slug>\w+)/$', SearchCell.ajax_results_view,
	22	url(r'^ajax/search/(?P<cell_pk>\w+)/(?P<service_slug>[\w-]+)/$', SearchCell.ajax_results_view,
23	23	name='combo-search-ajax-results'),
24	24	]

     # along with this program.  If not, see <http://www.gnu.org/licenses/>.
     import django.apps
     from django.core.urlresolvers import reverse
     from django.utils.translation import ugettext_lazy as _
     class AppConfig(django.apps.AppConfig):
         name = 'combo.apps.wcs'
         verbose_name = _('Forms')
         def ready(self):
             from combo.apps.search import engines
             engines.register('tracking-code',
                 url=reverse('wcs-tracking-code-search') + '?q=%(q)s',
                 label=_('Tracking Code')
+            )
         def get_before_urls(self):
             from . import urls
             return urls.urlpatterns

     from django.conf.urls import url
     from .views import TrackingCodeView
     from .views import TrackingCodeView, tracking_code_search
     urlpatterns = [
         url(r'^tracking-code/$', TrackingCodeView.as_view(), name='wcs-tracking-code'),
         url(r'^api/search/tracking-code/$', tracking_code_search, name='wcs-tracking-code-search'),
+    ]

     # 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/>.
     import re
     from django.contrib import messages
     from django.http import HttpResponseRedirect, HttpResponseBadRequest
     from django.http import HttpResponseRedirect
     from django.core.urlresolvers import reverse
     from django.http import JsonResponse, HttpResponseRedirect, HttpResponseBadRequest
     from django.utils.six.moves.urllib import parse as urlparse
     from django.utils.translation import ugettext_lazy as _
     from django.views.decorators.csrf import csrf_exempt
-...
             # sites in a skeleton.
             return super(TrackingCodeView, self).dispatch(*args, **kwargs)
         def post(self, request, *args, **kwargs):
             try:
                 cell = TrackingCodeInputCell.objects.get(id=request.POST['cell'])
             except (ValueError, TrackingCodeInputCell.DoesNotExist):
                 return HttpResponseBadRequest('Invalid cell id')
             code = request.POST['code']
             if cell.wcs_site:
                 wcs_sites = [get_wcs_services().get(cell.wcs_site)]
         @classmethod
         def search(self, code, wcs_site=None):
             if wcs_site:
                 wcs_sites = [get_wcs_services().get(wcs_site)]
             else:
                 wcs_sites = get_wcs_services().values()
-...
                 response = requests.get('/api/code/' + code,
                         remote_service=wcs_site, log_errors=False)
                 if response.status_code == 200 and response.json().get('err') == 0:
                     url = response.json().get('load_url')
                     return HttpResponseRedirect(url)
                     return response.json().get('load_url')
             return None
         def post(self, request, *args, **kwargs):
             try:
                 cell = TrackingCodeInputCell.objects.get(id=request.POST['cell'])
             except (ValueError, TrackingCodeInputCell.DoesNotExist):
                 return HttpResponseBadRequest('Invalid cell id')
             code = request.POST['code']
             url = self.search(code, wcs_site=cell.wcs_site)
             if url:
                 return HttpResponseRedirect(url)
             next_url = request.POST.get('url') or '/'
             next_netloc = urlparse.urlparse(next_url).netloc
             if not (next_netloc and next_netloc != urlparse.urlparse(request.build_absolute_uri()).netloc):
             if not (next_netloc and next_netloc != urlparse.urlparse(self.request.build_absolute_uri()).netloc):
                 messages.error(self.request,
                         _(u'The tracking code could not been found.'))
             else:
-...
                 next_url += 'unknown-tracking-code'
             return HttpResponseRedirect(next_url)
     def tracking_code_search(request):
         hits = []
         query = request.GET.get('q') or ''
         if re.match(r'^[BCDFGHJKLMNPQRSTVWXZ]{8}$', query):
             url = TrackingCodeView.search(query)
             if url:
                 hits.append({
                     'text': _('Use tracking code %s') % query,
                     'url': url,
                 })
         return JsonResponse({'data': hits})

             resp = app.get('/manage/assets/')
             assert u'>Logo — Test 9<' in resp.text
             assert u'>Picture — form title<' in resp.text
     @wcsctl_present
     def test_tracking_code_search(app):
         assert len(app.get('/api/search/tracking-code/').json.get('data')) == 0
         assert len(app.get('/api/search/tracking-code/?q=123').json.get('data')) == 0
         assert len(app.get('/api/search/tracking-code/?q=BBCCDFF').json.get('data')) == 0
         assert len(app.get('/api/search/tracking-code/?q=BBCCDDFF').json.get('data')) == 0
         assert len(app.get('/api/search/tracking-code/?q=CNPHNTFB').json.get('data')) == 1
         assert len(app.get('/api/search/tracking-code/?q=BBCCDDFFG').json.get('data')) == 0
+    -

Projet

Général

Profil

Produits Entr'ouvert » Combo

0001-wcs-add-a-tracking-code-search-engine-25625.patch