resolve conflict
This commit is contained in:
commit
fbf74643e9
|
@ -1664,7 +1664,10 @@ class MoveOnDocument(JoinedTableMixin, ActionWithMultipleTradeDocuments):
|
|||
)
|
||||
container_from = db.relationship(
|
||||
'TradeDocument',
|
||||
primaryjoin='MoveOnDocument.container_from_id == TradeDocument.id',
|
||||
backref=backref('containers_from',
|
||||
lazy=True,
|
||||
cascade=CASCADE_OWN),
|
||||
primaryjoin='MoveOnDocument.container_from_id == TradeDocument.id'
|
||||
)
|
||||
container_from_id.comment = """This is the trade document used as container in a incoming lot"""
|
||||
|
||||
|
@ -1675,6 +1678,9 @@ class MoveOnDocument(JoinedTableMixin, ActionWithMultipleTradeDocuments):
|
|||
)
|
||||
container_to = db.relationship(
|
||||
'TradeDocument',
|
||||
backref=backref('containers_to',
|
||||
lazy=True,
|
||||
cascade=CASCADE_OWN),
|
||||
primaryjoin='MoveOnDocument.container_to_id == TradeDocument.id',
|
||||
)
|
||||
container_to_id.comment = """This is the trade document used as container in a outgoing lot"""
|
||||
|
|
|
@ -707,6 +707,11 @@ class Trade(ActionWithMultipleDevices):
|
|||
required=True,
|
||||
only_query='id')
|
||||
|
||||
@pre_load
|
||||
def adding_devices(self, data: dict):
|
||||
if not 'devices' in data.keys():
|
||||
data['devices'] = []
|
||||
|
||||
@validates_schema
|
||||
def validate_lot(self, data: dict):
|
||||
if not g.user.email in [data['user_from_email'], data['user_to_email']]:
|
||||
|
|
|
@ -344,13 +344,6 @@ class Device(Thing):
|
|||
if action.type == 'Revoke':
|
||||
return action.id
|
||||
|
||||
@property
|
||||
def confirm_status(self):
|
||||
"""The actual state of confirmation of one Trade, or None if no Trade action
|
||||
has ever been performed to this device."""
|
||||
# TODO @cayop we need implement this functionality
|
||||
return None
|
||||
|
||||
@property
|
||||
def physical(self):
|
||||
"""The actual physical state, None otherwise."""
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
import copy
|
||||
from contextlib import suppress
|
||||
from citext import CIText
|
||||
from flask import g
|
||||
|
||||
|
@ -101,10 +103,10 @@ class TradeDocument(Thing):
|
|||
revoke = 'Revoke'
|
||||
revoke_pending = 'Revoke Pending'
|
||||
confirm_revoke = 'Document Revoked'
|
||||
if not self.actions:
|
||||
ac = self.last_action_trading()
|
||||
if not ac:
|
||||
return
|
||||
|
||||
ac = self.actions[-1]
|
||||
|
||||
if ac.type == 'ConfirmRevokeDocument':
|
||||
# can to do revoke_confirmed
|
||||
|
@ -143,6 +145,18 @@ class TradeDocument(Thing):
|
|||
|
||||
return weight
|
||||
|
||||
def last_action_trading(self):
|
||||
"""which is the last action trading"""
|
||||
with suppress(StopIteration, ValueError):
|
||||
actions = copy.copy(self.actions)
|
||||
actions.sort(key=lambda x: x.created)
|
||||
t_trades = ['Trade',
|
||||
'Confirm',
|
||||
'ConfirmRevokeDocument',
|
||||
'RevokeDocument',
|
||||
'ConfirmDocument']
|
||||
return next(e for e in reversed(actions) if e.t in t_trades)
|
||||
|
||||
def _warning_actions(self, actions):
|
||||
"""Show warning actions"""
|
||||
return sorted(ev for ev in actions if ev.severity >= Severity.Warning)
|
||||
|
|
|
@ -771,6 +771,27 @@ def test_trade_endpoint(user: UserClient, user2: UserClient):
|
|||
device2, _ = user2.get(res=Device, item=device['id'])
|
||||
assert device2['id'] == device['id']
|
||||
|
||||
|
||||
@pytest.mark.mvp
|
||||
@pytest.mark.usefixtures(conftest.app_context.__name__)
|
||||
def test_trade_without_device(user: UserClient, user2: UserClient):
|
||||
"""Test one offer with automatic confirmation and without user to"""
|
||||
lot, _ = user.post({'name': 'MyLot'}, res=Lot)
|
||||
|
||||
request_post = {
|
||||
'type': 'Trade',
|
||||
'userFromEmail': user.email,
|
||||
'userToEmail': user2.email,
|
||||
'lot': lot['id'],
|
||||
'confirms': True,
|
||||
}
|
||||
|
||||
user.post(res=models.Action, data=request_post)
|
||||
|
||||
trade = models.Trade.query.one()
|
||||
assert str(trade.lot.id) == lot['id']
|
||||
|
||||
|
||||
@pytest.mark.mvp
|
||||
@pytest.mark.usefixtures(conftest.app_context.__name__)
|
||||
def test_offer_without_to(user: UserClient):
|
||||
|
@ -2528,3 +2549,61 @@ def test_delete_devices(user: UserClient):
|
|||
|
||||
devices, res = user.get(url, None)
|
||||
assert len(devices['items']) == 0
|
||||
|
||||
|
||||
@pytest.mark.mvp
|
||||
@pytest.mark.usefixtures(conftest.app_context.__name__)
|
||||
def test_moveOnDocument_bug168(user: UserClient, user2: UserClient):
|
||||
"""If you use one moveOnDocument in a trade Document. Next you can not drop this document."""
|
||||
lotIn, _ = user.post({'name': 'MyLotIn'}, res=Lot)
|
||||
lotOut, _ = user.post({'name': 'MyLotOut'}, res=Lot)
|
||||
url = 'http://www.ereuse.org/apapaapaapaapaapaapaapaapaapaapapaapaapaapaapaapaapaapaapaapapaapaapaapaapaapaapaapaapaapaaaa',
|
||||
request_post1 = {
|
||||
'filename': 'test.pdf',
|
||||
'hash': 'bbbbbbbb',
|
||||
'url': url,
|
||||
'weight': 150,
|
||||
'lot': lotIn['id']
|
||||
}
|
||||
tradedocument_from, _ = user.post(res=TradeDocument, data=request_post1)
|
||||
id_hash = 'aaaaaaaaa'
|
||||
request_post2 = {
|
||||
'filename': 'test.pdf',
|
||||
'hash': id_hash,
|
||||
'url': url,
|
||||
'weight': 0,
|
||||
'lot': lotOut['id']
|
||||
}
|
||||
tradedocument_to, _ = user.post(res=TradeDocument, data=request_post2)
|
||||
|
||||
request_trade = {
|
||||
'type': 'Trade',
|
||||
'devices': [],
|
||||
'userFromEmail': user2.email,
|
||||
'userToEmail': user.email,
|
||||
'price': 10,
|
||||
'date': "2020-12-01T02:00:00+00:00",
|
||||
'lot': lotIn['id'],
|
||||
'confirms': True,
|
||||
}
|
||||
|
||||
user.post(res=models.Action, data=request_trade)
|
||||
|
||||
description = 'This is a good description'
|
||||
request_moveOn = {
|
||||
'type': 'MoveOnDocument',
|
||||
'weight': 4,
|
||||
'container_from': tradedocument_from['id'],
|
||||
'container_to': id_hash,
|
||||
'description': description
|
||||
}
|
||||
doc, _ = user.post(res=models.Action, data=request_moveOn)
|
||||
trade = models.Trade.query.one()
|
||||
trade_document1 = TradeDocument.query.filter_by(id=tradedocument_from['id']).one()
|
||||
trade_document2 = TradeDocument.query.filter_by(id=tradedocument_to['id']).one()
|
||||
assert trade_document1.total_weight == 150.0
|
||||
assert trade_document2.total_weight == 4.0
|
||||
assert trade_document1.trading == 'Confirm'
|
||||
assert trade_document2.trading == None
|
||||
|
||||
tradedocument, _ = user.delete(res=TradeDocument, item=tradedocument_to['id'])
|
||||
|
|
Reference in New Issue