vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

MySQL and Postgres complain about the group by, so calculate dates ourselves

Browse source
This commit is contained in:
Joseph Schorr 2015-08-06 12:52:55 -04:00
parent 5c213df835
commit ea25538646
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/model/log.py
View file

@ -35,7 +35,7 @@ def get_log_entry_kinds():
def get_aggregated_logs(start_time, end_time, performer=None, repository=None, namespace=None): def get_aggregated_logs(start_time, end_time, performer=None, repository=None, namespace=None):
date = db.extract_date('day', LogEntry.datetime) date = db.extract_date('day', LogEntry.datetime)
selections = [LogEntry.kind, LogEntry.datetime, fn.Count(LogEntry.id).alias('count')] selections = [LogEntry.kind, date.alias('day'), fn.Count(LogEntry.id).alias('count')]
query = _logs_query(selections, start_time, end_time, performer, repository, namespace) query = _logs_query(selections, start_time, end_time, performer, repository, namespace)
return query.group_by(date, LogEntry.kind) return query.group_by(date, LogEntry.kind)

14
endpoints/api/logs.py
View file

@ -34,11 +34,19 @@ def log_view(log, kinds):
return view return view
def aggregated_log_view(log, kinds): def aggregated_log_view(log, kinds, start_time):
# Because we aggregate based on the day of the month in SQL, we only have that information.
# Therefore, create a synthetic date based on the day and the month of the start time.
# Logs are allowed for a maximum period of one week, so this calculation should always work.
day = int(log.day)
month = start_time.month
if day < start_time.day:
month = month + 1
view = { view = {
'kind': kinds[log.kind_id], 'kind': kinds[log.kind_id],
'count': log.count, 'count': log.count,
'datetime': format_date(log.datetime) 'date': format_date(datetime(start_time.year, month, day))
} }
return view return view
@ -93,7 +101,7 @@ def get_aggregate_logs(start_time, end_time, performer_name=None, repository=Non
repository=repository, namespace=namespace) repository=repository, namespace=namespace)
return { return {
'aggregated': [aggregated_log_view(log, kinds) for log in aggregated_logs] 'aggregated': [aggregated_log_view(log, kinds, start_time) for log in aggregated_logs]
} }