edu-rdm-integration 3.9.2__py3-none-any.whl → 3.10.1__py3-none-any.whl

edu_rdm_integration/{uploader_log → stages/upload_data/uploader_log}/actions.py

@@ -14,10 +14,6 @@ from typing import (
 from django.conf import (
     settings,
 )
-from edu_rdm_integration.uploader_log.enums import (
-    RequestResultStatus,
-)
-
 from django.db.models import (
     Q,
 )
@@ -27,6 +23,9 @@ from m3_ext.ui.icons import (
 from objectpack.actions import (
     ObjectPack,
 )
+from objectpack.filters import (
+    CustomFilter,
+)
 
 from educommon.objectpack.actions import (
     ExtObjectRowsAction,
@@ -44,21 +43,19 @@ from educommon.utils.ui import (
     append_template_globals,
 )
 
-from edu_rdm_integration.models import (
+from edu_rdm_integration.stages.upload_data.uploader_log.enums import (
+    RequestResultStatus,
+)
+from edu_rdm_integration.stages.upload_data.uploader_log.models import (
     UploaderClientLog,
 )
-from edu_rdm_integration.uploader_log.ui import (
+from edu_rdm_integration.stages.upload_data.uploader_log.ui import (
     UploaderLogInfoWindow,
 )
-from objectpack.filters import (
-    CustomFilter,
-)
 
 
 class UploaderLogPack(ObjectPack):
-    """
-    Пак журнала Загрузчика данных в витрину.
-    """
+    """Пак журнала Загрузчика данных в витрину."""
 
     title = 'Журнал логов РВД'
     model = UploaderClientLog
@@ -104,13 +101,14 @@ class UploaderLogPack(ObjectPack):
                 tooltip='C',
                 default_value=date.today() - timedelta(days=1),
                 editable=False,
-                lookup=lambda v: Q(request_datetime__gte=datetime.combine(v, time.min))
-            ) & _fd(
+                lookup=lambda v: Q(request_datetime__gte=datetime.combine(v, time.min)),
+            )
+            & _fd(
                 'request_datetime',
                 tooltip='По',
                 default_value=date.today,
                 editable=False,
-                lookup=lambda v: Q(request_datetime__lte=datetime.combine(v, time.max))
+                lookup=lambda v: Q(request_datetime__lte=datetime.combine(v, time.max)),
             ),
             'width': 11,
         },
@@ -251,10 +249,10 @@ class UploaderLogPack(ObjectPack):
 
         Args:
             menu: Объект меню.
+
         Returns:
             Подменю "Администрирование -> Региональная витрина данных -> Журнал логов РВД".
         """
-
         if settings.RDM_MENU_ITEM:
             return menu.SubMenu(
                 'Администрирование',

edu_rdm_integration/stages/upload_data/uploader_log/apps.py

@@ -0,0 +1,11 @@
+from django.apps import (
+    AppConfig,
+)
+
+
+class UploaderLoggerConfig(AppConfig):  # noqa D101
+    """Приложение для работы с логами выгрузки данных в РВД."""
+
+    name = 'edu_rdm_integration.stages.upload_data.uploader_log'
+    label = 'edu_rdm_integration_uploader_log'
+    verbose_name = 'Журнал логов РВД'

edu_rdm_integration/{uploader_log → stages/upload_data/uploader_log}/managers.py

@@ -12,7 +12,7 @@ from django.db.models.functions import (
     Cast,
 )
 
-from edu_rdm_integration.uploader_log.enums import (
+from edu_rdm_integration.stages.upload_data.uploader_log.enums import (
     RequestResultStatus,
 )
 
@@ -26,9 +26,8 @@ class UploaderClientLogManager(Manager):
 
         result_status = Case(
             When(
-                Q(Q(error__isnull=True) | Q(error__exact=''))
-                & Q(Q(response__isnull=False) & ~Q(response__exact='')),
-                then=Value(RequestResultStatus.SUCCESS)
+                Q(Q(error__isnull=True) | Q(error__exact='')) & Q(Q(response__isnull=False) & ~Q(response__exact='')),
+                then=Value(RequestResultStatus.SUCCESS),
             ),
             default=Value(RequestResultStatus.ERROR),
             output_field=PositiveSmallIntegerField(),
@@ -37,30 +36,21 @@ class UploaderClientLogManager(Manager):
         query = query.annotate(
             request_datetime=F('date_time'),
             attachment_file=Case(
-                When(
-                    request__icontains='POST',
-                    then=F('uploader_client_log__attachment__attachment')
-                ),
+                When(request__icontains='POST', then=F('uploader_client_log__attachment__attachment')),
                 When(
                     request__icontains='GET',
                     then=F('upload_status_request_log__upload__attachment__attachment'),
                 ),
                 default=Value(''),
-                output_field = CharField(),
+                output_field=CharField(),
             ),
             status_code=Case(
-                When(
-                    request__icontains='POST',
-                    then=Value('', output_field=CharField())
-                ),
+                When(request__icontains='POST', then=Value('', output_field=CharField())),
                 When(
                     request__icontains='GET',
-                    then=Cast(
-                        'upload_status_request_log__request_status__value',
-                        output_field=CharField()
-                    ),
+                    then=Cast('upload_status_request_log__request_status__value', output_field=CharField()),
                 ),
-                default=Value('')
+                default=Value(''),
             ),
             status_description=Case(
                 When(
@@ -71,7 +61,8 @@ class UploaderClientLogManager(Manager):
                     request__icontains='GET',
                     then=F('upload_status_request_log__request_status__title'),
                 ),
-                default=Value(''), output_field=CharField()
+                default=Value(''),
+                output_field=CharField(),
             ),
             is_emulation=Case(
                 When(
@@ -82,20 +73,14 @@ class UploaderClientLogManager(Manager):
                     request__icontains='GET',
                     then=F('upload_status_request_log__upload__is_emulation'),
                 ),
-                default=Value(False)
+                default=Value(False),
             ),
             request_id=Case(
-                When(
-                    request__icontains='POST',
-                    then=F('uploader_client_log__request_id')
-                ),
-                When(
-                    request__icontains='GET',
-                    then=F('upload_status_request_log__upload__request_id')
-                ),
-                default=Value('')
+                When(request__icontains='POST', then=F('uploader_client_log__request_id')),
+                When(request__icontains='GET', then=F('upload_status_request_log__upload__request_id')),
+                default=Value(''),
             ),
-            result_status=result_status
+            result_status=result_status,
         )
 
         return query

edu_rdm_integration/stages/upload_data/uploader_log/migrations/0001_initial.py

@@ -0,0 +1,31 @@
+# Generated by Django 3.2.24 on 2025-06-28 14:22
+
+from django.db import (
+    migrations,
+)
+
+
+class Migration(migrations.Migration):
+    initial = True
+
+    dependencies = [
+        ('uploader_client', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.SeparateDatabaseAndState(
+            state_operations=[
+                migrations.CreateModel(
+                    name='UploaderClientLog',
+                    fields=[],
+                    options={
+                        'proxy': True,
+                        'indexes': [],
+                        'constraints': [],
+                    },
+                    bases=('uploader_client.entry',),
+                ),
+            ],
+            database_operations=[],
+        ),
+    ]

edu_rdm_integration/stages/upload_data/uploader_log/models.py

@@ -0,0 +1,86 @@
+from functools import (
+    cached_property,
+)
+from io import (
+    StringIO,
+)
+from typing import (
+    Optional,
+)
+
+from django.db.models import (
+    Manager,
+)
+from uploader_client.models import (
+    Entry,
+)
+
+from edu_rdm_integration.stages.upload_data.uploader_log.enums import (
+    RequestResultStatus,
+)
+from edu_rdm_integration.stages.upload_data.uploader_log.managers import (
+    UploaderClientLogManager,
+)
+
+
+class UploaderClientLog(Entry):
+    """Прокси модель Загрузчика данных в витрину."""
+
+    objects = UploaderClientLogManager()
+    base_objects = Manager()
+
+    @cached_property
+    def http_method_and_url(self) -> tuple[str, str]:
+        """Возвращает http-метод и url из поля запроса Entry.request."""
+        request = StringIO(self.request)
+        request_first_line = request.readline()
+        request.close()
+
+        method, url = request_first_line.split(' ')[:2]
+        if not (method and url.startswith('http')):
+            method = url = ''
+
+        return method.strip('[]'), url
+
+    @cached_property
+    def http_response_status(self) -> Optional[str]:
+        """Статус-код запроса к витрине."""
+        try:
+            http_status = self.response.split(' ')[0].strip('[]')
+
+            if not http_status:
+                return None
+
+            if 200 <= int(http_status) < 300:
+                http_status = 'Успех'
+            elif int(http_status) >= 400:
+                http_status = 'Ошибка'
+        except (IndexError, AttributeError):
+            http_status = None
+
+        return http_status
+
+    @property
+    def http_method(self) -> str:
+        """Значение http-метода."""
+        return self.http_method_and_url[0]
+
+    @property
+    def request_url(self) -> str:
+        """URL запроса."""
+        return self.http_method_and_url[1]
+
+    @property
+    def request_error(self) -> Optional[str]:
+        """Ошибка запроса."""
+        return self.error
+
+    @property
+    def result_status_display(self) -> str:
+        """Результат запроса."""
+        result_status = getattr(self, 'result_status', RequestResultStatus.ERROR)
+
+        return RequestResultStatus.values.get(result_status) or RequestResultStatus.values[RequestResultStatus.ERROR]
+
+    class Meta:
+        proxy = True

edu_rdm_integration/{uploader_log → stages/upload_data/uploader_log}/ui.py

@@ -45,12 +45,14 @@ class UploaderLogInfoWindow(BaseEditWindow):
         """Размещение компонентов окна на форме."""
         super(UploaderLogInfoWindow, self)._do_layout()
 
-        self.form.items.extend((
-            self.field__request,
-            self.field__response,
-            self.field__error,
-            self.field__attachment,
-        ))
+        self.form.items.extend(
+            (
+                self.field__request,
+                self.field__response,
+                self.field__error,
+                self.field__attachment,
+            )
+        )
 
     def set_params(self, params):
         """Настройка окна."""