educommon 3.16.0__py3-none-any.whl → 3.17.0__py3-none-any.whl

educommon/audit_log/utils/__init__.py

@@ -40,6 +40,7 @@ from django.db.transaction import (
 from django.http import (
     HttpRequest,
 )
+
 from m3_django_compat import (
     get_related,
 )
@@ -52,6 +53,9 @@ from educommon.audit_log.constants import (
     PG_LOCK_ID,
     SQL_FILES_DIR,
 )
+from educommon.logger import (
+    error as logger_error,
+)
 from educommon.utils.misc import (
     cached_property,
 )
@@ -99,6 +103,19 @@ def get_need_to_log_table_names() -> Set[str]:
     return table_names
 
 
+def get_table_names_for_app_labels(app_labels: Iterable[str]) -> Set[str]:
+    """Возвращает множество с именами таблиц для указанных приложений."""
+    tables = set()
+    for app_label in app_labels:
+        try:
+            app_config = apps.get_app_config(app_label)
+            tables.update(model._meta.db_table for model in app_config.get_models())
+        except LookupError:
+            continue
+
+    return tables
+
+
 def update_or_create_tables(need_to_log_table_names: Iterable[str]) -> bool:
     """Создаёт записи Table для отслеживаемых таблиц, либо меняет флаг logged.
 
@@ -109,6 +126,21 @@ def update_or_create_tables(need_to_log_table_names: Iterable[str]) -> bool:
     need_to_log_table_names = set(need_to_log_table_names)
     existed_table_names = set(Table.objects.filter(schema='public').values_list('name', flat=True))
 
+    # Таблицы сервисных приложений, которые не должны отслеживаться аудит-логом
+    allowed_service_apps_labels = getattr(settings, 'ALLOWED_SERVICE_APPS_LABELS', [])
+    service_table_names = get_table_names_for_app_labels(allowed_service_apps_labels)
+
+    # Проверка конфликтных таблиц: должны логироваться, но находятся в сервисных приложениях
+    conflicting_tables = need_to_log_table_names & service_table_names
+    if conflicting_tables:
+        tables = ', '.join(sorted(conflicting_tables))
+        error_msg = (
+            f'Невозможно включить логирование для сервисных таблиц: {tables}. '
+            'Исключите их из отслеживания или перенесите таблицы в основную БД.'
+        )
+        logger_error(error_msg)
+        raise ValueError(error_msg)
+
     to_create_table_names = need_to_log_table_names - existed_table_names
     to_disable_table_names = existed_table_names - need_to_log_table_names
 

{educommon-3.16.0.dist-info → educommon-3.17.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: educommon
-Version: 3.16.0
+Version: 3.17.0
 Summary: Общая кодовая база для проектов БЦ Образование
 Author-email: BARS Group <education_dev@bars-open.ru>
 Project-URL: Homepage, https://stash.bars-open.ru/projects/EDUBASE/repos/educommon/browse

{educommon-3.16.0.dist-info → educommon-3.17.0.dist-info}/RECORD

@@ -70,7 +70,7 @@ educommon/audit_log/migrations/0009_reinstall_audit_log.py,sha256=c95H2yamWyrCoG
 educommon/audit_log/migrations/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 educommon/audit_log/sql/configure_audit_log.sql,sha256=M3QxNKTZbn-uNRxGDvNxE9iJh1EOQUTIho7rvc3yhlY,1511
 educommon/audit_log/sql/install_audit_log.sql,sha256=SHrZ7WaYxawUKQEpZnj9k4HTU25NvBlxX_POqZ95HU0,14107
-educommon/audit_log/utils/__init__.py,sha256=FSq-L4wNOrCTqve16c4KruIxTwHZuTh1lNLNgznAcv8,14843
+educommon/audit_log/utils/__init__.py,sha256=14BHRbKdnvHNgomM-R__GqLk1N32ww_GN2xy81Ph_gs,16388
 educommon/audit_log/utils/operations.py,sha256=skxL7wE4Jx1XlNdPx-Pl3SfiZ1G9jBmcZrXKSQDUGzw,2555
 educommon/auth/__init__.py,sha256=xkGJgqQ5QaEU86n6tJV77ux-2bMTAKbjpVYBCDhcS0E,79
 educommon/auth/rbac/__init__.py,sha256=guO7sOX6e1Z-dqptsqXjbnMdgbSdKp2suDKJa5_pdVU,317
@@ -349,7 +349,7 @@ educommon/ws_log/smev/exceptions.py,sha256=VNfzNHlj5Pz8D4979d_msTkxC-RQVoMctsgoJ
 educommon/ws_log/templates/report/smev_logs.xlsx,sha256=nnYgB0Z_ix8HoxsRICjsZfFRQBdra-5Gd8nWhCxTjYg,10439
 educommon/ws_log/templates/ui-js/smev-logs-list-window.js,sha256=AGup3D8GTJSY9WdDPj0zBJeYQBFOmGgcbxPOJbKK-nY,513
 educommon/ws_log/templates/ui-js/smev-logs-report-setting-window.js,sha256=nQ7QYK9frJcE7g7kIt6INg9TlEEJAPPayBJgRaoTePA,1103
-educommon-3.16.0.dist-info/METADATA,sha256=ZYDGTR3SSXHFsU4TUGcu2hlppLguZu2-ZbEx1kXk17M,2380
-educommon-3.16.0.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-educommon-3.16.0.dist-info/top_level.txt,sha256=z5fbW7bz_0V1foUm_FGcZ9_MTpW3N1dBN7-kEmMowl4,10
-educommon-3.16.0.dist-info/RECORD,,
+educommon-3.17.0.dist-info/METADATA,sha256=XU8hoY7CgSTjP2GH8wgaRb1EHhjRQYyCdI69uYHmmk8,2380
+educommon-3.17.0.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+educommon-3.17.0.dist-info/top_level.txt,sha256=z5fbW7bz_0V1foUm_FGcZ9_MTpW3N1dBN7-kEmMowl4,10
+educommon-3.17.0.dist-info/RECORD,,