concept and conceptscheme visit log for csv #214

OnroerendErfgoed · Jul 28, 2015 · da50cc7 · da50cc7
1 parent 513ea92
commit da50cc7
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 5 deletions.
diff --git a/atramhasis/audit.py b/atramhasis/audit.py
@@ -7,14 +7,17 @@
 
 
 def _origin_from_request(request):
-    if 'text/html' in request.accept:
-        return 'HTML'
-    elif 'application/json' in request.accept:
-        return 'REST'
-    elif 'application/rdf+xml' in request.accept \
+    if request.url.endswith('.csv'):
+        return 'CSV'
+    elif request.url.endswith('.rdf') \
+            or 'application/rdf+xml' in request.accept \
             or 'text/turtle' in request.accept \
             or 'application/x-turtle' in request.accept:
         return 'RDF'
+    elif 'text/html' in request.accept:
+        return 'HTML'
+    elif 'application/json' in request.accept:
+        return 'REST'
     else:
         return 'onbekend'
 
@@ -28,6 +31,8 @@ def _origin_from_response(response):
             or response.content_type == 'text/turtle' \
             or response.content_type == 'application/x-turtle':
         return 'RDF'
+    elif response.content_type == 'text/csv':
+        return 'CSV'
     else:
         return 'onbekend'
 

diff --git a/atramhasis/views/views.py b/atramhasis/views/views.py
@@ -194,6 +194,7 @@ def set_locale_cookie(self):
                             max_age=31536000)  # max_age = year
         return response
 
+    @audit
     @view_config(route_name='search_result_export', renderer='csv')
     def results_csv(self):
         header = ['conceptscheme', 'id', 'uri', 'type', 'label', 'prefLabels', 'altLabels', 'definition', 'broader',

diff --git a/tests/test_audit.py b/tests/test_audit.py
@@ -47,6 +47,7 @@ def _check(self, nr, origin, type_id_list):
             self.assertEqual('1', getattr(self.audit_manager.saved_objects[nr-1], type_id))
 
     def test_audit_rest(self):
+        self.dummy_parent.request.url = "http://host/conceptschemes/STYLES"
         self.dummy_parent.request.accept = ['application/json']
         self.dummy_parent.request.matchdict = {'scheme_id': '1'}
         self.dummy_parent.dummy()
@@ -56,6 +57,7 @@ def test_audit_rest(self):
         self._check(2, 'REST', ['conceptscheme_id', 'concept_id'])
 
     def test_audit_html(self):
+        self.dummy_parent.request.url = "http://host/conceptschemes/STYLES"
         self.dummy_parent.request.accept = ['text/html']
         self.dummy_parent.request.matchdict = {'scheme_id': '1'}
         self.dummy_parent.dummy()
@@ -65,6 +67,7 @@ def test_audit_html(self):
         self._check(2, 'HTML', ['conceptscheme_id', 'concept_id'])
 
     def test_audit_rdf_xml(self):
+        self.dummy_parent.request.url = "http://host/conceptschemes/STYLES.rdf"
         self.dummy_parent.request.accept = ['application/rdf+xml']
         self.dummy_parent.request.matchdict = {'scheme_id': '1'}
         self.dummy_parent.dummy()
@@ -73,7 +76,18 @@ def test_audit_rdf_xml(self):
         self.dummy_parent.dummy()
         self._check(2, 'RDF', ['conceptscheme_id', 'concept_id'])
 
+    def test_audit_csv(self):
+        self.dummy_parent.request.url = "http://host/conceptschemes/STYLES.csv"
+        self.dummy_parent.request.accept = "text/csv"
+        self.dummy_parent.request.matchdict = {'scheme_id': '1'}
+        self.dummy_parent.dummy()
+        self._check(1, 'CSV', ['conceptscheme_id'])
+        self.dummy_parent.request.matchdict = {'scheme_id': '1', 'c_id': '1'}
+        self.dummy_parent.dummy()
+        self._check(2, 'CSV', ['conceptscheme_id', 'concept_id'])
+
     def test_audit_other(self):
+        self.dummy_parent.request.url = "http://host/conceptschemes/STYLES"
         self.dummy_parent.request.accept = ['application/octet-stream']
         self.dummy_parent.request.matchdict = {'scheme_id': '1'}
         self.dummy_parent.dummy()
@@ -89,6 +103,8 @@ def test_origin_from_response(self):
         self.assertEqual('HTML', _origin_from_response(res))
         res = Response(content_type='application/json')
         self.assertEqual('REST', _origin_from_response(res))
+        res = Response(content_type='text/csv')
+        self.assertEqual('CSV', _origin_from_response(res))
         res = Response(content_type='application/octet-stream')
         self.assertEqual('onbekend', _origin_from_response(res))