Revert the changes to drop LogEntry2 table definition

This commit is contained in:
Joseph Schorr 2019-01-02 13:29:35 -05:00
parent 442312402f
commit 58d7dd07b9
8 changed files with 72 additions and 14 deletions

View file

@ -4,7 +4,7 @@ from collections import namedtuple
from peewee import IntegrityError
from datetime import date, timedelta, datetime
from data.database import (Repository, LogEntry, RepositoryActionCount,
from data.database import (Repository, LogEntry, LogEntry2, RepositoryActionCount,
RepositorySearchScore, db_random_func, fn)
logger = logging.getLogger(__name__)
@ -52,12 +52,16 @@ def count_repository_actions(to_count):
today = date.today()
yesterday = today - timedelta(days=1)
actions = (LogEntry
# TODO(LogMigrate): Remove the branch once we're back on LogEntry only.
def lookup_action_count(model):
return (model
.select()
.where(LogEntry.repository == to_count,
LogEntry.datetime >= yesterday,
LogEntry.datetime < today)
.where(model.repository == to_count,
model.datetime >= yesterday,
model.datetime < today)
.count())
actions = lookup_action_count(LogEntry) + lookup_action_count(LogEntry2)
try:
RepositoryActionCount.create(repository=to_count, date=yesterday, count=actions)
return True