Furizon
/
furizon_webint
3
2
Fork 0
Code Issues 4 Pull Requests 1 Packages Projects Releases Wiki Activity

Update getOrderByCode_safe method name

This commit is contained in:
Stranck 2024-01-08 23:16:26 +01:00
parent 76c8df9e03
commit d08cded007
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
admin.py
View File

@ -26,7 +26,7 @@ async def clearCache(request, order:Order):
@bp.get('/room/unconfirm/<code>') @bp.get('/room/unconfirm/<code>')
async def unconfirmRoom(request, code, order:Order): async def unconfirmRoom(request, code, order:Order):
credentialsCheck(request, order) credentialsCheck(request, order)
dOrder = await getOrderByCode_safe(request, code) dOrder = await getOrderByCode(request, code, throwException=True)
if(not dOrder.room_confirmed): if(not dOrder.room_confirmed):
raise exceptions.BadRequest("Room is not confirmed!") raise exceptions.BadRequest("Room is not confirmed!")
@ -41,7 +41,7 @@ async def unconfirmRoom(request, code, order:Order):
@bp.get('/room/delete/<code>') @bp.get('/room/delete/<code>')
async def deleteRoom(request, code, order:Order): async def deleteRoom(request, code, order:Order):
credentialsCheck(request, order) credentialsCheck(request, order)
dOrder = await getOrderByCode_safe(request, code) dOrder = await getOrderByCode(request, code, throwException=True)
ppl = getPeopleInRoomByRoomId(request, code) ppl = getPeopleInRoomByRoomId(request, code)
for p in ppl: for p in ppl:
@ -61,7 +61,7 @@ async def deleteRoom(request, code, order:Order):
@bp.post('/room/rename/<code>') @bp.post('/room/rename/<code>')
async def renameRoom(request, code, order:Order): async def renameRoom(request, code, order:Order):
credentialsCheck(request, order) credentialsCheck(request, order)
dOrder = await getOrderByCode_safe(request, code) dOrder = await getOrderByCode(request, code, throwException=True)
name = request.form.get('name') name = request.form.get('name')
if len(name) > 64 or len(name) < 4: if len(name) > 64 or len(name) < 4:

6
utils.py
View File

@ -125,10 +125,12 @@ def sizeof_fmt(num, suffix="B"):
num /= 1000.0 num /= 1000.0
return f"{num:.1f}Yi{suffix}" return f"{num:.1f}Yi{suffix}"
async def getOrderByCode_safe(request, code): async def getOrderByCode(request, code, throwException=False):
res = await request.app.ctx.om.get_order(code=code) res = await request.app.ctx.om.get_order(code=code)
if not throwException:
return res
if res is None: if res is None:
raise exceptions.BadRequest(f"[getOrderByCode_safe] Code {code} not found!") raise exceptions.BadRequest(f"[getOrderByCode] Code {code} not found!")
return res return res
def getPeopleInRoomByRoomId(request, roomId): def getPeopleInRoomByRoomId(request, roomId):