Merge branch 'dq-leaderboard'

Author: usrbinsam

CodeChallenge/api/vote.py

@@ -55,7 +55,7 @@ def get_contestants():
  .join(Answer.question) \
  .join(Answer.user) \
  .outerjoin(Answer.votes) \
- .filter(Question.rank == core.max_rank(), Answer.correct) \
+ .filter(Question.rank == core.max_rank(), Answer.correct, Answer.disqualified.is_(None)) \
  .group_by(Answer.id)
 
  if desc is not None:
@@ -247,7 +247,7 @@ def search():
  .join(Answer.question) \
  .join(Answer.user) \
  .outerjoin(Answer.votes) \
- .filter(Question.rank == core.max_rank(), Answer.correct,
+ .filter(Question.rank == core.max_rank(), Answer.correct, Answer.disqualified.is_(None),
  or_(Users.username.ilike(keyword), Users.studentfirstname.ilike(keyword),
  Users.studentlastname.ilike(keyword))) \
  .group_by(Answer.id)\