aljaz/CTFd
1
0
Fork 0
mirror of https://github.com/aljazceru/CTFd.git synced 2025-12-17 22:14:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Optimize top10 call to make less db hits (#461)

Browse Source 
Instead of making a database call every iteration of the for loop, just make the needed database calls once and then organize it into the right structure after we have everything.
This commit is contained in:
Kevin Chung
2017-11-15 01:22:31 -05:00
committed by GitHub
parent 647d8e0b2d
commit ab2de6cf17
1 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
CTFd/scoreboard.py
View File

@@ -122,37 +122,42 @@ def topteams(count):
standings = get_standings(count=count)
for i, team in enumerate(standings):
solves = Solves.query.filter_by(teamid=team.teamid)
awards = Awards.query.filter_by(teamid=team.teamid)
team_ids = [team.teamid for team in standings]
freeze = utils.get_config('freeze')
solves = Solves.query.filter(Solves.teamid.in_(team_ids))
awards = Awards.query.filter(Awards.teamid.in_(team_ids))
if freeze:
solves = solves.filter(Solves.date < utils.unix_time_to_utc(freeze))
awards = awards.filter(Awards.date < utils.unix_time_to_utc(freeze))
freeze = utils.get_config('freeze')
solves = solves.all()
awards = awards.all()
if freeze:
solves = solves.filter(Solves.date < utils.unix_time_to_utc(freeze))
awards = awards.filter(Awards.date < utils.unix_time_to_utc(freeze))
solves = solves.all()
awards = awards.all()
for i, team in enumerate(team_ids):
json['places'][i + 1] = {
'id': team.teamid,
'name': team.name,
'id': standings[i].teamid,
'name': standings[i].name,
'solves': []
}
for x in solves:
json['places'][i + 1]['solves'].append({
'chal': x.chalid,
'team': x.teamid,
'value': x.chal.value,
'time': utils.unix_time(x.date)
})
for solve in solves:
if solve.teamid == team:
json['places'][i + 1]['solves'].append({
'chal': solve.chalid,
'team': solve.teamid,
'value': solve.chal.value,
'time': utils.unix_time(solve.date)
})
for award in awards:
json['places'][i + 1]['solves'].append({
'chal': None,
'team': award.teamid,
'value': award.value,
'time': utils.unix_time(award.date)
})
if award.teamid == team:
json['places'][i + 1]['solves'].append({
'chal': None,
'team': award.teamid,
'value': award.value,
'time': utils.unix_time(award.date)
})
json['places'][i + 1]['solves'] = sorted(json['places'][i + 1]['solves'], key=lambda k: k['time'])
return jsonify(json)