Make get_or_increase_name queries less demanding

This commit is contained in:
Curtis Castrapel 2019-05-29 12:20:05 -07:00
parent 9da428c7fd
commit f81adb1371
1 changed files with 6 additions and 6 deletions

View File

@ -71,21 +71,21 @@ def get_sequence(name):
def get_or_increase_name(name, serial): def get_or_increase_name(name, serial):
certificates = Certificate.query.filter( certificates = Certificate.query.filter(Certificate.name == name).all()
Certificate.name.ilike("{0}%".format(name))
).all()
if not certificates: if not certificates:
return name return name
serial_name = "{0}-{1}".format(name, hex(int(serial))[2:].upper()) serial_name = "{0}-{1}".format(name, hex(int(serial))[2:].upper())
certificates = Certificate.query.filter( certificates = Certificate.query.filter(Certificate.name == serial_name).all()
Certificate.name.ilike("{0}%".format(serial_name))
).all()
if not certificates: if not certificates:
return serial_name return serial_name
certificates = Certificate.query.filter(
Certificate.name.ilike("{0}%".format(serial_name))
).all()
ends = [0] ends = [0]
root, end = get_sequence(serial_name) root, end = get_sequence(serial_name)
for cert in certificates: for cert in certificates: