trustchain-oc1-orchestral
/
devicehub-teal
Archived
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixing confirms

This commit is contained in:
Cayo Puigdefabregas 2021-11-11 22:50:07 +01:00
parent e326e8ccdf
commit 1279180700
2 changed files with 9 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ereuse_devicehub/resources/action/views/trade.py
View File

@ -181,17 +181,17 @@ class ConfirmView(ConfirmMixin):
then remove the list this device of the list of devices of this action then remove the list this device of the list of devices of this action
""" """
real_devices = [] real_devices = []
trade = data['action']
lot = trade.lot
for dev in data['devices']: for dev in data['devices']:
ac = dev.last_action_trading if dev.trading(lot) not in ['NeedConfirmation', 'NeedConfirmRevoke']:
if ac.type == Confirm.t and not ac.user == g.user: raise ValidationError('Some devices not possible confirm.')
real_devices.append(dev)
data['devices'] = OrderedSet(real_devices)
# Change the owner for every devices # Change the owner for every devices
for dev in data['devices']: for dev in data['devices']:
user_to = data['action'].user_to if dev.trading_for_web(lot) == 'NeedConfirmation':
dev.change_owner(user_to) user_to = data['action'].user_to
dev.change_owner(user_to)
class RevokeView(ConfirmMixin): class RevokeView(ConfirmMixin):

57
ereuse_devicehub/resources/lot/views.py
View File

@ -261,8 +261,8 @@ class LotDeviceView(LotBaseChildrenView):
def delete_from_trade(lot: Lot, devices: List): def delete_from_trade(lot: Lot, devices: List):
users = [lot.trade.user_from.id, lot.trade.user_to.id] users = [lot.trade.user_from, lot.trade.user_to]
if g.user.id not in users: if g.user not in users:
# theoretically this case is impossible # theoretically this case is impossible
txt = 'This is not your trade' txt = 'This is not your trade'
raise ma.ValidationError(txt) raise ma.ValidationError(txt)
@ -303,56 +303,3 @@ def delete_from_trade(lot: Lot, devices: List):
lot.devices.difference_update(OrderedSet(drop_of_lot)) lot.devices.difference_update(OrderedSet(drop_of_lot))
return revoke return revoke
def delete_from_trade2(lot: Lot, ids: Set[int]):
users = [lot.trade.user_from.id, lot.trade.user_to.id]
if not g.user.id in users:
# theoretically this case is impossible
txt = 'This is not your trade'
raise ma.ValidationError(txt)
devices = set(Device.query.filter(Device.id.in_(ids)).filter(
Device.owner_id.in_(users)))
# Now we need to know which devices we need extract of the lot
without_confirms = set() # set of devs without confirms of user2
# if the trade need confirmation, then extract all devs than
# have only one confirmation and is from the same user than try to do
# now the revoke action
if lot.trade.confirm:
for dev in devices:
# if have only one confirmation
# then can be revoked and deleted of the lot
# Confirm of dev.trading mean that there are only one confirmation
# and the first user than put this device in trade is the actual g.user
if dev.trading(lot) == 'Confirm':
without_confirms.add(dev)
dev.reset_owner()
# we need to mark one revoke for every devs
revoke = Revoke(action=lot.trade, user=g.user, devices=devices)
db.session.add(revoke)
if not lot.trade.confirm:
# if the trade is with phantom account
without_confirms = devices
if without_confirms:
phantom = lot.trade.user_to
if lot.trade.user_to == g.user:
phantom = lot.trade.user_from
phantom_revoke = Revoke(
action=lot.trade,
user=phantom,
devices=without_confirms
)
db.session.add(phantom_revoke)
lot.devices.difference_update(without_confirms)
# TODO @cayop ?? we dont need this line
lot.trade.devices = lot.devices
return revoke