0001-planitech-expose-identifiers-and-capacities-as-int-2.patch

Emmanuel Cazenave, 04 janvier 2019 17:23

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

Subject: [PATCH] planitech: expose identifiers and capacities as int (#29125)

 passerelle/contrib/planitech/models.py | 33 +++++++++++++++-----------
 tests/test_planitech.py                |  8 +++----
 2 files changed, 23 insertions(+), 18 deletions(-)

                 data = self._call_planitech(self.requests.get, 'getPlacesList')
                 ref = {}
                 for place in data['placesList']:
                     ref[place['identifier']] = {
                         'identifier': place['identifier'], 'label': place['label']
                     place_id = int(place['identifier'])
                     ref[place_id] = {
                         'identifier': place_id, 'label': place['label']
+                    }
                 data = self._call_planitech(
                     self.requests.post, 'getPlacesInfo',
+                    {
                         "placeIdentifiers": list(ref.keys()),
                         "placeIdentifiers": [float(key) for key in ref.keys()],
                         "extensionAttributes": {
                             "capacity": {
                                 "name": "TOTCAP",
-...
+                    }
+                )
                 for place in data['requestedPlaces']:
                     ref[place['identifier']]['capacity'] = place.get('capacity')
                     ref[place['identifier']]['street_number'] = place.get('streetNumber')
                     ref[place['identifier']]['address'] = place.get('address1')
                     ref[place['identifier']]['city'] = place.get('city')
                     ref[place['identifier']]['zipcode'] = place.get('zipCode')
                     place_id = int(place['identifier'])
                     capacity = place.get('capacity')
                     if capacity is not None:
                         capacity = int(capacity)
                     ref[place_id]['capacity'] = capacity
                     ref[place_id]['street_number'] = place.get('streetNumber')
                     ref[place_id]['address'] = place.get('address1')
                     ref[place_id]['city'] = place.get('city')
                     ref[place_id]['zipcode'] = place.get('zipCode')
                 cache.set(cache_key, ref)
             return ref
-...
                 raise APIError("Reservation creation failed: no reservation ID")
             return {
                 'data': {
                     'reservation_id': reservation_id,
                     'reservation_id': int(reservation_id),
                     'raw_data': data
+                }
+            }
-...
         def _place_display(self, raw_data):
             available_places = []
             for place in raw_data.get('availablePlaces', []):
                 available_places.append(place['placeIdentifier'])
                 available_places.append(int(place['placeIdentifier']))
             places_ref = self._get_places_referential()
             res = []
             for place in available_places:
-...
             all_dates = [d['id'] for d in res['date']]
             full = []
             for place in raw_data.get('availablePlaces', []):
                 place_id = place['placeIdentifier']
                 place_id = int(place['placeIdentifier'])
                 place_data = {
                     'id': int(place_id),
                     'id': place_id,
                     'text': places_ref[place_id]['label'],
                     'dates': []
+                }
-...
             # Places restriction
             if place_id is not None:
                 places_id = [float(place_id)]
                 places_id = [int(place_id)]
             else:
                 places_id = self._get_places_by_capacity(int(min_capacity), int(max_capacity))
             params = {
                 "placeIdentifiers": places_id,
                 "placeIdentifiers": [float(p_id) for p_id in places_id],
                 "startingDate": utc_start_datetime,
                 "endingDate": utc_end_datetime,
                 "requestedStartingTime": float(0),

         mock_planitech(monkeypatch, side_effect=side_effect)
         response = app.get('/planitech/slug-planitech/getplacesreferential')
         expected_res = {
             u'2.0': {
                 u'capacity': 20.0, u'label': u'salle 2', u'identifier': 2.0,
             '2': {
                 u'capacity': 20, u'label': u'salle 2', u'identifier': 2,
                 'street_number': None, 'address': None,
                 'city': None, 'zipcode': None
             },
             u'1.0': {
                 u'capacity': 10.0, u'label': u'salle 1', u'identifier': 1.0,
             '1': {
                 u'capacity': 10, u'label': u'salle 1', u'identifier': 1,
                 'street_number': 1, 'address': 'rue planitech',
                 'city': 'thecity', 'zipcode': '00000'
+            }
+    -

Projet

Général

Profil

Produits Entr'ouvert » Passerelle

0001-planitech-expose-identifiers-and-capacities-as-int-2.patch