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

adding finale user to live action

This commit is contained in:
Cayo Puigdefabregas 2020-12-01 17:27:43 +01:00
parent 05c81382f2
commit 783265ad65
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ereuse_devicehub/migrations/versions/e93aec8fc41f_added_assigned_action.py
View File

@ -60,6 +60,8 @@ def upgrade():
op.drop_table('live', schema=f'{get_inv()}') op.drop_table('live', schema=f'{get_inv()}')
op.create_table('live', op.create_table('live',
sa.Column('id', postgresql.UUID(as_uuid=True), nullable=False), sa.Column('id', postgresql.UUID(as_uuid=True), nullable=False),
sa.Column('final_user_code', citext.CIText(), default='', nullable=True,
comment = "This is a internal code for mainteing the secrets of the personal datas of the new holder"),
sa.Column('serial_number', sa.Unicode(), nullable=True, sa.Column('serial_number', sa.Unicode(), nullable=True,
comment='The serial number of the Hard Disk in lower case.'), comment='The serial number of the Hard Disk in lower case.'),
sa.Column('time', sa.SmallInteger(), nullable=True), sa.Column('time', sa.SmallInteger(), nullable=True),

3
ereuse_devicehub/resources/action/models.py
View File

@ -1299,6 +1299,9 @@ class Live(JoinedWithOneDeviceMixin, ActionWithOneDevice):
information about its state (in the form of a ``Snapshot`` action) information about its state (in the form of a ``Snapshot`` action)
and usage statistics. and usage statistics.
""" """
final_user_code = Column(CIText(), default='', nullable=True)
final_user_code.comment = """This is a internal code for mainteing the secrets of the
personal datas of the new holder"""
serial_number = Column(Unicode(), check_lower('serial_number')) serial_number = Column(Unicode(), check_lower('serial_number'))
serial_number.comment = """The serial number of the Hard Disk in lower case.""" serial_number.comment = """The serial number of the Hard Disk in lower case."""
time = Column(SmallInteger, nullable=False) time = Column(SmallInteger, nullable=False)

12
ereuse_devicehub/resources/action/schemas.py
View File

@ -412,15 +412,9 @@ class Prepare(ActionWithMultipleDevices):
class Live(ActionWithOneDevice): class Live(ActionWithOneDevice):
__doc__ = m.Live.__doc__ __doc__ = m.Live.__doc__
ip = IP(dump_only=True) final_user_code = SanitizedStr(data_key="finalUserCode", dump_only=True)
subdivision_confidence = Integer(dump_only=True, data_key='subdivisionConfidence') serial_number = SanitizedStr(data_key="serialNumber", dump_only=True)
subdivision = EnumField(Subdivision, dump_only=True) time = Integer(dump_only=False)
country = EnumField(Country, dump_only=True)
city = SanitizedStr(lower=True, dump_only=True)
city_confidence = Integer(dump_only=True, data_key='cityConfidence')
isp = SanitizedStr(lower=True, dump_only=True)
organization = SanitizedStr(lower=True, dump_only=True)
organization_type = SanitizedStr(lower=True, dump_only=True, data_key='organizationType')
class Organize(ActionWithMultipleDevices): class Organize(ActionWithMultipleDevices):