put the correct user un rol_user

This commit is contained in:
Cayo Puigdefabregas 2021-09-27 14:58:25 +02:00
parent c2b0e6341f
commit 38db59b150

View file

@ -2,7 +2,7 @@ import copy
from datetime import datetime, timedelta from datetime import datetime, timedelta
from dateutil.tz import tzutc from dateutil.tz import tzutc
from flask import current_app as app, g from flask import current_app as app, g
from marshmallow import Schema as MarshmallowSchema, ValidationError, fields as f, validates_schema from marshmallow import Schema as MarshmallowSchema, ValidationError, fields as f, validates_schema, post_load
from marshmallow.fields import Boolean, DateTime, Decimal, Float, Integer, Nested, String, \ from marshmallow.fields import Boolean, DateTime, Decimal, Float, Integer, Nested, String, \
TimeDelta, UUID TimeDelta, UUID
from marshmallow.validate import Length, OneOf, Range from marshmallow.validate import Length, OneOf, Range
@ -426,6 +426,15 @@ class Ready(ActionWithMultipleDevices):
class ActionStatus(ActionWithMultipleDevices): class ActionStatus(ActionWithMultipleDevices):
rol_user = NestedOn(s_user.User, dump_only=True, exclude=('token',)) rol_user = NestedOn(s_user.User, dump_only=True, exclude=('token',))
@post_load
def put_rol_user(self, data: dict):
for dev in data['devices']:
if dev.trading in [None, 'Revoke', 'ConfirmRevoke']:
return data
trade = [ac for ac in dev.actions if ac.t == 'Trade'][-1]
if trade.user_to != g.user:
data['rol_user'] = trade.user_to
class Recycling(ActionStatus): class Recycling(ActionStatus):
__doc__ = m.Recycling.__doc__ __doc__ = m.Recycling.__doc__