Change repo stats to use the RAC table and a nice UI

data/model/log.py

@@ -5,7 +5,7 @@ from peewee import JOIN_LEFT_OUTER, SQL, fn
 from datetime import datetime, timedelta, date
 from cachetools import lru_cache
 
-from data.database import LogEntry, LogEntryKind, User, db
+from data.database import LogEntry, LogEntryKind, User, RepositoryActionCount, db
 from data.model import config
 
 def _logs_query(selections, start_time, end_time, performer=None, repository=None, namespace=None,
@@ -95,62 +95,6 @@ def log_action(kind_name, user_or_organization_name, performer=None, repository=
                   datetime=timestamp)
 
 
-def _get_repository_events(repository, time_delta, time_delta_earlier, clause):
-  """ Returns a pair representing the count of the number of events for the given
-      repository in each of the specified time deltas. The date ranges are calculated by
-      taking the current time today and subtracting the time delta given. Since
-      we want to grab *two* ranges, we restrict the second range to be greater
-      than the first (i.e. referring to an earlier time), so we can conduct the
-      lookup in a single query. The clause is used to further filter the kind of
-      events being found.
-  """
-  since = date.today() - time_delta
-  since_earlier = date.today() - time_delta_earlier
-
-  if since_earlier >= since:
-    raise ValueError('time_delta_earlier must be greater than time_delta')
-
-  # This uses a CASE WHEN inner clause to further filter the count.
-  formatted = since.strftime('%Y-%m-%d')
-  case_query = 'CASE WHEN datetime >= \'%s\' THEN 1 ELSE 0 END' % formatted
-
-  result = (LogEntry
-            .select(fn.Sum(SQL(case_query)), fn.Count(SQL('*')))
-            .where(LogEntry.repository == repository)
-            .where(clause)
-            .where(LogEntry.datetime >= since_earlier)
-            .tuples()
-            .get())
-
-  return (int(result[0]) if result[0] else 0, int(result[1]) if result[1] else 0)
-
-
-def get_repository_pushes(repository, time_delta, time_delta_earlier):
-  push_repo = _get_log_entry_kind('push_repo')
-  clauses = (LogEntry.kind == push_repo)
-  return _get_repository_events(repository, time_delta, time_delta_earlier, clauses)
-
-
-def get_repository_pulls(repository, time_delta, time_delta_earlier):
-  repo_pull = _get_log_entry_kind('pull_repo')
-  repo_verb = _get_log_entry_kind('repo_verb')
-  clauses = ((LogEntry.kind == repo_pull) | (LogEntry.kind == repo_verb))
-  return _get_repository_events(repository, time_delta, time_delta_earlier, clauses)
-
-
-def get_repository_usage():
-  one_month_ago = date.today() - timedelta(weeks=4)
-  repo_pull = _get_log_entry_kind('pull_repo')
-  repo_verb = _get_log_entry_kind('repo_verb')
-  return (LogEntry
-          .select(LogEntry.ip, LogEntry.repository)
-          .where((LogEntry.kind == repo_pull) | (LogEntry.kind == repo_verb))
-          .where(~(LogEntry.repository >> None))
-          .where(LogEntry.datetime >= one_month_ago)
-          .group_by(LogEntry.ip, LogEntry.repository)
-          .count())
-
-
 def get_stale_logs_start_id():
   """ Gets the oldest log entry. """
   try:
@@ -182,3 +126,28 @@ def get_stale_logs(start_id, end_id):
 def delete_stale_logs(start_id, end_id):
   """ Deletes all the logs with IDs between start_id and end_id. """
   LogEntry.delete().where((LogEntry.id >= start_id), (LogEntry.id <= end_id)).execute()
+
+
+def get_repository_action_counts(repo, start_date):
+  return RepositoryActionCount.select().where(RepositoryActionCount.repository == repo,
+                                              RepositoryActionCount.date >= start_date)
+
+
+def get_repositories_action_sums(repository_ids):
+  if not repository_ids:
+    return {}
+
+  # Filter the join to recent entries only.
+  last_week = datetime.now() - timedelta(weeks=1)
+  tuples = (RepositoryActionCount
+            .select(RepositoryActionCount.repository, fn.Sum(RepositoryActionCount.count))
+            .where(RepositoryActionCount.repository << repository_ids)
+            .where(RepositoryActionCount.date >= last_week)
+            .group_by(RepositoryActionCount.repository)
+            .tuples())
+
+  action_count_map = {}
+  for record in tuples:
+    action_count_map[record[0]] = record[1]
+
+  return action_count_map