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

Change FOREIGN keys to User.ethereum_address to User.id, resolves #14

Browse source
This commit is contained in:
yiorgos marinellis 2020-04-01 19:11:14 +02:00
parent fea6f23c0c
commit e78b1c5db3
4 changed files with 32 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -52,22 +52,22 @@ class Device(Thing):
""" """
type = Column(Unicode(STR_SM_SIZE), nullable=False) type = Column(Unicode(STR_SM_SIZE), nullable=False)
hid = Column(Unicode(), check_lower('hid'), unique=True) hid = Column(Unicode(), check_lower('hid'), unique=True)
hid.comment = """The Hardware ID (HID) is the unique ID traceability hid.comment = """The Hardware ID (HID) is the unique ID traceability
systems use to ID a device globally. This field is auto-generated systems use to ID a device globally. This field is auto-generated
from Devicehub using literal identifiers from the device, from Devicehub using literal identifiers from the device,
so it can re-generated *offline*. so it can re-generated *offline*.
""" + HID_CONVERSION_DOC """ + HID_CONVERSION_DOC
model = Column(Unicode, check_lower('model')) model = Column(Unicode, check_lower('model'))
model.comment = """The model of the device in lower case. model.comment = """The model of the device in lower case.
The model is the unambiguous, as technical as possible, denomination The model is the unambiguous, as technical as possible, denomination
for the product. This field, among others, is used to identify for the product. This field, among others, is used to identify
the product. the product.
""" """
manufacturer = Column(Unicode(), check_lower('manufacturer')) manufacturer = Column(Unicode(), check_lower('manufacturer'))
manufacturer.comment = """The normalized name of the manufacturer, manufacturer.comment = """The normalized name of the manufacturer,
in lower case. in lower case.
Although as of now Devicehub does not enforce normalization, Although as of now Devicehub does not enforce normalization,
users can choose a list of normalized manufacturer names users can choose a list of normalized manufacturer names
from the own ``/manufacturers`` REST endpoint. from the own ``/manufacturers`` REST endpoint.
@ -76,7 +76,7 @@ class Device(Thing):
serial_number.comment = """The serial number of the device in lower case.""" serial_number.comment = """The serial number of the device in lower case."""
brand = db.Column(CIText()) brand = db.Column(CIText())
brand.comment = """A naming for consumers. This field can represent brand.comment = """A naming for consumers. This field can represent
several models, so it can be ambiguous, and it is not used to several models, so it can be ambiguous, and it is not used to
identify the product. identify the product.
""" """
generation = db.Column(db.SmallInteger, check_range('generation', 0)) generation = db.Column(db.SmallInteger, check_range('generation', 0))
@ -94,14 +94,14 @@ class Device(Thing):
color = Column(ColorType) color = Column(ColorType)
color.comment = """The predominant color of the device.""" color.comment = """The predominant color of the device."""
production_date = Column(db.DateTime) production_date = Column(db.DateTime)
production_date.comment = """The date of production of the device. production_date.comment = """The date of production of the device.
This is timezone naive, as Workbench cannot report this data This is timezone naive, as Workbench cannot report this data
with timezone information. with timezone information.
""" """
variant = Column(db.CIText()) variant = Column(db.CIText())
variant.comment = """A variant or sub-model of the device.""" variant.comment = """A variant or sub-model of the device."""
sku = db.Column(db.CIText()) sku = db.Column(db.CIText())
sku.comment = """The Stock Keeping Unit (SKU), i.e. a sku.comment = """The Stock Keeping Unit (SKU), i.e. a
merchant-specific identifier for a product or service. merchant-specific identifier for a product or service.
""" """
image = db.Column(db.URL) image = db.Column(db.URL)
@ -312,17 +312,17 @@ class DisplayMixin:
size = Column(Float(decimal_return_scale=1), check_range('size', 2, 150), nullable=False) size = Column(Float(decimal_return_scale=1), check_range('size', 2, 150), nullable=False)
size.comment = """The size of the monitor in inches.""" size.comment = """The size of the monitor in inches."""
technology = Column(DBEnum(DisplayTech)) technology = Column(DBEnum(DisplayTech))
technology.comment = """The technology the monitor uses to display technology.comment = """The technology the monitor uses to display
the image. the image.
""" """
resolution_width = Column(SmallInteger, check_range('resolution_width', 10, 20000), resolution_width = Column(SmallInteger, check_range('resolution_width', 10, 20000),
nullable=False) nullable=False)
resolution_width.comment = """The maximum horizontal resolution the resolution_width.comment = """The maximum horizontal resolution the
monitor can natively support in pixels. monitor can natively support in pixels.
""" """
resolution_height = Column(SmallInteger, check_range('resolution_height', 10, 20000), resolution_height = Column(SmallInteger, check_range('resolution_height', 10, 20000),
nullable=False) nullable=False)
resolution_height.comment = """The maximum vertical resolution the resolution_height.comment = """The maximum vertical resolution the
monitor can natively support in pixels. monitor can natively support in pixels.
""" """
refresh_rate = Column(SmallInteger, check_range('refresh_rate', 10, 1000)) refresh_rate = Column(SmallInteger, check_range('refresh_rate', 10, 1000))
@ -384,17 +384,17 @@ class Computer(Device):
""" """
ethereum_address = Column(CIText(), unique=True, default=None) ethereum_address = Column(CIText(), unique=True, default=None)
deposit = Column(Integer, check_range('deposit',min=0,max=100), default=0) deposit = Column(Integer, check_range('deposit',min=0,max=100), default=0)
owner_address = db.Column(CIText(), owner_id = db.Column(UUID(as_uuid=True),
db.ForeignKey(User.ethereum_address), db.ForeignKey(User.id),
nullable=False, nullable=False,
default=lambda: g.user.ethereum_address) default=lambda: g.user.id)
author = db.relationship(User, primaryjoin=owner_address == User.ethereum_address) author = db.relationship(User, primaryjoin=owner_id == User.id)
transfer_state = db.Column(IntEnum(TransferState), default=TransferState.Initial, nullable=False) transfer_state = db.Column(IntEnum(TransferState), default=TransferState.Initial, nullable=False)
transfer_state.comment = TransferState.__doc__ transfer_state.comment = TransferState.__doc__
receiver_address = db.Column(CIText(), receiver_id = db.Column(UUID(as_uuid=True),
db.ForeignKey(User.ethereum_address), db.ForeignKey(User.id),
nullable=True) nullable=True)
receiver = db.relationship(User, primaryjoin=receiver_address == User.ethereum_address) receiver = db.relationship(User, primaryjoin=receiver_id == User.id)
deliverynote_address = db.Column(CIText(), nullable=True) deliverynote_address = db.Column(CIText(), nullable=True)
def __init__(self, chassis, **kwargs) -> None: def __init__(self, chassis, **kwargs) -> None:
@ -502,11 +502,11 @@ class Mobile(Device):
id = Column(BigInteger, ForeignKey(Device.id), primary_key=True) id = Column(BigInteger, ForeignKey(Device.id), primary_key=True)
imei = Column(BigInteger) imei = Column(BigInteger)
imei.comment = """The International Mobile Equipment Identity of imei.comment = """The International Mobile Equipment Identity of
the smartphone as an integer. the smartphone as an integer.
""" """
meid = Column(Unicode) meid = Column(Unicode)
meid.comment = """The Mobile Equipment Identifier as a hexadecimal meid.comment = """The Mobile Equipment Identifier as a hexadecimal
string. string.
""" """
ram_size = db.Column(db.Integer, check_range(1, )) ram_size = db.Column(db.Integer, check_range(1, ))
@ -639,7 +639,7 @@ class Motherboard(JoinedComponentTableMixin, Component):
class NetworkMixin: class NetworkMixin:
speed = Column(SmallInteger, check_range('speed', min=10, max=10000)) speed = Column(SmallInteger, check_range('speed', min=10, max=10000))
speed.comment = """The maximum speed this network adapter can handle, speed.comment = """The maximum speed this network adapter can handle,
in mbps. in mbps.
""" """
wireless = Column(Boolean, nullable=False, default=False) wireless = Column(Boolean, nullable=False, default=False)
@ -698,7 +698,7 @@ class Battery(JoinedComponentTableMixin, Component):
technology = db.Column(db.Enum(BatteryTechnology)) technology = db.Column(db.Enum(BatteryTechnology))
size = db.Column(db.Integer, nullable=False) size = db.Column(db.Integer, nullable=False)
size.comment = """Maximum battery capacity by design, in mAh. size.comment = """Maximum battery capacity by design, in mAh.
Use BatteryTest's "size" to get the actual size of the battery. Use BatteryTest's "size" to get the actual size of the battery.
""" """

