From 36f0b8151a5cfb7e0be6d1a954e13b3adce98a21 Mon Sep 17 00:00:00 2001 From: Evgeniy Alekseev Date: Sun, 15 Sep 2019 01:37:30 +0300 Subject: [PATCH] fix args rename --- src/service/core/version.py | 2 +- src/service/models/piece.py | 4 +++- test/test_view_bis.py | 4 ++-- test/test_view_loot.py | 8 ++++---- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/service/core/version.py b/src/service/core/version.py index 4ed65ba..a39b12d 100644 --- a/src/service/core/version.py +++ b/src/service/core/version.py @@ -6,4 +6,4 @@ # # License: 3-clause BSD, see https://opensource.org/licenses/BSD-3-Clause # -__version__ = '0.1.0' \ No newline at end of file +__version__ = '0.1.1' \ No newline at end of file diff --git a/src/service/models/piece.py b/src/service/models/piece.py index 4a38497..6edafb6 100644 --- a/src/service/models/piece.py +++ b/src/service/models/piece.py @@ -46,7 +46,9 @@ class Piece(Serializable): @classmethod def get(cls: Type[Piece], data: Mapping[str, Any]) -> Union[Piece, Upgrade]: try: - piece_type = data['piece'] + piece_type = data.get('piece') or data.get('name') + if piece_type is None: + raise KeyError is_tome = data['is_tome'] in ('yes', 'on', '1', 1, True) except KeyError: raise InvalidDataRow(data) diff --git a/test/test_view_bis.py b/test/test_view_bis.py index 99cd3e2..f8e9077 100644 --- a/test/test_view_bis.py +++ b/test/test_view_bis.py @@ -35,7 +35,7 @@ async def test_bis_get_with_filter(server: Any, party: Party, player: Player, pl async def test_bis_post_add(server: Any, player: Player, head_with_upgrade: Piece) -> None: response = await server.post('/api/v1/party/bis', json={ 'action': 'add', - 'piece': head_with_upgrade.name, + 'name': head_with_upgrade.name, 'is_tome': head_with_upgrade.is_tome, 'job': player.job.name, 'nick': player.nick @@ -47,7 +47,7 @@ async def test_bis_post_add(server: Any, player: Player, head_with_upgrade: Piec async def test_bis_post_remove(server: Any, player: Player, player2: Player, weapon: Piece) -> None: response = await server.post('/api/v1/party/bis', json={ 'action': 'remove', - 'piece': weapon.name, + 'name': weapon.name, 'is_tome': weapon.is_tome, 'job': player.job.name, 'nick': player.nick diff --git a/test/test_view_loot.py b/test/test_view_loot.py index 5dd1f4a..b5b28b9 100644 --- a/test/test_view_loot.py +++ b/test/test_view_loot.py @@ -36,7 +36,7 @@ async def test_loot_post_add(server: Any, player: Player, weapon: Piece) -> None response = await server.post('/api/v1/party/loot', json={ 'action': 'add', - 'piece': weapon.name, + 'name': weapon.name, 'is_tome': weapon.is_tome, 'job': player.job.name, 'nick': player.nick @@ -53,7 +53,7 @@ async def test_loot_post_remove(server: Any, player: Player, head_with_upgrade: response = await server.post('/api/v1/party/loot', json={ 'action': 'remove', - 'piece': weapon.name, + 'name': weapon.name, 'is_tome': weapon.is_tome, 'job': player.job.name, 'nick': player.nick @@ -65,7 +65,7 @@ async def test_loot_post_remove(server: Any, player: Player, head_with_upgrade: response = await server.post('/api/v1/party/loot', json={ 'action': 'remove', - 'piece': weapon.name, + 'name': weapon.name, 'is_tome': weapon.is_tome, 'job': player.job.name, 'nick': player.nick @@ -78,7 +78,7 @@ async def test_loot_post_remove(server: Any, player: Player, head_with_upgrade: async def test_loot_put(server: Any, player: Player, player2: Player, head_with_upgrade: Piece) -> None: response = await server.put('/api/v1/party/loot', json={ 'is_tome': head_with_upgrade.is_tome, - 'piece': head_with_upgrade.name + 'name': head_with_upgrade.name }) assert response.status == 200 assert await response.text() == make_json(