Merge pull request #7 from adamjmcgrath/feature/1-average-score-front…

…-end

Feature/1 average score front end

scripts/fix_average_score.py

@@ -31,13 +31,16 @@
 def auth_func():
   return os.environ['USER_EMAIL'], getpass.getpass('Password:')
 
-
-def fix_user(u):
-  uqs = [uq for uq in models.UserQuestion.query(
+def get_uqs(u):
+  return [uq for uq in models.UserQuestion.query(
     models.UserQuestion.user==u.key,
     models.UserQuestion.complete==True,
    ndb.OR(models.UserQuestion.score==0, models.UserQuestion.score==None))]
 
+def fix_user(u):
+  uqs = get_uqs(u)
+  lus = models.LeagueUser.query(models.LeagueUser.user==u.key)
+
   correction = 0
 
   for uq in uqs:
@@ -47,9 +50,22 @@ def fix_user(u):
 
   u.active_questions_answered = u.questions_answered - correction
   print '%s: old: %d, new: %d' % (u.username, u.questions_answered, u.active_questions_answered)
-  if correction > 1:
+  if u.active_questions_answered > 0:
     u.put()
 
+  for lu in lus:
+    l_correction = 0
+    league = lu.league.get()
+    for uq in uqs:
+      if (uq.created and
+          uq.created.date() > league.created and
+         (uq.created - uq.question.get().posed) > datetime.timedelta(days=7)):
+        l_correction += 1
+    lu.active_questions_answered = lu.questions_answered - l_correction
+    print '  league - %s: old: %d, new: %d' % (u.username, lu.questions_answered, lu.active_questions_answered)
+    if lu.active_questions_answered > 0:
+      lu.put()
+
 
 def main():
   # Use 'localhost:8080' for dev server.

src/api/question.py

@@ -45,14 +45,16 @@ def update_users_season_score(user_season, score, num_guesses):
   user_season.questions_answered += 1
 
 
-def update_users_league_scores(user_key, score, num_guesses):
+def update_users_league_scores(user_key, score, num_guesses, is_current):
   to_put = []
   user = user_key.get()
   for league_key in user.leagues:
     user_league = models.LeagueUser.from_league_user(league_key, user_key)
     user_league.score += score
     user_league.clues += num_guesses - 1
     user_league.questions_answered += 1
+    if is_current:
+      user_league.active_questions_answered += 1
     to_put.append(user_league)
   ndb.put_multi(to_put)
 
@@ -130,7 +132,8 @@ def get_or_post(self, question_id):
           deferred.defer(update_users_league_scores,
                          user.key,
                          score,
-                         num_guesses)
+                         num_guesses,
+                         question.is_current)
 
         # Update the user season.
         if question.season and not user.is_anonymous:

src/models.py

@@ -253,7 +253,7 @@ def to_leaderboard_json(user):
       'user_pic': user.pic_url(size=30),
       'score': user.overall_score,
       'clues': user.overall_clues,
-      'answered': user.questions_answered,
+      'answered': user.active_questions_answered
     }
 
 
@@ -380,7 +380,7 @@ def to_leaderboard_json(user_season):
       'user_pic': user.pic_url(size=30),
       'score': user_season.score,
       'clues': user_season.clues,
-      'answered': user_season.questions_answered,
+      'answered': user_season.questions_answered
     }
 
 
@@ -456,6 +456,7 @@ class LeagueUser(ndb.Model):
   score = ndb.IntegerProperty(default=0)
   clues = ndb.IntegerProperty(default=0)
   questions_answered = ndb.IntegerProperty(default=0)
+  active_questions_answered = ndb.IntegerProperty(default=0)
 
   @classmethod
   def from_league_user(cls, league_key, user_key):
@@ -479,5 +480,5 @@ def to_leaderboard_json(league_user):
       'user_pic': user.pic_url(size=30),
       'score': league_user.score,
       'clues': league_user.clues,
-      'answered': league_user.questions_answered,
+      'answered': league_user.active_questions_answered
     }

src/tests/helpers.py

@@ -95,6 +95,7 @@ def league_user(id=None,
                 league=None,
                 score=None,
                 clues=None,
+                active_questions_answered=None,
                 questions_answered=None):
   return models.LeagueUser(**locals())
 

src/tests/test_api_leaderboard.py

@@ -42,7 +42,8 @@ def setUp(self):
           username='user-%d' % i,
           overall_score=i,
           overall_clues=i,
-          questions_answered=i))
+          questions_answered=i,
+          active_questions_answered=i))
       to_put.append(helpers.user_question(
           user_is_admin=False,
           complete=True,
@@ -55,7 +56,8 @@ def setUp(self):
           user=user_key,
           score=i,
           clues=i,
-          questions_answered=i))
+          questions_answered=i,
+          active_questions_answered=i))
       to_put.append(helpers.user_season(
           score=i,
           clues=i,

src/tests/test_api_question.py

@@ -244,7 +244,7 @@ def testUpdateUsersLeagueScore(self):
                                       clues=5,
                                       questions_answered=1)
     league_user.put()
-    question_api.update_users_league_scores(user_key, 5, 5)
+    question_api.update_users_league_scores(user_key, 5, 5, False)
     self.assertEqual(league_user.score, 10)
     self.assertEqual(league_user.clues, 9)
     self.assertEqual(league_user.questions_answered, 2)

src/tests/test_model_league_user.py

@@ -31,6 +31,7 @@ def testToLeaderboardJson(self):
     league_user.score = 1
     league_user.clues = 2
     league_user.questions_answered = 3
+    league_user.active_questions_answered = 3
     league_user_json = models.LeagueUser.to_leaderboard_json(league_user)
     self.assertEqual(league_user_json['user_name'], 'foo')
     self.assertEqual(league_user_json['score'], 1)