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

adding tag when there are a new device

Browse source
This commit is contained in:
Cayo Puigdefabregas 2021-10-22 14:19:42 +02:00
parent 9972c1666f
commit 2ade5a14d4
1 changed files with 31 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
ereuse_devicehub/resources/device/models.py
View file

@ -9,9 +9,7 @@ from typing import Dict, List, Set
from boltons import urlutils from boltons import urlutils
from citext import CIText from citext import CIText
from flask_sqlalchemy import event
from ereuse_utils.naming import HID_CONVERSION_DOC, Naming from ereuse_utils.naming import HID_CONVERSION_DOC, Naming
from flask import g
from more_itertools import unique_everseen from more_itertools import unique_everseen
from sqlalchemy import BigInteger, Boolean, Column, Enum as DBEnum, Float, ForeignKey, Integer, \ from sqlalchemy import BigInteger, Boolean, Column, Enum as DBEnum, Float, ForeignKey, Integer, \
Sequence, SmallInteger, Unicode, inspect, text Sequence, SmallInteger, Unicode, inspect, text
@ -41,7 +39,12 @@ def create_code(context):
_id = Device.query.order_by(Device.id.desc()).first() or 1 _id = Device.query.order_by(Device.id.desc()).first() or 1
if not _id == 1: if not _id == 1:
_id = _id.id + 1 _id = _id.id + 1
return hashcode.encode(_id) code = hashcode.encode(_id)
from ereuse_devicehub.resources.tag.model import Tag
tag = Tag(device_id=_id, id=code)
db.session.add(tag)
return code
class Device(Thing): class Device(Thing):
@ -231,7 +234,7 @@ class Device(Thing):
:return a list of actions: :return a list of actions:
""" """
hide_actions = ['Price', 'EreusePrice'] hide_actions = ['Price', 'EreusePrice']
actions = [ac for ac in self.actions if not ac.t in hide_actions] actions = [ac for ac in self.actions if ac.t not in hide_actions]
actions.reverse() actions.reverse()
return actions return actions
@ -288,7 +291,7 @@ class Device(Thing):
status_actions = [ac.t for ac in states.Status.actions()] status_actions = [ac.t for ac in states.Status.actions()]
history = [] history = []
for ac in self.actions: for ac in self.actions:
if not ac.t in status_actions: if ac.t not in status_actions:
continue continue
if not history: if not history:
history.append(ac) history.append(ac)
@ -318,27 +321,27 @@ class Device(Thing):
# return the correct status of trade depending of the user # return the correct status of trade depending of the user
##### CASES ##### # #### CASES #####
## User1 == owner of trade (This user have automatic Confirmation) # User1 == owner of trade (This user have automatic Confirmation)
## ======================= # =======================
## if the last action is => only allow to do # if the last action is => only allow to do
## ========================================== # ==========================================
## Confirmation not User1 => Revoke # Confirmation not User1 => Revoke
## Confirmation User1 => Revoke # Confirmation User1 => Revoke
## Revoke not User1 => ConfirmRevoke # Revoke not User1 => ConfirmRevoke
## Revoke User1 => RevokePending # Revoke User1 => RevokePending
## RevokeConfirmation => RevokeConfirmed # RevokeConfirmation => RevokeConfirmed
## #
## #
## User2 == Not owner of trade # User2 == Not owner of trade
## ======================= # =======================
## if the last action is => only allow to do # if the last action is => only allow to do
## ========================================== # ==========================================
## Confirmation not User2 => Confirm # Confirmation not User2 => Confirm
## Confirmation User2 => Revoke # Confirmation User2 => Revoke
## Revoke not User2 => ConfirmRevoke # Revoke not User2 => ConfirmRevoke
## Revoke User2 => RevokePending # Revoke User2 => RevokePending
## RevokeConfirmation => RevokeConfirmed # RevokeConfirmation => RevokeConfirmed
ac = self.last_action_trading ac = self.last_action_trading
if not ac: if not ac:
@ -427,8 +430,8 @@ class Device(Thing):
# TODO @cayop uncomment this lines for link the possessor with the device # TODO @cayop uncomment this lines for link the possessor with the device
# from ereuse_devicehub.resources.action.models import Receive # from ereuse_devicehub.resources.action.models import Receive
# with suppress(LookupError): # with suppress(LookupError):
# action = self.last_action_of(Receive) # action = self.last_action_of(Receive)
# return action.agent_to # return action.agent_to
@property @property
def working(self): def working(self):
@ -1166,4 +1169,3 @@ class Manufacturer(db.Model):
listener_reset_field_updated_in_actual_time(Device) listener_reset_field_updated_in_actual_time(Device)