core: reordering of list fields

Author: Jan Silhan

example/apps/test_security/tests/output_request_log.py

@@ -34,7 +34,7 @@ def test_output_request_should_be_logged(self, user):
         responses.add(responses.POST, 'https://localhost/test', body='test')
         expected_output_request_started_data = {
             'request_headers': {
-                'User-Agent': 'python-requests/2.26.0',
+                'User-Agent': all_eq_obj,
                 'Accept-Encoding': 'gzip, deflate',
                 'Accept': '*/*',
                 'Connection': 'keep-alive',
@@ -74,7 +74,7 @@ def test_output_request_should_be_logged(self, user):
     def test_output_request_error_should_be_logged(self):
         expected_output_request_started_data = {
             'request_headers': {
-                'User-Agent': 'python-requests/2.26.0',
+                'User-Agent': all_eq_obj,
                 'Accept-Encoding': 'gzip, deflate',
                 'Accept': '*/*',
                 'Connection': 'keep-alive',
@@ -163,7 +163,7 @@ def test_output_request_should_be_logged_in_sql_backend(self, user):
         assert_equal_model_fields(
             sql_output_request_log,
             request_headers={
-                'User-Agent': 'python-requests/2.26.0',
+                'User-Agent': all_eq_obj,
                 'Accept-Encoding': 'gzip, deflate',
                 'Accept': '*/*',
                 'Connection': 'keep-alive',
@@ -203,7 +203,7 @@ def test_output_request_should_be_logged_in_elasticsearch_backend(self, user):
             )
             assert_equal_model_fields(
                 elasticsearch_output_request_log,
-                request_headers='{"User-Agent": "python-requests/2.26.0", "Accept-Encoding": "gzip, deflate", '
+                request_headers='{"User-Agent": "python-requests/2.27.1", "Accept-Encoding": "gzip, deflate", '
                                 '"Accept": "*/*", "Connection": "keep-alive", "Content-Length": "16"}',
                 request_body='{"test": "test"}',
                 method='POST',
@@ -264,7 +264,7 @@ def test_error_output_request_should_be_logged_in_sql_backend(self,):
         assert_equal_model_fields(
             sql_output_request_log,
             request_headers={
-                'User-Agent': 'python-requests/2.26.0',
+                'User-Agent': all_eq_obj,
                 'Accept-Encoding': 'gzip, deflate',
                 'Accept': '*/*',
                 'Connection': 'keep-alive',
@@ -301,7 +301,7 @@ def test_error_output_request_should_be_logged_in_elasticsearch_backend(self):
             )
             assert_equal_model_fields(
                 elasticsearch_input_request_log,
-                request_headers='{"User-Agent": "python-requests/2.26.0", "Accept-Encoding": "gzip, deflate", '
+                request_headers='{"User-Agent": "python-requests/2.27.1", "Accept-Encoding": "gzip, deflate", '
                                 '"Accept": "*/*", "Connection": "keep-alive", "Content-Length": "16"}',
                 request_body='{"test": "test"}',
                 method='POST',

security/backends/common/is_core.py

@@ -12,6 +12,7 @@
 from pyston.utils.decorators import filter_by, order_by
 
 from is_core.generic_views.detail_views import DjangoReadonlyDetailView
+from is_core.site import get_model_core
 from is_core.utils import display_code, render_model_object_with_link, render_model_objects_with_link
 from is_core.utils.decorators import short_description
 
@@ -142,6 +143,18 @@ def __new__(cls, *args, **kwargs):
             ]
         return super().__new__(cls)
 
+    @filter_by('id')
+    @order_by('id')
+    @short_description(_('short ID'))
+    def short_id(self, obj):
+        return truncatechars(str(obj.id), 8)
+
+    @filter_by('slug')
+    @order_by('slug')
+    @short_description(_('short slug'))
+    def short_slug(self, obj):
+        return truncatechars(obj.slug, 20) if obj.slug is not None else None
+
     @short_description(_('error message'))
     @filter_by('error_message')
     def error_message_code(self, obj):
@@ -150,7 +163,13 @@ def error_message_code(self, obj):
     @short_description(_('source'))
     def display_source(self, obj, request):
         parent_log_obj = self._get_parent_log_obj(obj)
-        return render_model_object_with_link(request, parent_log_obj) if parent_log_obj else None
+        if not parent_log_obj:
+            return None
+        core_parent_model = get_model_core(parent_log_obj.__class__)
+        verbose_name_with_last_id_digits = '{} {}'.format(
+            core_parent_model.verbose_name, core_parent_model.short_id(parent_log_obj)
+        )
+        return render_model_object_with_link(request, parent_log_obj, display_value=verbose_name_with_last_id_digits)
 
     def _get_parent_log_obj(self, obj):
         raise NotImplementedError
@@ -253,9 +272,9 @@ class InputRequestLogCoreMixin(RequestLogCoreMixin):
     menu_group = 'inputrequestlog'
 
     list_fields = (
-        'id', 'start', 'stop', 'release', 'slug', 'view_slug', 'host', 'short_path', 'state', 'time', 'method',
-        'short_queries', 'response_code', 'short_request_headers', 'short_request_body', 'short_response_headers',
-        'short_response_body', 'user', 'ip',
+        'short_id', 'start', 'stop', 'time', 'view_slug', 'response_code', 'state', 'method', 'host', 'short_path',
+        'user', 'short_request_body', 'short_response_body', 'short_queries', 'short_request_headers',
+        'short_response_headers', 'ip', 'release', 'short_slug',
     )
 
     verbose_name = _('input request log')
@@ -302,8 +321,9 @@ class OutputRequestLogCoreMixin(RequestLogCoreMixin):
     menu_group = 'outputrequestlog'
 
     list_fields = (
-        'id', 'start', 'stop', 'release', 'slug', 'host', 'short_path', 'state', 'time', 'method', 'short_queries',
-        'response_code', 'short_request_headers', 'short_request_body', 'short_response_headers', 'short_response_body'
+        'short_id', 'start', 'stop', 'time', 'response_code', 'state', 'method', 'host', 'short_path',
+        'short_request_body', 'short_response_headers', 'short_queries', 'short_request_headers', 'short_response_body',
+        'release'
     )
 
     fieldsets = (
@@ -344,7 +364,7 @@ class CommandLogCoreMixin(OutputLogCoreMixin, LogCoreMixin):
     menu_group = 'commandlog'
 
     list_fields = (
-        'id', 'start', 'stop', 'release', 'slug', 'name', 'state', 'time'
+        'short_id', 'start', 'stop', 'time', 'name', 'state', 'release', 'short_slug'
     )
 
     verbose_name = _('command log')
@@ -397,10 +417,12 @@ class CeleryTaskRunLogCoreMixin(OutputLogCoreMixin, CeleryCoreMixin, LogCoreMixi
 
     menu_group = 'celerytaskrunlog'
 
-    rest_fields = list_fields = (
-        'id', 'start', 'stop', 'release', 'slug', 'celery_task_id', 'name', 'state', 'waiting_time', 'time',
-        'short_input', 'queue_name'
+    ALL_FIELDS = (
+        'start', 'stop', 'time', 'name', 'state', 'short_input', 'queue_name', 'celery_task_id', 'waiting_time',
+        'release',
     )
+    rest_fields = ('id', *ALL_FIELDS, 'slug')
+    list_fields = ('short_id', *ALL_FIELDS, 'short_slug')
 
     verbose_name = _('celery task run log')
     verbose_name_plural = _('celery task run logs')
@@ -440,10 +462,12 @@ class CeleryTaskInvocationLogCoreMixin(CeleryCoreMixin, LogCoreMixin):
 
     menu_group = 'celerytaskinvocationlog'
 
-    rest_fields = list_fields = (
-        'id', 'start', 'stop', 'release', 'slug', 'celery_task_id', 'name', 'state_with_duplicate', 'time',
-        'short_input', 'queue_name'
+    ALL_FIELDS = (
+        'start', 'stop', 'time', 'name', 'state_with_duplicate', 'short_input', 'queue_name', 'is_duplicate',
+        'celery_task_id', 'release'
     )
+    rest_fields = ('id', *ALL_FIELDS, 'slug')
+    list_fields = ('short_id', *ALL_FIELDS, 'short_slug')
 
     celery_task_run_inline_table_view = None
 

security/backends/elasticsearch/models.py

@@ -1,5 +1,7 @@
 import json
 
+from django.utils.encoding import force_text
+from django.utils.timezone import localtime
 from elasticsearch import NotFoundError
 
 from django.db import router
@@ -135,6 +137,13 @@ class RequestLog(Log):
     state = EnumField(enum=RequestLogState)
     error_message = Text()
 
+    def __str__(self):
+        return ' '.join(
+            (force_text(v) for v in (
+                self.short_path, self.response_code, localtime(self.start.replace(microsecond=0))
+            ) if v)
+        )
+
 
 class InputRequestLog(RequestLog):