0002-opendatasoft-do-not-send-empty-q-parameter-54442.patch

Nicolas Roche, 28 juillet 2021 16:04

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

Subject: [PATCH 2/3] opendatasoft: do not send empty q parameter (#54442)

 passerelle/apps/opendatasoft/models.py | 11 ++--
 tests/test_opendatasoft.py             | 75 ++++++++++++++++++++++++++
 2 files changed, 79 insertions(+), 7 deletions(-)

         def call_search(
             self, dataset=None, text_template='', filter_expression='', sort='', id=None, q=None, limit=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))
             params = {'dataset': dataset}
             if id is not None:
                 query = 'recordid:%s' % id
             else:
                 query = q
             params = {
                 'dataset': dataset,
                 'q': query,
+            }
                 params.update({'q': 'recordid:%s' % id})
             elif q is not None:
                 params.update({'q': q})
             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))

         # error returned by opendadasoft server
         json_response = json.dumps({'error': "The query is invalid : Field 00 doesn't exist"})
         mocked_get.return_value = utils.FakedResponse(content=json_response, status_code=200)
         resp = app.get(endpoint, status=200)
         assert resp.json['err']
         assert resp.json['err_desc'] == "The query is invalid : Field 00 doesn't exist"
     @mock.patch('passerelle.utils.Request.get')
     def test_search(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}}',
             'sort': '-nom_rue',
             'limit': 3,
+        }
         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',
             'sort': '-nom_rue',
             'rows': '3',
+        }
         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',
+        ]
         # check text results
         assert [x['text'] for x in resp.json['data']] == [
             "33 RUE DE L'AUBEPINE Strasbourg",
             "19 RUE DE L'AUBEPINE Lipsheim",
             "29 RUE DE L'AUBEPINE Strasbourg",
+        ]
         # check additional attributes
         assert [x['numero'] for x in resp.json['data']] == ['33', '19', '29']
     @mock.patch('passerelle.utils.Request.get')
     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}}',
             'sort': '-nom_rue',
-...
         assert endpoint == '/opendatasoft/my_connector/search'
         params = {
             'dataset': 'referentiel-adresse-test',
             'text_template': '{{numero}} {{nom_rue}} {{nom_commun}}',
             'id': '7cafcd5c692773e8b863587b2d38d6be82e023d8',
+        }
         mocked_get.return_value = utils.FakedResponse(content=FAKED_CONTENT_ID_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': 'recordid:7cafcd5c692773e8b863587b2d38d6be82e023d8',
+        }
         assert len(resp.json['data']) == 1
         assert resp.json['data'][0]['text'] == "19 RUE DE L'AUBEPINE Lipsheim"
     @mock.patch('passerelle.utils.Request.get')
     def test_query_q(mocked_get, app, query):
         endpoint = '/opendatasoft/my_connector/q/my_query/'
         params = {
             'limit': 3,
+        }
         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',
             'refine.source': ['Ville et Eurométropole de Strasbourg'],
             'exclude.numero': ['42', '43'],
             'sort': '-nom_rue',
             'rows': '3',
+        }
         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',
+        ]
         # check text results
         assert [x['text'] for x in resp.json['data']] == [
             "33 RUE DE L'AUBEPINE Strasbourg",
             "19 RUE DE L'AUBEPINE Lipsheim",
             "29 RUE DE L'AUBEPINE Strasbourg",
+        ]
         # check additional attributes
         assert [x['numero'] for x in resp.json['data']] == ['33', '19', '29']
     @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,
+        }
         mocked_get.return_value = utils.FakedResponse(content=FAKED_CONTENT_Q_SEARCH, status_code=200)
+    -

Projet

Général

Profil

Produits Entr'ouvert » Passerelle

0002-opendatasoft-do-not-send-empty-q-parameter-54442.patch