From 76e9b9681f65a57962e3833a210e8e3d770f15cb Mon Sep 17 00:00:00 2001 From: jakedt Date: Fri, 14 Mar 2014 17:37:57 -0400 Subject: [PATCH] Re-order classes to dependencies are in place. --- endpoints/api/logs.py | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/endpoints/api/logs.py b/endpoints/api/logs.py index 9a6045fd9..eaee69aae 100644 --- a/endpoints/api/logs.py +++ b/endpoints/api/logs.py @@ -81,6 +81,24 @@ class RepositoryLogs(RepositoryParamResource): return get_logs(namespace, start_time, end_time, repository=repo) +@resource('/v1/user/logs') +class UserLogs(ApiResource): + """ Resource for fetching logs for the current user. """ + @nickname('listUserLogs') + @parse_args + @query_param('starttime', 'Earliest time from which to get logs. (%m/%d/%Y %Z)', type=str) + @query_param('endtime', 'Latest time to which to get logs. (%m/%d/%Y %Z)', type=str) + @query_param('performer', 'Username for which to filter logs.', type=str) + def get(self, args): + """ List the logs for the current user. """ + performer_name = args['performer'] + start_time = args['starttime'] + end_time = args['endtime'] + + return get_logs(get_authenticated_user().username, start_time, end_time, + performer_name=performer_name) + + @resource('/v1/organization//logs') @related_user_resource(UserLogs) class OrgLogs(ApiResource): @@ -100,22 +118,4 @@ class OrgLogs(ApiResource): return get_logs(orgname, start_time, end_time, performer_name=performer_name) - abort(403) - - -@resource('/v1/user/logs') -class UserLogs(ApiResource): - """ Resource for fetching logs for the current user. """ - @nickname('listUserLogs') - @parse_args - @query_param('starttime', 'Earliest time from which to get logs. (%m/%d/%Y %Z)', type=str) - @query_param('endtime', 'Latest time to which to get logs. (%m/%d/%Y %Z)', type=str) - @query_param('performer', 'Username for which to filter logs.', type=str) - def get(self, args): - """ List the logs for the current user. """ - performer_name = args['performer'] - start_time = args['starttime'] - end_time = args['endtime'] - - return get_logs(get_authenticated_user().username, start_time, end_time, - performer_name=performer_name) \ No newline at end of file + abort(403) \ No newline at end of file