From d08cded00726a2b4c3f0a5fd21b2aa7941ea32a5 Mon Sep 17 00:00:00 2001 From: Stranck Date: Mon, 8 Jan 2024 23:16:26 +0100 Subject: [PATCH] Update getOrderByCode_safe method name --- admin.py | 6 +++--- utils.py | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/admin.py b/admin.py index df1d7fc..897b588 100644 --- a/admin.py +++ b/admin.py @@ -26,7 +26,7 @@ async def clearCache(request, order:Order): @bp.get('/room/unconfirm/') async def unconfirmRoom(request, code, order:Order): credentialsCheck(request, order) - dOrder = await getOrderByCode_safe(request, code) + dOrder = await getOrderByCode(request, code, throwException=True) if(not dOrder.room_confirmed): raise exceptions.BadRequest("Room is not confirmed!") @@ -41,7 +41,7 @@ async def unconfirmRoom(request, code, order:Order): @bp.get('/room/delete/') async def deleteRoom(request, code, order:Order): credentialsCheck(request, order) - dOrder = await getOrderByCode_safe(request, code) + dOrder = await getOrderByCode(request, code, throwException=True) ppl = getPeopleInRoomByRoomId(request, code) for p in ppl: @@ -61,7 +61,7 @@ async def deleteRoom(request, code, order:Order): @bp.post('/room/rename/') async def renameRoom(request, code, order:Order): credentialsCheck(request, order) - dOrder = await getOrderByCode_safe(request, code) + dOrder = await getOrderByCode(request, code, throwException=True) name = request.form.get('name') if len(name) > 64 or len(name) < 4: diff --git a/utils.py b/utils.py index ae44b1d..211a994 100644 --- a/utils.py +++ b/utils.py @@ -125,10 +125,12 @@ def sizeof_fmt(num, suffix="B"): num /= 1000.0 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) + if not throwException: + return res 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 def getPeopleInRoomByRoomId(request, roomId):