Merge pull request #116 from codewizardshq/master

begin sync

Author: net8floz

CodeChallenge/api/eb.py

@@ -37,7 +37,8 @@ def worker():
  recipients=[current_app.config["MG_LIST"]])
 
  msg.html = render_template("challenge_daily_email.html",
- name="%recipient_fname%")
+ name="%recipient_fname%",
+ external_url=current_app.config["EXTERNAL_URL"])
  msg.extra_headers = {"List-Unsubscribe": "%unsubscribe_email%"}
 
  mail.send(msg)

CodeChallenge/api/questions.py

@@ -105,7 +105,12 @@ def answer_next_question():
 
  data = request.get_json()
  text = data["text"]
- correct = str_cmp(text.lower(), q.answer.lower())
+
+ try:
+ correct = str_cmp(text.casefold().strip(), q.answer.lower())
+ except TypeError:
+ return jsonify(status="success", correct=False)
+
 
  ans = Answer.query.filter_by(user_id=user.id, question_id=q.id).first()
 
@@ -199,6 +204,10 @@ def answer_eval():
  return jsonify(status="error",
  reason="missing 'language' property in JSON body"), 400
 
+ if language not in ("js", "python"):
+ return jsonify(status="error",
+ reason="unsupported language. valid choices are 'js' or 'python'"), 400
+
  # designated output variable for evaluation
  if language == "js":
  code += ";output"
@@ -220,13 +229,20 @@ def answer_eval():
  eval_error = eval_data["error"]
  eval_output = str(eval_data["output"])
 
+ if language == "python":
+ eval_output = eval_output.rstrip() # remove trailing \n from print()
+
  # any API error is an automatic failure
  if eval_error:
  return jsonify(status="success",
  correct=False,
  js_error=eval_error)
 
- correct = str_cmp(eval_output, q.answer)
+ try:
+ correct = str_cmp(eval_output, q.answer)
+ except TypeError:
+ return jsonify(correct=False,
+ status="success")
 
  if request.json.get("checkOnly", False):
  return jsonify(correct=correct,

CodeChallenge/api/users.py

@@ -7,6 +7,7 @@
  unset_jwt_cookies)
 from flask_limiter.util import get_remote_address
 from flask_mail import Message
+from requests import HTTPError
 from sqlalchemy import func
 
 from .. import core
@@ -125,16 +126,22 @@ def register():
  )
 
  mg_vars["type"] = "parent"
- mg_list_add(new_u.parent_email,
- f"{new_u.parentfirstname} {new_u.parentlastname}",
- data=mg_vars)
+ try:
+ mg_list_add(new_u.parent_email,
+ f"{new_u.parentfirstname} {new_u.parentlastname}",
+ data=mg_vars)
+ except HTTPError as error:
+ current_app.logger.exception(f"failed to add {new_u.parent_email!r} to mailing list: {error}")
 
  # if provided, also add student to mailing list
  if new_u.student_email:
  mg_vars["type"] = "student"
- mg_list_add(new_u.student_email,
- f"{new_u.studentfirstname} {new_u.studentlastname}",
- data=mg_vars)
+ try:
+ mg_list_add(new_u.student_email,
+ f"{new_u.studentfirstname} {new_u.studentlastname}",
+ data=mg_vars)
+ except HTTPError as error:
+ current_app.logger.exception(f"failed to add {new_u.parent_email!r} to mailing list: {error}")
 
  rcpts = [new_u.parent_email]
  if new_u.student_email:

CodeChallenge/config.py

@@ -75,6 +75,7 @@ class ProductionConfig(DefaultConfig):
  GOOGLE_API_KEY = os.getenv("GOOGLE_API_KEY")
  SHEET_ID = os.getenv("SHEET_ID")
  MG_LIST = os.getenv("MG_LIST")
+ ANSWER_ATTEMPT_LIMIT = "5 per 1 minutes"
 
 
 class DevelopmentConfig(ProductionConfig):

CodeChallenge/core.py

@@ -1,4 +1,4 @@
-from datetime import datetime, timezone, timedelta, time
+from datetime import datetime, timezone, timedelta
 
 from flask import current_app
 from sqlalchemy import func
@@ -20,7 +20,8 @@ def day_number() -> int:
  return -1
 
  delta = now - start
- return 1 if delta.days == 0 else delta.days
+
+ return delta.days + 1
 
 
 def current_rank() -> int:
@@ -42,16 +43,8 @@ def time_until_next_rank() -> str:
  epoch = int(current_app.config["CODE_CHALLENGE_START"])
  start = datetime.fromtimestamp(epoch, timezone.utc)
  now = datetime.now(timezone.utc)
-
- if start > now:
- diff = datetime.combine(start, time.min, now.tzinfo) - now
- return str(diff)
-
- tomorrow = now + timedelta(days=1)
-
- diff = datetime.combine(tomorrow, time.min, now.tzinfo) - now
-
- return str(diff)
+ next_date = start + timedelta(days=day_number())
+ return str(next_date - now)
 
 
 def friendly_starts_on() -> str:

CodeChallenge/templates/challenge_daily_email.html

@@ -301,18 +301,18 @@
  <td class="content-block">
  <h2>{{name}}, today's code challenge question is unlocked!</h2>
  <br/>
- <p>Continue your quest by <a href="https://challenge.codewizardshq.com/login"> logging in.</a></p>
+ <p>Continue your quest by <a href="{{ external_url }}/login"> logging in.</a></p>
  <p>Good luck and safe travels! </p>
  <br/>
- <a href="https://challenge.codewizardshq.com/login" class="btn-primary">ANSWER TODAY'S QUESTION</a>
+ <a href="{{ external_url }}/login" class="btn-primary">ANSWER TODAY'S QUESTION</a>
  </td>
  </tr>
  <tr>
  <td>
- <p><a href="https://challenge.codewizardshq.com/login">Login to Play</a><br/>
+ <p><a href="{{ external_url }}/login">Login to Play</a><br/>
  <a href="http://codewizardshq.com/challenge">Challenge Details</a><br/>
  <a href="http://codewizardshq.com/challenge#challenge-prizes">Prizes</a><br/>
- <a href="https://challenge.codewizardshq.com/frequently-asked-questions">Frequently Asked Questions</a></p>
+ <a href="{{ external_url }}/frequently-asked-questions">Frequently Asked Questions</a></p>
  </td>
  </tr>
  </table>