Merge branch 'master' into voting-disable-frontend

Author: net8floz

CodeChallenge/api/vote.py

@@ -9,7 +9,7 @@
 from ..auth import Users
 from ..mail import mail
 from ..mailgun import mg_validate
-from ..models import Answer, db, Vote, Question
+from ..models import Answer, db, Vote, Question, ranking
 
 bp = Blueprint("voteapi", __name__, url_prefix="/api/v1/vote")
 
@@ -49,12 +49,13 @@ def get_contestants():
  Users.studentfirstname,
  Users.studentlastname,
  Users.username,
- func.concat(Users.studentfirstname, func.right(Users.studentlastname, 1))
+ func.concat(Users.studentfirstname, func.right(Users.studentlastname, 1)),
+ Answer.disqualified
  ) \
  .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:
@@ -186,6 +187,10 @@ def vote_confirm():
  return jsonify(status="error",
  reason="vote not found - try voting again, or contestant may have been disqualified.")
 
+ if v.confirmed:
+ return jsonify(status="success",
+ reason="vote already confirmed")
+
  delete_votes = Vote.query \
  .filter(Vote.voter_email == v.voter_email,
  Vote.id != v.id) \
@@ -199,6 +204,18 @@ def vote_confirm():
 
  db.session.commit()
 
+ msg = Message(subject="Vote confirmation successful!",
+ recipients=[v.voter_email])
+
+ votes, rank = v.ranking()
+
+ msg.html = render_template("challenge_vote_submitted.html",
+ username=v.answer.user.username,
+ votes=int(votes),
+ rank=rank)
+
+ mail.send(msg)
+
  return jsonify(status="success",
  reason="vote confirmed")
 
@@ -230,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)\

CodeChallenge/models.py

@@ -1,4 +1,6 @@
 from flask_sqlalchemy import SQLAlchemy
+from typing import Tuple
+
 
 db = SQLAlchemy()
 
@@ -11,6 +13,24 @@ def drop_all():
  db.drop_all()
 
 
+def ranking(answer_id: int) -> Tuple[int, int]:
+ return db.session.execute("""
+ select rainv.num_votes, rainv.rank
+ from (
+ select @rownum := @rownum + 1 as 'rank',
+ prequery.answer_id,
+ prequery.num_votes
+ from (select @rownum := 0) sqlvars,
+ (select answer_id,
+ count(*) as num_votes
+ from vote
+ group by answer_id
+ order by count(*) desc) prequery
+ ) as rainv
+ where answer_id = :answer_id
+ """, {'answer_id': answer_id}).first()
+
+
 class Question(db.Model):
  id = db.Column(db.Integer, primary_key=True)
  title = db.Column(db.String(5000), nullable=False)
@@ -39,7 +59,7 @@ class Answer(db.Model):
  user = db.relationship("Users", lazy=True, uselist=False)
  votes = db.relationship("Vote", cascade="all,delete",
  lazy=True, uselist=True)
- disqualified = db.Column(db.String)
+ disqualified = db.Column(db.String(255))
 
  def confirmed_votes(self) -> int:
  confirmed = 0
@@ -55,6 +75,7 @@ class Vote(db.Model):
  answer_id = db.Column(db.Integer,
  db.ForeignKey("answer.id", ondelete="cascade"),
  nullable=False)
+ answer = db.relationship("Answer", lazy=True, uselist=False)
  voter_email = db.Column(db.String(255), nullable=False)
  confirmed = db.Column(db.Boolean, nullable=False, default=False)
 
@@ -63,3 +84,6 @@ def existing_vote(email: str) -> bool:
  v = Vote.query.filter_by(voter_email=email).first()
  return v
 
+ def ranking(self):
+ return ranking(self.answer.id)
+