From 5b6f0d76f258375650bb1a8146b942b9e6271b96 Mon Sep 17 00:00:00 2001 From: Mo8it Date: Mon, 16 May 2022 22:23:15 +0200 Subject: [PATCH] Use get_first() in models.py --- advlabdb/models.py | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/advlabdb/models.py b/advlabdb/models.py index 3c5b877..35eb747 100644 --- a/advlabdb/models.py +++ b/advlabdb/models.py @@ -16,6 +16,7 @@ from sqlalchemy import select from . import db from .configUtils import getConfig from .exceptions import DataBaseException +from .model_independent_funs import get_first MIN_MARK = 0 MAX_MARK = 15 @@ -171,15 +172,10 @@ class Group(db.Model): semester = part_students[0].part.semester program = part_students[0].part.program - highestGroupNumber = ( - db.session.execute( - select(Group.number) - .where(Group.semester == semester, Group.program == program) - .order_by(Group.number.desc()) - .limit(1) - ) - .scalars() - .first() + highestGroupNumber = get_first( + select(Group.number) + .where(Group.semester == semester, Group.program == program) + .order_by(Group.number.desc()) ) if highestGroupNumber is not None: