From 860ffaefc6a25f98e39d0c8f4bb6a5381581c9d4 Mon Sep 17 00:00:00 2001
From: Megan Henning <meganhenning@flywheel.io>
Date: Thu, 24 Aug 2017 16:56:27 -0500
Subject: [PATCH] Modify input for access log report

---
 api/handlers/reporthandler.py                 | 11 ++++-------
 test/integration_tests/python/test_reports.py |  2 +-
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/api/handlers/reporthandler.py b/api/handlers/reporthandler.py
index f935f0e25..aa0e44bad 100644
--- a/api/handlers/reporthandler.py
+++ b/api/handlers/reporthandler.py
@@ -83,7 +83,7 @@ def get(self, report_type):
                 try:
                     for doc in report.build():
                         writer.writerow(doc)
-                        
+
                 except APIReportException as e:
                     self.abort(404, str(e))
                 # Need to close and reopen file to flush buffer into file
@@ -491,7 +491,7 @@ def __init__(self, params):
         :uid:           user id of the target user
         :limit:         number of records to return
         :subject:       subject code of session accessed
-        :access_types:  list of access_types to filter logs
+        :access_type:  list of access_types to filter logs
         :csv:           Boolean if user wants csv file
         """
 
@@ -502,10 +502,7 @@ def __init__(self, params):
         uid = params.get('user')
         limit= params.get('limit', 100)
         subject = params.get('subject', None)
-        if params.get('bin') == 'true':
-            access_types = params.get('access_types', [])
-        else:
-            access_types = params.getall('access_types')
+        access_types = params.getall('access_type')
         csv_bool = (params.get('csv') == 'true')
 
         if start_date:
@@ -548,7 +545,7 @@ def flatten(self, json_obj, flat, prefix = ""):
         """
         flattens a document to not have nested objects
         """
-        
+
         for field in json_obj.keys():
             if isinstance(json_obj[field], dict):
                 flat = self.flatten(json_obj[field], flat, prefix = prefix + field + ".")
diff --git a/test/integration_tests/python/test_reports.py b/test/integration_tests/python/test_reports.py
index 17ba54e1d..4eaf7540b 100644
--- a/test/integration_tests/python/test_reports.py
+++ b/test/integration_tests/python/test_reports.py
@@ -168,7 +168,7 @@ def test_access_log_report(data_builder, with_user, as_user, as_admin):
     data_builder.delete_project(project, recursive=True)
 
     # get access log report of certain access types
-    r = as_admin.get('/report/accesslog', params={'access_types': ['user_login', 'view_container']})
+    r = as_admin.get('/report/accesslog', params={'access_type': ['user_login', 'view_container']})
     assert r.ok
     ul, vc = False, False