educommon 3.18.0__py3-none-any.whl → 3.19.1__py3-none-any.whl

educommon/audit_log/management/commands/reinstall_audit_log.py

@@ -10,6 +10,9 @@ from django.core.management.base import (
 from django.db import (
     connection,
 )
+from psycopg2.extras import (
+    Json,
+)
 
 from educommon.audit_log.constants import (
     INSTALL_AUDIT_LOG_SQL_FILE_NAME,
@@ -19,6 +22,7 @@ from educommon.audit_log.constants import (
 from educommon.audit_log.utils import (
     clear_audit_logs,
     configure,
+    get_auto_now_fields_by_model,
     get_db_connection_params,
 )
 
@@ -69,6 +73,7 @@ class Command(BaseCommand):
         """Подготовка SQL-кода."""
         params = get_db_connection_params()
         params['lock_id'] = PG_LOCK_ID
+        params['auto_now_fields'] = Json(get_auto_now_fields_by_model())
 
         self.stdout.write('preparing SQL-code..\n')
 

educommon/audit_log/sql/install_audit_log.sql

@@ -188,6 +188,8 @@ DECLARE
     operation_code INTEGER;
     len INTEGER;
     text_error TEXT;
+    auto_now_field_names TEXT[];
+    all_changed_have_auto_now BOOLEAN;
 BEGIN
     operation_code := 0;
     user_id := audit.get_param('audit_log.user_id');
@@ -202,8 +204,10 @@ BEGIN
         data := hstore(OLD);
         changes := hstore(NEW) - hstore(OLD);
         len := array_length(akeys(changes),1);
-        -- Если изменений нет, не логируем
-        IF len IS NOT NULL OR len = 0 THEN
+        auto_now_field_names := ARRAY(SELECT jsonb_array_elements_text({auto_now_fields}::jsonb -> TG_TABLE_NAME::TEXT));
+        all_changed_have_auto_now := auto_now_field_names @> akeys(changes);
+        -- Если изменений нет или изменения, только в автообновляемых полях, то не логируем.
+        IF (len IS NOT NULL OR len = 0) AND NOT all_changed_have_auto_now THEN
             result_value := NEW;
             operation_code := 2;
         END IF;

educommon/audit_log/utils/__init__.py

@@ -469,3 +469,27 @@ def get_audit_log_context(request):
     result['ip'] = get_ip(request)
 
     return result
+
+
+def get_auto_now_fields_by_model() -> dict[str, list[str]]:
+    """Возвращает словарь с полями, имеющими auto_now=True, для моделей с флагом need_to_log = True.
+
+    Returns:
+        Словарь, где ключ это название таблицы, а значение это список названий полей имеющими auto_now=True.
+    """
+    auto_now_fields = {}
+
+    for model in apps.get_models():
+        if not getattr(model, 'need_to_log', False):
+            continue
+
+        auto_now_field_names = [
+            field.name
+            for field in model._meta.get_fields()
+            if getattr(field, 'auto_now', False)
+        ]
+
+        if auto_now_field_names:
+            auto_now_fields[model._meta.db_table] = auto_now_field_names
+
+    return auto_now_fields

educommon/utils/enums.py

@@ -0,0 +1,36 @@
+from enum import (
+    Enum,
+)
+from functools import (
+    lru_cache,
+)
+
+
+class NamedIntEnum(Enum):
+
+    """Базовый класс для набора пар число + строка.
+
+    Пример использования:
+    .. code-block:: python
+        class Status(NamedIntEnum):
+
+            NEW = (1, 'Новый')
+            PROGRESS = (2, 'В процессе')
+            CLOSED = (3, 'Закрыт')
+
+    """
+
+    def __init__(self, id_: int, verbose: str) -> None:
+        self.id = id_
+        self.verbose = verbose
+
+    @classmethod
+    @lru_cache(maxsize=1)
+    def get_choices(cls) -> tuple[tuple[int, str], ...]:
+        return tuple((value.id, value.verbose) for value in cls)
+
+    def as_dict(self, *, verbose_field: str = 'verbose'):
+        return {
+            'id': self.id,
+            verbose_field: self.verbose,
+        }

{educommon-3.18.0.dist-info → educommon-3.19.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: educommon
-Version: 3.18.0
+Version: 3.19.1
 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.18.0.dist-info → educommon-3.19.1.dist-info}/RECORD

@@ -58,7 +58,7 @@ educommon/audit_log/error_log/actions.py,sha256=-KSy3RrBsbPWCML-gl5Hl5UGQdEsPZho
 educommon/audit_log/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 educommon/audit_log/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 educommon/audit_log/management/commands/audit_log_migrate_data.py,sha256=J_ZIpamGVBcotc-6cYsz37AJADEEyuiUs-VVyKON47o,12695
-educommon/audit_log/management/commands/reinstall_audit_log.py,sha256=HHpUeQwG_SuSsaxwZIq66piNhip_GHHQmAzpEzOFgaM,3573
+educommon/audit_log/management/commands/reinstall_audit_log.py,sha256=xr56lxpMtxR-KB3lKOmqYVmJ0aUOqzYSeod_6XYQmjc,3722
 educommon/audit_log/migrations/0001_initial.py,sha256=HDhvBNyVSx_NlFmyA-t_ooFo_TiKf0UHNCZp1GOpLA8,6115
 educommon/audit_log/migrations/0002_install_audit_log.py,sha256=kAhtd1Xz8b6g33wmxBQyRBJIl-LGJdOc7yFy5yhoRJ8,2825
 educommon/audit_log/migrations/0003_logproxy.py,sha256=fx6nCoDtr3bZTtlwiOKP4QTVPxnnqyYDPMAT20Bv4n8,391
@@ -71,8 +71,8 @@ educommon/audit_log/migrations/0009_reinstall_audit_log.py,sha256=c95H2yamWyrCoG
 educommon/audit_log/migrations/0010_alter_auditlog_time.py,sha256=XmujmdgNADMy4OhL4O7CIK6KDKtW2sSyfxLYWEGmtvI,509
 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=14BHRbKdnvHNgomM-R__GqLk1N32ww_GN2xy81Ph_gs,16388
+educommon/audit_log/sql/install_audit_log.sql,sha256=EhyhGMYn8aYCGEBNC2AC7kuG5vfJiAPxhwTMq_2NADE,14505
+educommon/audit_log/utils/__init__.py,sha256=FKktT7EeO3M1wqYYSnsgEQ6pSyY4OEzSAXP87ZitI5Q,17239
 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
@@ -290,6 +290,7 @@ educommon/utils/caching.py,sha256=eHf4xa6loSCCv9Is5XE8G4Fvi3_bzmwKIUHv9tyPDDw,40
 educommon/utils/conversion.py,sha256=C7FHCQQG5eVbeFRulWv_WvBzIq10hsHjZB3VchlbDiY,1960
 educommon/utils/crypto.py,sha256=kmoX1ntu8tYeobbSxLmyj5kKFabCRQriEfZIxCI7fuM,2139
 educommon/utils/date.py,sha256=bnwEBMUDR3GYnGLEAYBZnnt-7M2toA1jZAba9Lk1J_A,16676
+educommon/utils/enums.py,sha256=jc9JJ7FTbe0ynyLtQ6M7G7ESk5lF9tWu6aGlx4C7Jb0,864
 educommon/utils/misc.py,sha256=6gMFsLoSTktuIv96-6-oouLLdMkSZQyKITz4sXlh-nM,4392
 educommon/utils/object_grid.py,sha256=2ap8593I7Rs_-H3cTrQcIfEa57lrQ0AtcD119-xEwTU,8705
 educommon/utils/plugins.py,sha256=F1A1JLSi-7aBxw2kEk5Gstvx4_rIpgY1D5M4bmbK2AA,9344
@@ -351,7 +352,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.18.0.dist-info/METADATA,sha256=cKDmyFTkng12PZ-N2rVp62H3esRyCz9mHRLwenDTlLU,2380
-educommon-3.18.0.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-educommon-3.18.0.dist-info/top_level.txt,sha256=z5fbW7bz_0V1foUm_FGcZ9_MTpW3N1dBN7-kEmMowl4,10
-educommon-3.18.0.dist-info/RECORD,,
+educommon-3.19.1.dist-info/METADATA,sha256=bTmxkUclBTbBh8nVHUJdEpjKH3hzPyKp6WeSHzmOy_U,2380
+educommon-3.19.1.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+educommon-3.19.1.dist-info/top_level.txt,sha256=z5fbW7bz_0V1foUm_FGcZ9_MTpW3N1dBN7-kEmMowl4,10
+educommon-3.19.1.dist-info/RECORD,,