0002-plone_restapi-adapt-list-content-sent-to-Plone-62943.patch

Nicolas Roche, 28 mars 2022 14:27

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

Subject: [PATCH 2/2] plone_restapi: adapt list content sent to Plone (#62943)

 passerelle/apps/plone_restapi/models.py | 26 +++++++++++++++++++++++++
 tests/test_plone_restapi.py             | 11 +++++++++++
 2 files changed, 37 insertions(+)

         def convert_image_format(self, payload):
             for file_field in payload.values():
                 if isinstance(file_field, dict) and file_field.get('filename'):
                     file_field['encoding'] = 'base64'
                     file_field['data'] = file_field['content']
                     file_field['content-type'] = file_field['content_type']
                     del file_field['content']
         def remove_unvaluated_dict_from_list(self, payload):
             """Remove from lists, not empty dicts having all empty string values"""
             def is_not_empty_dict_having_all_empty_values(data):
                 if not isinstance(data, dict):
                     return False
                 if len(data) == 0:
                     return False
                 for value in data.values():
                     if value != '':
                         return False
                 return True
             data = {}
             for field_key, field_value in payload.items():
                 if isinstance(field_value, list):
                     data_list = []
                     for dict_value in field_value:
                         if not is_not_empty_dict_having_all_empty_values(dict_value):
                             data_list.append(dict_value)
                     data[field_key] = data_list
                 else:
                     data[field_key] = field_value
             return data
         def adapt_payload(self, payload):
             self.convert_image_format(payload)
             payload = self.remove_unvaluated_dict_from_list(payload)
             return payload
         def adapt_record(
             self,
             record,
             text_template='{{ id }}',
             id_key='UID',
         ):

         payload = {
             '@type': 'imio.directory.Contact',
             'title': "Test Entr'ouvert",
             'type': 'organization',
             'schedule': {},
             'topics/0/title': 'Tourisme',
             'topics/0/token': 'tourism',
             'image': {'filename': 'foo.jpg', 'content_type': 'image/jpeg', 'content': '...'},
             'phones': [
                 {'label': 'numéro principal', 'number': '0123456789', 'type': 'work'},
                 {'label': '', 'number': '', 'type': ''},
             ],
+        }
         with utils.mock_url(url=url, response=json_get_data('fetch'), status_code=201) as mocked:
             resp = app.post_json(endpoint + '?uri=braine-l-alleud&publish=false', params=payload)
             body = json.loads(mocked.handlers[0].call['requests'][1].body)
             assert body['topics'] == [{'title': 'Tourisme', 'token': 'tourism'}]
             assert body['image'] == {
                 'filename': 'foo.jpg',
                 'content_type': 'image/jpeg',
                 'encoding': 'base64',
                 'data': '...',
                 'content-type': 'image/jpeg',
+            }
             assert body['phones'] == [{'label': 'numéro principal', 'number': '0123456789', 'type': 'work'}]
         assert not resp.json['err']
         assert resp.json['data'] == {
             'uid': 'dccd85d12cf54b6899dff41e5a56ee7f',
             'created': True,
             'review_state': None,
+        }
-...
         endpoint = utils.generic_endpoint_url('plone-restapi', 'update', slug=connector.slug)
         assert endpoint == '/plone-restapi/my_connector/update'
         url = connector.service_url + '/braine-l-alleud/dccd85d12cf54b6899dff41e5a56ee7f'
         query_string = '?uri=braine-l-alleud&uid=dccd85d12cf54b6899dff41e5a56ee7f'
         payload = {
             'title': 'Test update',
             'topics/0/token': 'social',
             'image': {'filename': 'foo.jpg', 'content_type': 'image/jpeg', 'content': '...'},
             'phones': [
                 {'label': '', 'number': '', 'type': ''},
                 {'label': '', 'number': '', 'type': ''},
             ],
+        }
         with utils.mock_url(url=url, response='', status_code=204) as mocked:
             resp = app.post_json(endpoint + query_string, params=payload)
             body = json.loads(mocked.handlers[0].call['requests'][1].body)
             assert body['topics'] == [{'token': 'social'}]
             assert body['image'] == {
                 'filename': 'foo.jpg',
                 'content_type': 'image/jpeg',
                 'encoding': 'base64',
                 'data': '...',
                 'content-type': 'image/jpeg',
+            }
             assert body['phones'] == []
         assert not resp.json['err']
         assert resp.json['data'] == {'uid': 'dccd85d12cf54b6899dff41e5a56ee7f', 'updated': True}
     def test_update_wrong_payload(app, connector, token):
         endpoint = utils.generic_endpoint_url('plone-restapi', 'update', slug=connector.slug)
         assert endpoint == '/plone-restapi/my_connector/update'
         url = connector.service_url + '/braine-l-alleud/dccd85d12cf54b6899dff41e5a56ee7f'
+    -

Projet

Général

Profil

Produits Entr'ouvert » Passerelle

0002-plone_restapi-adapt-list-content-sent-to-Plone-62943.patch