educommon 3.8.0__py3-none-any.whl → 3.8.2__py3-none-any.whl

educommon/audit_log/models.py

@@ -1,12 +1,17 @@
+import re
 from datetime import (
     datetime,
 )
+from logging import (
+    WARNING,
+)
 from typing import (
     TYPE_CHECKING,
     Any,
     Dict,
     List,
     Optional,
+    Union,
 )
 
 from celery.signals import (
@@ -49,6 +54,9 @@ from educommon.django.db.models import (
 from educommon.thread_data import (
     thread_data,
 )
+from educommon.utils.misc import (
+    message_to_sentry,
+)
 
 
 if TYPE_CHECKING:
@@ -186,8 +194,36 @@ class AuditLog(ReadOnlyMixin, BaseModel):
 
         return result
 
-    def _transform_fields(self, fields: Dict[str, Optional[str]]) -> Dict[str, Any]:
+    def _convert_str_to_dict(self, fields: str) -> Dict[str, Any]:
+        """Преобразование строки из HStore в словарь."""
+        # Перезагружаем значения модели из базы данных
+        self.refresh_from_db()
+        try:
+            fields = dict(fields)
+            message = 'Удалось после refresh_from_db()'
+        except ValueError:
+            # Вручную создаем словарь из строки
+            pattern = r'"(\w+)"\s*=>\s*([^,]+)'
+            # Ищем совпадения в строке
+            matches = re.findall(pattern, fields)
+            # Создаем словарь из найденных пар ключ-значение
+            fields = {key: None if value == 'NULL' else value[1:-1] for key, value in matches}
+            message = 'Удалось вручную'
+
+        message_to_sentry(
+            message=f'{message} преобразовать в словарь поле HStore модели AuditLog',
+            extra={'fields': fields, 'id': self.id},
+            tag='transformed_fields',
+            level=WARNING,
+        )
+
+        return fields
+
+    def _transform_fields(self, fields: Union[Dict[str, Optional[str]], str]) -> Dict[str, Any]:
         """Преобразует значения полей лога в соответствии с типами полей модели."""
+        if isinstance(fields, str):
+            fields = self._convert_str_to_dict(fields)
+
         transformed_fields = dict(fields)
 
         model_fields = self.fields

educommon/django/db/validators/simple.py

@@ -932,12 +932,28 @@ class HouseValidator(RegexValidator):
     Эти дома относятся к "специальным" зданиям, хоз. помещениям на закрытых
     территориях (заводы, склады), гаражам и т.д.
     Если нужно будет, что бы они так же считались валидными,
-    то регулярку нужно будет расширить до '^[0-9IVXа-яё/"_,.-]{1,20}$'
+    то регулярку нужно будет расширить до
+    '^(?=.{,20}$)([0-9IVXА-ЯЁа-яё"/_,.-]{1,} ?){1,}\b$'
     """
-    regex = re.compile(r'^[0-9а-яё/"_,.-]{0,12}$', re.IGNORECASE | re.UNICODE)
+    regex = re.compile(
+        r'^(?=.{,12}$)([0-9а-яё"/_,.-]{1,} ?){1,}\b$',
+        re.IGNORECASE | re.UNICODE
+    )
     message = 'Неверно указан номер дома'
 
 
+regex_house_validator = HouseValidator()
+
+
+def house_validator(value):
+    value = str(value)
+
+    regex_house_validator(value)
+
+
+is_house_number_valid = partial(validate_value, validator=house_validator)
+
+
 class BuildingValidator(RegexValidator):
     """Валидатор номера корпуса дома."""
     regex = re.compile(r'^[0-9а-яё/_.-]{0,10}$', re.IGNORECASE | re.UNICODE)

educommon/utils/misc.py

@@ -1,10 +1,21 @@
 import hashlib
+import logging
+
+from django.conf import (
+    settings,
+)
 
 from educommon import (
     Undefined,
 )
 
 
+if getattr(settings, 'SENTRY_DSN', None):
+    from raven.contrib.django.raven_compat.models import (
+        client as sentry_client,
+    )
+
+
 class cached_property(property):
     """Кешируемое свойство.
 
@@ -112,3 +123,19 @@ def get_mime_type_for_extension(extension):
     if not extension.startswith('.'):
         extension = '.%s' % extension
     return mimetypes.types_map.get(extension.lower())
+
+
+def message_to_sentry(message=None, extra=None, tag=None, level=logging.INFO):
+    """
+    Отправляет сообщение в Sentry с переданным типом, или "INFO" по-умолчанию.
+    В параметре extra можно передать словарь с дополнительной отладочной
+    информацией
+    В параметре tag можно отправить тег для последующего поиска в Sentry
+    """
+    if getattr(settings, 'SENTRY_DSN', None):
+        sentry_client.captureMessage(
+            message=message,
+            data={'level': level},
+            extra=extra,
+            tags={'tags': tag} if tag else None
+        )

educommon/version.conf

@@ -4,8 +4,8 @@
 # нормальной установки обновлений.
 
 [version]
-BRANCH = tags/3.8.0
-VERSION = 3.8.0
-REVISION = 78b3e90e31a52e57ef6d034029295f0998db4e0d
-VERSION_DATE = 22.01.2024
-REVISION_DATE = 22.01.2024
+BRANCH = tags/3.8.2^0
+VERSION = 3.8.2
+REVISION = d04e2e448a6c1650c844fb68c311f296f6944a61
+VERSION_DATE = 06.02.2024
+REVISION_DATE = 06.02.2024

{educommon-3.8.0.dist-info → educommon-3.8.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: educommon
-Version: 3.8.0
+Version: 3.8.2
 Summary: Общая кодовая база для проектов БЦ Образование
 Home-page: https://stash.bars-open.ru/projects/EDUBASE/repos/educommon
 Author: BARS Group

{educommon-3.8.0.dist-info → educommon-3.8.2.dist-info}/RECORD

@@ -1,6 +1,6 @@
 educommon/__init__.py,sha256=fvsBDL7g8HgOTd-JHOh7TSvMcnUauvGVgPuyA2Z9hUI,419
 educommon/thread_data.py,sha256=n0XtdesP9H92O3rJ8K6fVnJLiHqyJEfh2xpuT36wzxs,61
-educommon/version.conf,sha256=OTMAPgy6ioA-_MmRhBNoJFq3Gcyl5O7VJbBjIIiwzbY,448
+educommon/version.conf,sha256=ILdztASJn7UgrupbMF5zFiUVtcTAs6m1s2iqLD883iA,450
 educommon/about/README.rst,sha256=U48UW5jv-8qHyaV56atzzkNMvzHKXVcWSb_NR06PnMo,2685
 educommon/about/__init__.py,sha256=H1W0IgW-qX9LCZ49GOJzHdmQGHhh-MA6U1xmNx7WnfM,132
 educommon/about/apps.py,sha256=GrpJAOE2sF0ukWsqugP_WJS88DO4aL-T3kTLprrJrcA,259
@@ -47,7 +47,7 @@ educommon/audit_log/apps.py,sha256=zHeBEoF8HVNc6YIIQTW-lpEMXjrywnB23uqxXIR9IKg,5
 educommon/audit_log/constants.py,sha256=96Gp-rYpt6poKAu8LbXY_0aApdOWYBy09235kAB0rSo,880
 educommon/audit_log/helpers.py,sha256=qJLV6yVgf3Z-Mgalc6kGfFvxk8h1L4bTO9fdSL36OPk,738
 educommon/audit_log/middleware.py,sha256=HkxBh-1RQJnhKqckkXaMbFjJ34WgZGJssbk04wiS3ts,1140
-educommon/audit_log/models.py,sha256=8oVyGy4LX1zac38x_AVQPdA4ya5aVOZEz2dGlMu5s-s,10174
+educommon/audit_log/models.py,sha256=LYU-y9OgVFZ1bsH17DMfyfYv2LU1yKvIeGTVSz5HYjM,11599
 educommon/audit_log/permissions.py,sha256=VB040UAY4_KmqM4ioToHlVHQYSE7OP0qHEUn9bnWUSo,1241
 educommon/audit_log/proxies.py,sha256=r12ZVAPe8d78tZSnNsOypDnV-gQ4VFtw0l7DycksPhg,8562
 educommon/audit_log/routers.py,sha256=FF3KLvf6_WWFuZ9VRI8AZyKDfWp_lyd0i6bcVFfIehQ,204
@@ -159,7 +159,7 @@ educommon/django/db/partitioning/management/commands/apply_partitioning.py,sha25
 educommon/django/db/partitioning/management/commands/clear_table.py,sha256=Dt1u4Q35dz-W39sW1UYIQjdGyI7URJl6Z96qJOJYTbA,2235
 educommon/django/db/partitioning/management/commands/split_table.py,sha256=AfsBKWyW2yYYc05LGHdfULwW6GvaB6LXMBblSsxfg30,2082
 educommon/django/db/validators/__init__.py,sha256=Hyx-L4suVzUuCEb-HQB9g8LnaxKQp2ymv-DtaOW6qbw,1986
-educommon/django/db/validators/simple.py,sha256=my8K9FzbricSbSWbfZGwg8bFcvqmXcWaPOIXHQl8o3Q,38608
+educommon/django/db/validators/simple.py,sha256=cwG-OLVPdD146A9dzLOaGyzZOoUWgQoFu9KDQ7_k8xI,38886
 educommon/django/storages/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 educommon/django/storages/atcfs/README.rst,sha256=yPy55jjKmSVL6Sg1LHzg_6wI7UAG4JDI6rjqaVxQfWs,2656
 educommon/django/storages/atcfs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -284,7 +284,7 @@ educommon/utils/caching.py,sha256=ux6ShlJJK3gh0C6XvpanbapXOI5uXUhDNgWQI7AsBBE,40
 educommon/utils/conversion.py,sha256=kEe15TwIH19RmC2mRl1JrrqD8mXgbCAPOYWnkIQXxqQ,1966
 educommon/utils/crypto.py,sha256=3uMk2CP53ZOsJ5Tcb0DLWxmk9ezINZQUsQcqF6j8XR0,2158
 educommon/utils/date.py,sha256=B0-rgaeM1LqjCBsINetjauZaOe0ATAcQUCZJTnLnNzo,16800
-educommon/utils/misc.py,sha256=HGSoCSyF6hAZaeFTTgA2IkIfMAXIuURqh-rzHVNe0LE,3352
+educommon/utils/misc.py,sha256=8bCRlgOnm9QDlEIEri_nkeQc9xm9p8cae_wUk2ig1L0,4286
 educommon/utils/object_grid.py,sha256=mUJd0HJmj4PVljmkwxlR3mQO__YnlLBmAZcFWGxTHLc,9048
 educommon/utils/patches.py,sha256=Pio9V3bmDH79tTJnM5hi8rwhMEBtbpAg30zPTk5fuN0,1157
 educommon/utils/plugins.py,sha256=YAD3FM78ihPtyaB_olNM1CoSc5Q5icF_J3A0ivFBFmY,9469
@@ -341,8 +341,8 @@ educommon/ws_log/smev/exceptions.py,sha256=lmy7o2T3dJkqgIhG07qyh5yPqO3qZAYABuT4J
 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.8.0.dist-info/METADATA,sha256=lpijvwxlV2qpNu5bSId3mA5qcCdUIsEMeodMi6_43eY,1450
-educommon-3.8.0.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-educommon-3.8.0.dist-info/dependency_links.txt,sha256=RNlr4t-BxZRm7e_IfVo1ikr5ln-7viimzLHvQMO1C_Q,43
-educommon-3.8.0.dist-info/top_level.txt,sha256=z5fbW7bz_0V1foUm_FGcZ9_MTpW3N1dBN7-kEmMowl4,10
-educommon-3.8.0.dist-info/RECORD,,
+educommon-3.8.2.dist-info/METADATA,sha256=Q9heCg3X0oaqx1nQDOt0ewJgnRPYU4fDyhQdtnB0uy4,1450
+educommon-3.8.2.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+educommon-3.8.2.dist-info/dependency_links.txt,sha256=RNlr4t-BxZRm7e_IfVo1ikr5ln-7viimzLHvQMO1C_Q,43
+educommon-3.8.2.dist-info/top_level.txt,sha256=z5fbW7bz_0V1foUm_FGcZ9_MTpW3N1dBN7-kEmMowl4,10
+educommon-3.8.2.dist-info/RECORD,,