0002-toulouse_smart-add-get-intervention-endpoint-55230.patch

Nicolas Roche, 02 août 2021 16:18

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

Subject: [PATCH 2/7] toulouse_smart: add get-intervention endpoint (#55230)

 passerelle/contrib/toulouse_smart/models.py   | 29 ++++++++++
 .../data/toulouse_smart/get_intervention.json | 54 +++++++++++++++++++
 tests/test_toulouse_smart.py                  | 43 ++++++++++++++-
 3 files changed, 125 insertions(+), 1 deletion(-)
 create mode 100644 tests/data/toulouse_smart/get_intervention.json

     import datetime
     import lxml.etree as ET
     from django.contrib.postgres.fields import JSONField
     from django.db import models
     from django.utils.text import slugify
     from django.utils.timezone import now
     from django.utils.translation import ugettext_lazy as _
     from requests import RequestException
     from passerelle.base.models import BaseResource, HTTPResource
     from passerelle.utils import xml
     from passerelle.utils.api import endpoint
     from passerelle.utils.jsonresponse import APIError
     class ToulouseSmartResource(BaseResource, HTTPResource):
         category = _('Business Process Connectors')
         webservice_base_url = models.URLField(_('Webservice Base URL'))
         log_requests_errors = False
-...
+                        {
                             'id': '',
                             'text': _('Service is unavailable'),
                             'disabled': True,
+                        }
+                    ]
+                }
         def request(self, url, json=None):
             headers = {'Accept': 'application/json'}
             if json:
                 headers['Content-Type'] = 'application/json'
                 response = self.requests.post(url, headers=headers, json=json)
             else:
                 response = self.requests.get(url, headers=headers)
             try:
                 response.raise_for_status()
             except RequestException as e:
                 raise APIError('failed to %s %s: %s' % ('post' if json else 'get', url, e))
             return response
         @endpoint(
             name='get-intervention',
             methods=['get'],
             description=_('Retrieve an intervention'),
             perm='can_access',
             parameters={
                 'id': {'description': _('Intervention identifier')},
             },
+        )
         def get_intervention(self, request, id):
             url = self.webservice_base_url + 'v1/intervention/%s' % id
             response = self.request(url)
             return {'data': response.json()}
     class Cache(models.Model):
         resource = models.ForeignKey(
             verbose_name=_('Resource'),
             to=ToulouseSmartResource,
             on_delete=models.CASCADE,
             related_name='cache_entries',
+        )

+    {
       "id": "3f0558bd-7d85-49a8-97e4-d07bc7f8dc9b",
       "name": "DI-20210731-0103",
       "description": "Justice nul part",
       "geom": {
         "type": "Point",
         "coordinates": [
 .1431744096480547,
 .69856386916798
         ],
         "crs": "EPSG:3943"
       },
       "interventionData": {},
       "safeguardRequired": false,
       "media": null,
       "safeguardDone": null,
       "interventionCreated": "2021-07-30T22:44:38.748Z",
       "interventionDesired": "2021-07-31T00:40:03Z",
       "interventionDone": null,
       "submitter": {
         "id": null,
         "lastName": "",
         "firstName": "admin",
         "mail": "admin@localhost",
         "furtherInformation": null,
         "phoneNumber": "0699999999",
         "address": ""
       },
       "submitterType": "usager",
       "organizations": [
+        {
           "id": "f1378d8a-12bf-4c14-913f-22624b0ecab8",
           "name": "Direction des P\u00f4les"
         },
+        {
           "id": "8ad4af63-70b5-416f-a75d-c510d83ce1bd",
           "name": "Transport Logistique"
+        }
       ],
       "domain": null,
       "state": {
         "id": "e844e67f-5382-4c0f-94d8-56f618263485",
         "table": null,
         "stateLabel": "Nouveau",
         "closes": false
       },
       "interventionTypeId": "407ef8d6-9b8c-4187-be51-d89f24424768",
       "onPrivateLand": false,
       "duplicates": null,
       "external_number": "36-10",
       "external_status": "statut 1",
       "cityId": "12345",
       "address": "https://wcs.dev.publik.love/backoffice/management/smart/10/"
+    }

     # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     # GNU Affero General Public License for more details.
+    #
     # 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 functools
     import io
     import os
     import zipfile
     import httmock
     import lxml.etree as ET
     import pytest
     import utils
     from test_manager import login
     from passerelle.contrib.toulouse_smart.models import ToulouseSmartResource
     from passerelle.utils.xml import to_json
     TEST_BASE_DIR = os.path.join(os.path.dirname(__file__), 'data', 'toulouse_smart')
     @pytest.fixture
     def smart(db):
         return utils.make_resource(
             ToulouseSmartResource,
             title='Test',
             slug='test',
-...
                 with httmock.HTTMock(*handlers):
                     return func(*args, **kwargs)
             return wrapper
         return decorator
     def get_json_file(filename):
         with open(os.path.join(TEST_BASE_DIR, "%s.json" % filename)) as desc:
             return desc.read()
     @mock_response(['/v1/type-intervention', b'<List></List>'])
     def test_empty_intervention_types(smart):
         assert smart.get_intervention_types() == []
     INTERVENTION_TYPES = '''<List>
        <item>
            <id>1234</id>
-...
           <validation>
             <type>digits</type>
           </validation>
         </field>
       </fields>
     </block>
     '''
+                )
     @mock_response(
         ['/v1/intervention', get_json_file('get_intervention')],
+    )
     def test_get_intervention(app, smart):
         resp = app.get(URL + 'get-intervention?id=3f0558bd-7d85-49a8-97e4-d07bc7f8dc9b')
         assert not resp.json['err']
         assert resp.json['data']['id'] == '3f0558bd-7d85-49a8-97e4-d07bc7f8dc9b'
         assert resp.json['data']['state'] == {
             'id': 'e844e67f-5382-4c0f-94d8-56f618263485',
             'table': None,
             'stateLabel': 'Nouveau',
             'closes': False,
+        }
     @mock_response(
         ['/v1/intervention', None, 500],
+    )
     def test_get_intervention_error_status(app, smart):
         resp = app.get(URL + 'get-intervention?id=3f0558bd-7d85-49a8-97e4-d07bc7f8dc9b')
         assert resp.json['err']
         assert 'failed to get' in resp.json['err_desc']
     @mock_response(
         ['/v1/intervention', None, 404],
+    )
     def test_get_intervention_wrond_id(app, smart):
         resp = app.get(URL + 'get-intervention?id=3f0558bd-7d85-49a8-97e4-d07bc7f8dc9b')
         assert resp.json['err']
         assert 'failed to get' in resp.json['err_desc']
         assert '404' in resp.json['err_desc']
+    -

Projet

Général

Profil

Produits Entr'ouvert » Passerelle

0002-toulouse_smart-add-get-intervention-endpoint-55230.patch