6
ereuse_devicehub/resources/device/schemas.py
View file

@ -126,11 +126,11 @@ class Computer(Device):
deposit = Integer(validate=f.validate.Range(min=0, max=100), deposit = Integer(validate=f.validate.Range(min=0, max=100),
description=m.Computer.deposit.__doc__) description=m.Computer.deposit.__doc__)
# author_id = NestedOn(s_user.User,only_query='author_id') # author_id = NestedOn(s_user.User,only_query='author_id')
owner_address = SanitizedStr(validate=f.validate.Length(max=42)) owner_id = UUID(data_key='ownerID')
transfer_state = EnumField(enums.TransferState, description=m.Computer.transfer_state.comment) transfer_state = EnumField(enums.TransferState, description=m.Computer.transfer_state.comment)
receiver_address = SanitizedStr(validate=f.validate.Length(max=42)) receiver_id = UUID(data_key='receiverID')
deliverynote_address = SanitizedStr(validate=f.validate.Length(max=42)) deliverynote_address = SanitizedStr(validate=f.validate.Length(max=42))
class Desktop(Computer): class Desktop(Computer):
__doc__ = m.Desktop.__doc__ __doc__ = m.Desktop.__doc__

12
ereuse_devicehub/resources/lot/models.py
View file

@ -32,8 +32,8 @@ class Lot(Thing):
lazy=True, lazy=True,
collection_class=set) collection_class=set)
"""The **children** devices that the lot has. """The **children** devices that the lot has.
Note that the lot can have more devices, if they are inside Note that the lot can have more devices, if they are inside
descendant lots. descendant lots.
""" """
parents = db.relationship(lambda: Lot, parents = db.relationship(lambda: Lot,
@ -63,11 +63,11 @@ class Lot(Thing):
descendants. descendants.
""" """
deposit = db.Column(db.Integer, check_range('deposit', min=0, max=100), default=0) deposit = db.Column(db.Integer, check_range('deposit', min=0, max=100), default=0)
owner_address = db.Column(CIText(), owner_id = db.Column(UUID(as_uuid=True),
db.ForeignKey(User.ethereum_address), db.ForeignKey(User.id),
nullable=False, nullable=False,
default=lambda: g.user.ethereum_address) default=lambda: g.user.id)
owner = db.relationship(User, primaryjoin=owner_address == User.ethereum_address) owner = db.relationship(User, primaryjoin=owner_id == User.id)
transfer_state = db.Column(IntEnum(TransferState), default=TransferState.Initial, nullable=False) transfer_state = db.Column(IntEnum(TransferState), default=TransferState.Initial, nullable=False)
transfer_state.comment = TransferState.__doc__ transfer_state.comment = TransferState.__doc__
receiver_address = db.Column(CIText(), receiver_address = db.Column(CIText(),

2
ereuse_devicehub/resources/lot/schemas.py
View file

@ -22,7 +22,7 @@ class Lot(Thing):
deposit = f.Integer(validate=f.validate.Range(min=0, max=100), deposit = f.Integer(validate=f.validate.Range(min=0, max=100),
description=m.Lot.deposit.__doc__) description=m.Lot.deposit.__doc__)
# author_id = NestedOn(s_user.User,only_query='author_id') # author_id = NestedOn(s_user.User,only_query='author_id')
owner_address = SanitizedStr(validate=f.validate.Length(max=42)) owner_id = f.UUID(data_key='ownerID')
transfer_state = EnumField(TransferState, description=m.Lot.transfer_state.comment) transfer_state = EnumField(TransferState, description=m.Lot.transfer_state.comment)
receiver_address = SanitizedStr(validate=f.validate.Length(max=42)) receiver_address = SanitizedStr(validate=f.validate.Length(max=42))
deliverynote = NestedOn(s_deliverynote.Deliverynote, dump_only=True) deliverynote = NestedOn(s_deliverynote.Deliverynote, dump_only=True)