fix incorrect answers showing up

fix searching endpoint

Author: usrbinsam

CodeChallenge/api/vote.py

@@ -54,7 +54,7 @@ def get_contestants():
  .join(Answer.question) \
  .join(Answer.user) \
  .outerjoin(Answer.votes) \
- .filter(Question.rank == core.max_rank()) \
+ .filter(Question.rank == core.max_rank(), Vote.confirmed.is_(True), Answer.correct) \
  .group_by(Answer.id)
 
  if desc is not None:
@@ -214,29 +214,26 @@ def search():
 
  keyword = f"%{keyword}%"
 
- p = Answer.query \
+ p = Answer.query.with_entities(
+ Answer.id,
+ Answer.text,
+ func.count(Answer.votes),
+ Users.studentfirstname,
+ Users.studentlastname,
+ Users.username,
+ func.concat(Users.studentfirstname, func.right(Users.studentlastname, 1))
+ ) \
  .join(Answer.question) \
  .join(Answer.user) \
- .filter(Question.rank == core.max_rank(),
- Answer.correct, or_(Users.username.ilike(keyword), Users.studentlastname.ilike(keyword),
- Users.studentlastname.ilike(keyword))) \
+ .outerjoin(Answer.votes) \
+ .filter(Question.rank == core.max_rank(), Vote.confirmed.is_(True), Answer.correct,
+ or_(Users.username.ilike(keyword), Users.studentfirstname.ilike(keyword),
+ Users.studentlastname.ilike(keyword))) \
+ .group_by(Answer.id)\
  .paginate(page=page, per_page=per)
 
- results = []
-
- for ans in p.items: # type: Answer
- results.append(dict(
- id=ans.id,
- text=ans.text,
- numVotes=ans.confirmed_votes(),
- firstName=ans.user.studentfirstname,
- lastName=ans.user.studentlastname,
- username=ans.user.username,
- display=ans.user.display()
- ))
-
  return jsonify(
- items=results,
+ items=p.items,
  totalItems=p.total,
  page=p.page,
  totalPages=p.pages,

CodeChallenge/config.py

@@ -81,8 +81,8 @@ class ProductionConfig(DefaultConfig):
 
 class DevelopmentConfig(ProductionConfig):
  EXTERNAL_URL = "http://localhost:8080"
- #SQLALCHEMY_DATABASE_URI = "mysql://cc-user:password@localhost" \
- # "/code_challenge_local"
+ SQLALCHEMY_DATABASE_URI = os.getenv("SQLALCHEMY_DATABASE_URI",
+  "mysql://cc-user:password@localhost/code_challenge_local")
  JWT_COOKIE_SECURE = False
  CODE_CHALLENGE_START = os.getenv("CODE_CHALLENGE_START", "1581415200")
  JWT_SECRET_KEY = "SuperSecret"