arcanis/ffxivbis
1
0
Fork 0
mirror of https://github.com/arcan1s/ffxivbis.git synced 2025-10-31 05:33:41 +00:00
Code Issues Projects Releases Wiki Activity

fix args rename

Browse Source
This commit is contained in:
Evgenii Alekseev
2019-09-15 01:37:30 +03:00
parent e181e074b1
commit 36f0b8151a
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/service/core/version.py
View File

@ -6,4 +6,4 @@
# #
# License: 3-clause BSD, see https://opensource.org/licenses/BSD-3-Clause # License: 3-clause BSD, see https://opensource.org/licenses/BSD-3-Clause
# #
__version__ = '0.1.0' __version__ = '0.1.1'

4
src/service/models/piece.py
View File

@ -46,7 +46,9 @@ class Piece(Serializable):
@classmethod @classmethod
def get(cls: Type[Piece], data: Mapping[str, Any]) -> Union[Piece, Upgrade]: def get(cls: Type[Piece], data: Mapping[str, Any]) -> Union[Piece, Upgrade]:
try: 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) is_tome = data['is_tome'] in ('yes', 'on', '1', 1, True)
except KeyError: except KeyError:
raise InvalidDataRow(data) raise InvalidDataRow(data)

4
test/test_view_bis.py
View File

@ -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: async def test_bis_post_add(server: Any, player: Player, head_with_upgrade: Piece) -> None:
response = await server.post('/api/v1/party/bis', json={ response = await server.post('/api/v1/party/bis', json={
'action': 'add', 'action': 'add',
'piece': head_with_upgrade.name, 'name': head_with_upgrade.name,
'is_tome': head_with_upgrade.is_tome, 'is_tome': head_with_upgrade.is_tome,
'job': player.job.name, 'job': player.job.name,
'nick': player.nick '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: async def test_bis_post_remove(server: Any, player: Player, player2: Player, weapon: Piece) -> None:
response = await server.post('/api/v1/party/bis', json={ response = await server.post('/api/v1/party/bis', json={
'action': 'remove', 'action': 'remove',
'piece': weapon.name, 'name': weapon.name,
'is_tome': weapon.is_tome, 'is_tome': weapon.is_tome,
'job': player.job.name, 'job': player.job.name,
'nick': player.nick 'nick': player.nick

8
test/test_view_loot.py
View File

@ -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={ response = await server.post('/api/v1/party/loot', json={
'action': 'add', 'action': 'add',
'piece': weapon.name, 'name': weapon.name,
'is_tome': weapon.is_tome, 'is_tome': weapon.is_tome,
'job': player.job.name, 'job': player.job.name,
'nick': player.nick '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={ response = await server.post('/api/v1/party/loot', json={
'action': 'remove', 'action': 'remove',
'piece': weapon.name, 'name': weapon.name,
'is_tome': weapon.is_tome, 'is_tome': weapon.is_tome,
'job': player.job.name, 'job': player.job.name,
'nick': player.nick '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={ response = await server.post('/api/v1/party/loot', json={
'action': 'remove', 'action': 'remove',
'piece': weapon.name, 'name': weapon.name,
'is_tome': weapon.is_tome, 'is_tome': weapon.is_tome,
'job': player.job.name, 'job': player.job.name,
'nick': player.nick '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: 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={ response = await server.put('/api/v1/party/loot', json={
'is_tome': head_with_upgrade.is_tome, 'is_tome': head_with_upgrade.is_tome,
'piece': head_with_upgrade.name 'name': head_with_upgrade.name
}) })
assert response.status == 200 assert response.status == 200
assert await response.text() == make_json( assert await response.text() == make_json(