sync only wb devices
This commit is contained in:
parent
3c1c38ca18
commit
e3a7684865
|
@ -115,6 +115,7 @@ class Sync:
|
||||||
- A flag stating if the device is new or it already
|
- A flag stating if the device is new or it already
|
||||||
existed in the DB.
|
existed in the DB.
|
||||||
"""
|
"""
|
||||||
|
# if device.serial_number == 'b8oaas048286':
|
||||||
assert inspect(component).transient, 'Component should not be synced from DB'
|
assert inspect(component).transient, 'Component should not be synced from DB'
|
||||||
# if not is a DataStorage, then need build a new one
|
# if not is a DataStorage, then need build a new one
|
||||||
if component.t in DEVICES_ALLOW_DUPLICITY:
|
if component.t in DEVICES_ALLOW_DUPLICITY:
|
||||||
|
@ -126,7 +127,7 @@ class Sync:
|
||||||
try:
|
try:
|
||||||
if component.hid:
|
if component.hid:
|
||||||
db_component = Device.query.filter_by(
|
db_component = Device.query.filter_by(
|
||||||
hid=component.hid, owner_id=g.user.id
|
hid=component.hid, owner_id=g.user.id, placeholder=None
|
||||||
).one()
|
).one()
|
||||||
assert isinstance(
|
assert isinstance(
|
||||||
db_component, Device
|
db_component, Device
|
||||||
|
@ -185,18 +186,24 @@ class Sync:
|
||||||
if device.system_uuid:
|
if device.system_uuid:
|
||||||
with suppress(ResourceNotFound):
|
with suppress(ResourceNotFound):
|
||||||
db_device = Computer.query.filter_by(
|
db_device = Computer.query.filter_by(
|
||||||
system_uuid=device.system_uuid, owner_id=g.user.id, active=True
|
system_uuid=device.system_uuid,
|
||||||
|
owner_id=g.user.id,
|
||||||
|
active=True,
|
||||||
|
placeholder=None,
|
||||||
).one()
|
).one()
|
||||||
# if no there are any Computer by uuid search by hid
|
# if no there are any Computer by uuid search by hid
|
||||||
if not db_device and device.hid:
|
if not db_device and device.hid:
|
||||||
with suppress(ResourceNotFound):
|
with suppress(ResourceNotFound):
|
||||||
db_device = Device.query.filter_by(
|
db_device = Device.query.filter_by(
|
||||||
hid=device.hid, owner_id=g.user.id, active=True
|
hid=device.hid,
|
||||||
|
owner_id=g.user.id,
|
||||||
|
active=True,
|
||||||
|
placeholder=None,
|
||||||
).one()
|
).one()
|
||||||
elif device.hid:
|
elif device.hid:
|
||||||
with suppress(ResourceNotFound):
|
with suppress(ResourceNotFound):
|
||||||
db_device = Device.query.filter_by(
|
db_device = Device.query.filter_by(
|
||||||
hid=device.hid, owner_id=g.user.id, active=True
|
hid=device.hid, owner_id=g.user.id, active=True, placeholder=None
|
||||||
).one()
|
).one()
|
||||||
|
|
||||||
if db_device and db_device.allocated:
|
if db_device and db_device.allocated:
|
||||||
|
|
Reference in New Issue