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

fixing bugs

This commit is contained in:
Cayo Puigdefabregas 2020-11-21 15:52:29 +01:00
parent 0415b7efb9
commit 775cd9a215
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,13 +69,17 @@ class Allocate(ActionWithMultipleDevices):
description = SanitizedStr(default='', description=m.Action.description.comment) description = SanitizedStr(default='', description=m.Action.description.comment)
start_time = DateTime(data_key='start_time', description=m.Action.start_time.comment) start_time = DateTime(data_key='start_time', description=m.Action.start_time.comment)
end_time = DateTime(data_key='end_time', description=m.Action.end_time.comment) end_time = DateTime(data_key='end_time', description=m.Action.end_time.comment)
code = SanitizedStr(validate=Length(min=1, max=STR_BIG_SIZE), code = SanitizedStr(data_key='Transaction', validate=Length(min=1, max=STR_BIG_SIZE),
required=False, required=False,
description='The code of the agent to assigned.') description='The code of the agent to assigned.')
end_users = Integer(validate=[Range(min=1, error="Value must be greater than 0")], end_users = Integer(validate=[Range(min=1, error="Value must be greater than 0")],
required=True) required=True)
class Deallocate(ActionWithMultipleDevices):
__doc__ = m.Deallocate.__doc__
class EraseBasic(ActionWithOneDevice): class EraseBasic(ActionWithOneDevice):
__doc__ = m.EraseBasic.__doc__ __doc__ = m.EraseBasic.__doc__
steps = NestedOn('Step', many=True) steps = NestedOn('Step', many=True)

10
ereuse_devicehub/resources/allocate/views.py
View File

@ -12,7 +12,7 @@ class AllocateMix():
def post(self): def post(self):
""" Create one res_obj """ """ Create one res_obj """
res_json = request.get_json() res_json = request.get_json()
res_obj = model(**res_json) res_obj = self.model(**res_json)
db.session.add(res_obj) db.session.add(res_obj)
db.session().final_flush() db.session().final_flush()
ret = self.schema.jsonify(res_obj) ret = self.schema.jsonify(res_obj)
@ -21,8 +21,8 @@ class AllocateMix():
return ret return ret
def find(self, args: dict): def find(self, args: dict):
res_objs = model.query.filter_by(author=g.user) \ res_objs = self.model.query.filter_by(author=g.user) \
.order_by(model.created.desc()) \ .order_by(self.model.created.desc()) \
.paginate(per_page=200) .paginate(per_page=200)
return things_response( return things_response(
self.schema.dump(res_objs.items, many=True, nested=0), self.schema.dump(res_objs.items, many=True, nested=0),
@ -31,9 +31,9 @@ class AllocateMix():
) )
class AllocateView(AllocateMix): class AllocateView(AllocateMix, View):
model = Allocate model = Allocate
class DeallocateView(AllocateMix): class DeallocateView(AllocateMix, View):
model = Deallocate model = Deallocate