0001-opendatasoft-manage-sort-parameter-54442.patch

Nicolas Roche, 19 juillet 2021 15:03

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

Subject: [PATCH] opendatasoft: manage sort parameter (#54442)

 passerelle/apps/opendatasoft/models.py | 21 ++++++++++++++++++---
 tests/test_opendatasoft.py             | 16 +++++++++++++---
 2 files changed, 31 insertions(+), 6 deletions(-)

                 Query.objects.filter(resource=instance).delete()
             for data_query in data_queries:
                 query = Query.import_json(data_query)
                 query.resource = instance
                 queries.append(query)
             Query.objects.bulk_create(queries)
             return instance
         def call_search(self, dataset=None, text_template='', filter_expression='', id=None, q=None, limit=None):
         def call_search(
             self,
             dataset=None,
             text_template='',
             filter_expression='',
             id=None,
             q=None,
             limit=None,
             sort=None,
         ):
             scheme, netloc, path, params, query, fragment = urlparse.urlparse(self.service_url)
             path = urlparse.urljoin(path, 'api/records/1.0/search/')
             url = urlparse.urlunparse((scheme, netloc, path, params, query, fragment))
             if id is not None:
                 query = 'recordid:%s' % id
             else:
                 query = q
             params = {
                 'dataset': dataset,
                 'q': query,
+            }
             if self.api_key:
                 params.update({'apikey': self.api_key})
             if limit:
                 params.update({'rows': limit})
             if sort:
                 params.update({'sort': sort})
             params.update(urlparse.parse_qs(filter_expression))
             result_response = self.requests.get(url, params=params)
             err_desc = result_response.json().get('error')
             if err_desc:
                 raise APIError(err_desc, http_status=200)
             result = []
-...
             perm='can_access',
             description=_('Search'),
             parameters={
                 'dataset': {'description': _('Dataset')},
                 'text_template': {'description': _('Text template')},
                 'id': {'description': _('Record identifier')},
                 'q': {'description': _('Full text query')},
                 'limit': {'description': _('Maximum items')},
                 'sort': {'description': _('Sort field')},
             },
+        )
         def search(self, request, dataset=None, text_template='', id=None, q=None, limit=None, **kwargs):
             result = self.call_search(dataset, text_template, '', id, q, limit)
         def search(
             self, request, dataset=None, text_template='', id=None, q=None, limit=None, sort=None, **kwargs
         ):
             result = self.call_search(dataset, text_template, '', id, q, limit, sort)
             return {'data': result}
         @endpoint(
             name='q',
             description=_('Query'),
             pattern=r'^(?P<query_slug>[\w:_-]+)/$',
             perm='can_access',
             show=False,
-...
                 dataset=self.dataset,
                 text_template=self.text_template,
                 filter_expression='&'.join(
                     [x.strip() for x in str(self.filter_expression).splitlines() if x.strip()]
                 ),
                 id=kwargs.get('id'),
                 q=kwargs.get('q'),
                 limit=kwargs.get('limit'),
                 sort=kwargs.get('sort'),
+            )
         def as_endpoint(self):
             endpoint = super(Query, self).as_endpoint(path=self.resource.q.endpoint_info.name)
             search_endpoint = self.resource.search.endpoint_info
             endpoint.func = search_endpoint.func
             endpoint.show_undocumented_params = False

     def test_search_using_q(mocked_get, app, connector):
         endpoint = utils.generic_endpoint_url('opendatasoft', 'search', slug=connector.slug)
         assert endpoint == '/opendatasoft/my_connector/search'
         params = {
             'dataset': 'referentiel-adresse-test',
             'text_template': '{{numero}} {{nom_rue}} {{nom_commun}}',
             'q': "rue de l'aubepine",
             'limit': 3,
             'sort': '-nom_rue',
+        }
         mocked_get.return_value = utils.FakedResponse(content=FAKED_CONTENT_Q_SEARCH, status_code=200)
         resp = app.get(endpoint, params=params, status=200)
         assert mocked_get.call_args[1]['params'] == {
             'apikey': 'my_secret',
             'dataset': 'referentiel-adresse-test',
             'q': "rue de l'aubepine",
             'rows': '3',
             'sort': '-nom_rue',
+        }
         assert not resp.json['err']
         assert len(resp.json['data']) == 3
         # check order is kept
         assert [x['id'] for x in resp.json['data']] == [
             'e00cf6161e52a4c8fe510b2b74d4952036cb3473',
             '7cafcd5c692773e8b863587b2d38d6be82e023d8',
             '0984a5e1745701f71c91af73ce764e1f7132e0ff',
+        ]
-...
     @mock.patch('passerelle.utils.Request.get')
     def test_query_q_using_q(mocked_get, app, query):
         endpoint = '/opendatasoft/my_connector/q/my_query/'
         params = {
             'q': "rue de l'aubepine",
             'limit': 3,
             'sort': '-nom_rue',
+        }
         mocked_get.return_value = utils.FakedResponse(content=FAKED_CONTENT_Q_SEARCH, status_code=200)
         resp = app.get(endpoint, params=params, status=200)
         assert mocked_get.call_args[1]['params'] == {
             'dataset': 'referentiel-adresse-test',
             'q': "rue de l'aubepine",
             'apikey': 'my_secret',
             'rows': '3',
             'dataset': 'referentiel-adresse-test',
             'refine.source': ['Ville et Eurométropole de Strasbourg'],
             'exclude.numero': ['42', '43'],
             'q': "rue de l'aubepine",
             'rows': '3',
             'sort': '-nom_rue',
+        }
         assert not resp.json['err']
         assert len(resp.json['data']) == 3
         # check order is kept
         assert [x['id'] for x in resp.json['data']] == [
             'e00cf6161e52a4c8fe510b2b74d4952036cb3473',
             '7cafcd5c692773e8b863587b2d38d6be82e023d8',
             '0984a5e1745701f71c91af73ce764e1f7132e0ff',
+    -

Projet

Général

Profil

Produits Entr'ouvert » Passerelle

0001-opendatasoft-manage-sort-parameter-54442.patch