entrouvert
/
passerelle
15
0
Fork 0
Code Issues Pull Requests 15 Releases Activity

lille_kimoce: send pictures content independently of coords (#33883)

This commit is contained in:
Serghei Mihai 2019-06-12 13:52:40 +02:00
parent 907e02a25a
commit 8e8fa964c3
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
passerelle/contrib/lille_kimoce/models.py
View File

@ -229,9 +229,9 @@ class Kimoce(BaseResource):
if post_data.get('lat') and post_data.get('lon'):
payload['coordinate'] = {'latitude': post_data['lat'],
'longitude': post_data['lon']}
for param_name in ('picture1', 'picture2'):
if post_data.get(param_name) and isinstance(post_data[param_name], dict) and post_data[param_name].get('content'):
payload['pictures'].append({'content': post_data[param_name]['content']})
for param_name in ('picture1', 'picture2'):
if post_data.get(param_name) and isinstance(post_data[param_name], dict) and post_data[param_name].get('content'):
payload['pictures'].append({'content': post_data[param_name]['content']})
url = urljoin(self.base_url, 'demands')
result = self.requests.post(url, json=payload, auth=HttpBearerAuth(self.get_token()))
if result.status_code == 401:

8
tests/test_lille_kimoce.py
View File

@ -342,12 +342,16 @@ def test_create_demand(mocked_post, app, setup):
assert response.json['data'] == json.loads(DEMAND_CREATION_RESPONSE)
assert mocked_post.call_count == 2
data['picture1'] = {'content': 'base64encoded_picture'}
data['lat'] = '48.85438994604021'
data['lon'] = '2.3497223854064946'
mocked_post.return_value = utils.FakedResponse(content=DEMAND_CREATION_RESPONSE, status_code=200)
mocked_post.side_effect = None
response = app.post_json(endpoint, params=data)
assert mocked_post.call_count == 3
assert mocked_post.call_args[1]['json']['pictures'][0]['content'] == 'base64encoded_picture'
data['lat'] = '48.85438994604021'
data['lon'] = '2.3497223854064946'
response = app.post_json(endpoint, params=data)
assert mocked_post.call_count == 4
assert mocked_post.call_args[1]['json']['pictures'][0]['content'] == 'base64encoded_picture'
assert mocked_post.call_args[1]['json']['coordinate']['latitude'] == '48.85438994604021'
assert mocked_post.call_args[1]['json']['coordinate']['longitude'] == '2.3497223854064946'