Merge branch 'stage' into master

Author: usrbinsam

CodeChallenge/api/vote.py

@@ -2,6 +2,7 @@
 from flask_jwt_extended import get_current_user, jwt_optional
 from flask_mail import Message
 from itsdangerous import URLSafeSerializer
+from sqlalchemy import or_
 
 from .. import core
 from ..auth import Users
@@ -49,25 +50,14 @@ def get_contestants():
  contestants = []
  for ans in p.items: # type: Answer
 
- display = None
- if ans.user.studentfirstname \
- and ans.user.studentlastname:
- display = f"{ans.user.studentfirstname} " \
- f"{ans.user.studentlastname[0]}."
-
- confirmed_votes = []
- for v in ans.votes:
- if v.confirmed:
- confirmed_votes.append(v)
-
  contestants.append(dict(
  id=ans.id,
  text=ans.text,
- numVotes=len(confirmed_votes),
+ numVotes=ans.confirmed_votes(),
  firstName=ans.user.studentfirstname,
  lastName=ans.user.studentlastname,
  username=ans.user.username,
- display=display
+ display=ans.user.display()
  ))
 
  return jsonify(
@@ -188,3 +178,51 @@ def vote_confirm():
 
  return jsonify(status="success",
  reason="vote confirmed")
+
+
+@bp.route("/search", methods=["GET"])
+def search():
+ keyword = request.args.get("q")
+ try:
+ page = int(request.args.get("page", 1))
+ per = int(request.args.get("per", 20))
+ except ValueError:
+ return jsonify(status="error",
+ reason="invalid 'page' or 'per' parameter"), 400
+
+ if keyword is None:
+ return jsonify(status="error", reason="missing 'q' parameter"), 400
+
+ keyword = f"%{keyword}%"
+
+ p = Answer.query \
+ .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))) \
+ .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,
+ totalItems=p.total,
+ page=p.page,
+ totalPages=p.pages,
+ hasNext=p.has_next,
+ nextNum=p.next_num,
+ hasPrev=p.has_prev,
+ prevNum=p.prev_num
+ )

CodeChallenge/auth.py

@@ -53,6 +53,13 @@ def votes(self):
  .all()
  return v
 
+ def display(self):
+ if self.studentfirstname is not None \
+ and self.studentlastname is not None \
+ and len(self.studentlastname):
+ return f"{self.studentfirstname} " \
+ f"{self.studentlastname[0]}."
+
 
 def hash_password(plaintext):
  ph = argon2.PasswordHasher()

CodeChallenge/models.py

@@ -40,6 +40,14 @@ class Answer(db.Model):
  votes = db.relationship("Vote", cascade="all,delete",
  lazy=True, uselist=True)
 
+ def confirmed_votes(self) -> int:
+ confirmed = 0
+ for vote in self.votes:
+ if vote.confirmed:
+ confirmed += 1
+
+ return confirmed
+
 
 class Vote(db.Model):
  id = db.Column(db.Integer, primary_key=True)

package.json

@@ -41,7 +41,9 @@
  "vue-cli-plugin-codemirror": "^0.0.6",
  "vue-cli-plugin-vuetify": "^2.0.3",
  "vue-template-compiler": "^2.6.10",
- "vuetify-loader": "^1.3.0"
+ "vuetify-loader": "^1.3.0",
+ "minimist": "^1.2.2",
+ "acorn": "^6.4.1"
  },
  "eslintConfig": {
  "root": true,

src/api/routes.js

@@ -29,7 +29,8 @@ export default {
  voting_cast: id => {
  return route(`/api/v1/vote/${id}/cast`, "POST");
  },
- voting_confirm: route("/api/v1/vote/confirm", "POST")
+ voting_confirm: route("/api/v1/vote/confirm", "POST"),
+ voting_ballot_search: route("/api/v1/vote/search", "GET")
 };
 
 // export default {

src/api/voting.js

@@ -1,6 +1,15 @@
 import routes from "./routes";
 import request from "./request";
 
+function processBallotResponse(result) {
+ if (result.items) {
+ result.items = result.items.map(item => {
+ return { ...item, ...{ initials: initials(item) } };
+ });
+ }
+ return result;
+}
+
 function lastInitial(item) {
  if (item.lastName) {
  return item.lastName[0];
@@ -26,16 +35,11 @@ function initials(item) {
 }
 
 async function getBallot(page, per) {
- const result = await request(routes.voting_ballot, {
- params: { page, per }
- });
-
- if (result.items) {
- result.items = result.items.map(item => {
- return { ...item, ...{ initials: initials(item) } };
- });
- }
- return result;
+ return processBallotResponse(
+ await request(routes.voting_ballot, {
+ params: { page, per }
+ })
+ );
 }
 
 async function cast(answerId, email) {
@@ -46,8 +50,17 @@ async function confirm(token) {
  return request(routes.voting_confirm, { data: { token } });
 }
 
+async function search(text, page, per) {
+ return processBallotResponse(
+ await request(routes.voting_ballot_search, {
+ params: { q: text, page, per }
+ })
+ );
+}
+
 export default {
  getBallot,
  cast,
- confirm
+ confirm,
+ search
 };

src/styles/ballot-card.scss

@@ -22,7 +22,7 @@ $ballot-gray: #ddd;
 .ballot-card {
  margin: 25px;
  width: 200px;
- height: 300px;
+ height: 320px;
  background-color: #fff !important;
 
  border: solid 2px $ballot-gray !important;