black, flake, isort

.python-version

@@ -0,0 +1 @@
+guillotina-audit

guillotina_audit/permissions.py

@@ -1,4 +1,3 @@
 from guillotina import configure
 
-
 configure.grant(role="guillotina.Manager", permission="audit.AccessContent")

guillotina_audit/subscriber.py

@@ -1,31 +1,25 @@
 from guillotina import configure
 from guillotina.component import query_utility
+from guillotina_audit.interfaces import IAuditUtility
 from guillotina.interfaces import IObjectAddedEvent
 from guillotina.interfaces import IObjectModifiedEvent
 from guillotina.interfaces import IObjectRemovedEvent
 from guillotina.interfaces import IResource
-from guillotina_audit.interfaces import IAuditUtility
 
 
-@configure.subscriber(
-    for_=(IResource, IObjectAddedEvent), priority=1001
-)  # after indexing
+@configure.subscriber(for_=(IResource, IObjectAddedEvent), priority=1001)  # after indexing
 async def audit_object_added(obj, event):
     audit = query_utility(IAuditUtility)
     audit.log_entry(obj, event)
 
 
-@configure.subscriber(
-    for_=(IResource, IObjectModifiedEvent), priority=1001
-)  # after indexing
+@configure.subscriber(for_=(IResource, IObjectModifiedEvent), priority=1001)  # after indexing
 async def audit_object_modified(obj, event):
     audit = query_utility(IAuditUtility)
     audit.log_entry(obj, event)
 
 
-@configure.subscriber(
-    for_=(IResource, IObjectRemovedEvent), priority=1001
-)  # after indexing
+@configure.subscriber(for_=(IResource, IObjectRemovedEvent), priority=1001)  # after indexing
 async def audit_object_removed(obj, event):
     audit = query_utility(IAuditUtility)
     audit.log_entry(obj, event)

guillotina_audit/tests/conftest.py

@@ -20,5 +20,5 @@
 pytest_plugins = [
     "pytest_docker_fixtures",
     "guillotina.tests.fixtures",
-    "guillotina_audit.tests.fixtures",
+    "guillotina_audit.tests.fixtures"
 ]

guillotina_audit/tests/fixtures.py

@@ -1,15 +1,18 @@
 from guillotina import testing
 from guillotina.tests.fixtures import _update_from_pytest_markers
 
-import json
 import os
 import pytest
+import json
 
 
 ELASTICSEARCH = os.environ.get("ELASTICSEARCH", "True")
 
-annotations = {"elasticsearch": {"host": "localhost:9200"}}
-
+annotations = {
+    "elasticsearch": {
+        "host": "localhost:9200"
+    }
+}
 
 def base_settings_configurator(settings):
     if "applications" not in settings:
@@ -18,9 +21,7 @@ def base_settings_configurator(settings):
     settings["applications"].append("guillotina_audit")
 
     settings["audit"] = {
-        "connection_settings": {
-            "hosts": [f"{annotations['elasticsearch']['host']}"]
-        }  # noqa
+        "connection_settings": {"hosts": [f"{annotations['elasticsearch']['host']}"]}  # noqa
     }
 
 
@@ -41,8 +42,6 @@ def elasticsearch_fixture(es):
 
 @pytest.fixture(scope="function")
 async def guillotina_es(elasticsearch_fixture, guillotina):
-    response, status = await guillotina(
-        "POST", "/db/", data=json.dumps({"@type": "Container", "id": "guillotina"})
-    )
+    response, status = await guillotina("POST", "/db/", data=json.dumps({"@type": "Container", "id": "guillotina"}))
     assert status == 200
     yield guillotina

guillotina_audit/tests/test_audit_basic.py

@@ -12,9 +12,7 @@
 
 
 async def test_audit_basic(guillotina_es):
-    response, status = await guillotina_es(
-        "POST", "/db/guillotina/@addons", data=json.dumps({"id": "audit"})
-    )
+    response, status = await guillotina_es("POST", "/db/guillotina/@addons", data=json.dumps({"id": "audit"}))
     assert status == 200
     audit_utility = query_utility(IAuditUtility)
     # Let's check the index has been created
@@ -46,20 +44,14 @@ async def test_audit_basic(guillotina_es):
     resp, status = await guillotina_es("GET", "/db/guillotina/@audit?action=removed")
     assert status == 200
     assert len(resp["hits"]["hits"]) == 1
-    resp, status = await guillotina_es(
-        "GET", "/db/guillotina/@audit?action=removed&type_name=Item"
-    )
+    resp, status = await guillotina_es("GET", "/db/guillotina/@audit?action=removed&type_name=Item")
     assert status == 200
     assert len(resp["hits"]["hits"]) == 1
-    resp, status = await guillotina_es(
-        "GET", "/db/guillotina/@audit?action=added&type_name=Item"
-    )
+    resp, status = await guillotina_es("GET", "/db/guillotina/@audit?action=added&type_name=Item")
     assert status == 200
     assert len(resp["hits"]["hits"]) == 1
     assert resp["hits"]["hits"][0]["_source"]["type_name"] == "Item"
-    resp, status = await guillotina_es(
-        "GET", "/db/guillotina/@audit?action=added&type_name=Container"
-    )
+    resp, status = await guillotina_es("GET", "/db/guillotina/@audit?action=added&type_name=Container")
     assert status == 200
     assert len(resp["hits"]["hits"]) == 1
     assert resp["hits"]["hits"][0]["_source"]["type_name"] == "Container"

guillotina_audit/utility.py

@@ -30,10 +30,7 @@ async def initialize(self, app):
         )
 
     async def create_index(self):
-        settings = {
-            "settings": self.default_settings(),
-            "mappings": self.default_mappings(),
-        }
+        settings = {"settings": self.default_settings(), "mappings": self.default_mappings()}
         try:
             await self.async_es.indices.create(self.index, settings)
         except RequestError:
@@ -43,9 +40,7 @@ def default_settings(self):
         return {
             "analysis": {
                 "analyzer": {"path_analyzer": {"tokenizer": "path_tokenizer"}},
-                "tokenizer": {
-                    "path_tokenizer": {"type": "path_hierarchy", "delimiter": "/"}
-                },
+                "tokenizer": {"path_tokenizer": {"type": "path_hierarchy", "delimiter": "/"}},
                 "filter": {},
                 "char_filter": {},
             }
@@ -99,9 +94,7 @@ async def query_audit(self, params={}):
                 ):
                     field_parsed = field.split("__")[0]
                     operator = field.split("__")[1]
-                    query["query"]["bool"]["must"].append(
-                        {"range": {field_parsed: {operator: value}}}
-                    )
+                    query["query"]["bool"]["must"].append({"range": {field_parsed: {operator: value}}})
                 else:
                     query["query"]["bool"]["must"].append({"match": {field: value}})
         return await self.async_es.search(index=self.index, body=query)