educommon 3.6.0__py3-none-any.whl → 3.6.1__py3-none-any.whl

educommon/audit_log/helpers.py

@@ -3,9 +3,9 @@ from collections.abc import (
 )
 from typing import (
     TYPE_CHECKING,
+    Iterable as IterableType,
     List,
     Union,
-    Iterable as IterableType,
 )
 
 from educommon.audit_log.models import (

educommon/integration_entities/helpers.py

@@ -19,6 +19,10 @@ from django.utils import (
     timezone,
 )
 
+from m3_db_utils.models import (
+    FictiveForeignKeyMixin,
+)
+
 from educommon.integration_entities.enums import (
     EntityLogOperation,
 )
@@ -75,8 +79,24 @@ class AbstractEntitySaver(ABC):
         """
         return []
 
+    def _convert_fictive_foreign_keys(self, entities: Iterable[Model]):
+        """Преобразование значений полей фиктивных внешних ключей.
+
+        В рамках метода производится проверка наличия фиктивного внешнего ключа у модели. Если они есть и заполнены
+        объектами модели, то производится получения идентификатора объекта модели и замена им самого объекта.
+        """
+        for entity in entities:
+            if isinstance(entity, FictiveForeignKeyMixin):
+                for field_name in entity.fictive_foreign_key_field_names:
+                    field_value = getattr(entity, field_name, None)
+
+                    if field_value and isinstance(field_value, Model):
+                        setattr(entity, field_name, getattr(field_value, 'pk'))
+
     def _create_entities(self) -> None:
         """Создает новые записи."""
+        self._convert_fictive_foreign_keys(entities=self._to_create_entities)
+
         self.model.objects.bulk_create(
             self._to_create_entities,
             batch_size=self.create_batch_size,
@@ -85,6 +105,8 @@ class AbstractEntitySaver(ABC):
 
     def _update_entities(self) -> None:
         """Обновляет записи."""
+        self._convert_fictive_foreign_keys(entities=self._to_create_entities)
+
         for entity in self._to_update_entities:
             # Поле modified имеет свойство auto_now=True и оно не обновляется при update и bulk_update.
             # Поэтому, его нужно обновить вручную:

educommon/version.conf

@@ -4,8 +4,8 @@
 # нормальной установки обновлений.
 
 [version]
-BRANCH = tags/3.6.0
-VERSION = 3.6.0
-REVISION = 352f6d926d60b0008ba31dc0a8d2b89403ebf012
-VERSION_DATE = 07.12.2023
-REVISION_DATE = 07.12.2023
+BRANCH = tags/3.6.1
+VERSION = 3.6.1
+REVISION = 5c849c3a296d1e7c1b370e73a9a661b385c43293
+VERSION_DATE = 16.12.2023
+REVISION_DATE = 16.12.2023

{educommon-3.6.0.dist-info → educommon-3.6.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: educommon
-Version: 3.6.0
+Version: 3.6.1
 Summary: Общая кодовая база для проектов БЦ Образование
 Home-page: https://stash.bars-open.ru/projects/EDUBASE/repos/educommon
 Author: BARS Group
@@ -34,7 +34,7 @@ Requires-Dist: celery
 Requires-Dist: spyne
 Requires-Dist: xlsxwriter <1,>=0.9.3
 Requires-Dist: m3-builder <2,>=1.2
-Requires-Dist: m3-db-utils >=0.3.4
+Requires-Dist: m3-db-utils >=0.3.11
 Requires-Dist: m3-django-compat <2,>=1.9.1
 Requires-Dist: m3-core <3,>=2.2.16
 Requires-Dist: m3-ui <3,>=2.2.40

{educommon-3.6.0.dist-info → educommon-3.6.1.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=3wy-E8arlsV5TaFB4g8soglLQYmu6CH0pNQwm_xxTnw,448
+educommon/version.conf,sha256=CyZ0wpuD4ZOjQH46Sg9nCZPExDS0F8wrAc0C3w-oTOs,448
 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
@@ -29,7 +29,7 @@ educommon/audit_log/actions.py,sha256=hPlnFK8Q8uITA6Rn0CvAyxo76pxVGC1X-g8vzWphgG
 educommon/audit_log/app_meta.py,sha256=fMPgP5S6kDe_lskTEhPVLzjDLDhoVPKCIjUeD4L7sHA,310
 educommon/audit_log/apps.py,sha256=zHeBEoF8HVNc6YIIQTW-lpEMXjrywnB23uqxXIR9IKg,5033
 educommon/audit_log/constants.py,sha256=96Gp-rYpt6poKAu8LbXY_0aApdOWYBy09235kAB0rSo,880
-educommon/audit_log/helpers.py,sha256=0pU_MJmrSJ_IHDs2safMCzcohV1C1IANloll1I4wtxI,738
+educommon/audit_log/helpers.py,sha256=qJLV6yVgf3Z-Mgalc6kGfFvxk8h1L4bTO9fdSL36OPk,738
 educommon/audit_log/middleware.py,sha256=HkxBh-1RQJnhKqckkXaMbFjJ34WgZGJssbk04wiS3ts,1140
 educommon/audit_log/models.py,sha256=F4KW-sdGbKxIKdo3GKpPeu66ykO32MxYZ5afvT_Clyg,8305
 educommon/audit_log/permissions.py,sha256=VB040UAY4_KmqM4ioToHlVHQYSE7OP0qHEUn9bnWUSo,1241
@@ -178,7 +178,7 @@ educommon/integration_entities/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5
 educommon/integration_entities/consts.py,sha256=XMSR-9Q5cLSXe6Bn0JWFQQ8UfTyJfs7LYT1klj0Xvsc,448
 educommon/integration_entities/entities.py,sha256=v4QQPb8NeQJMdgxjfEcY9_NmPGasQbRPoA10gZEMAjU,2005
 educommon/integration_entities/enums.py,sha256=MPS3F402TMUP9wDJXBgNHoktVOf-zM8lAD22QphnLtU,335
-educommon/integration_entities/helpers.py,sha256=MJtR69vC4m62Lt_cW4uoIFy_JNUogcsxY0-9qKBR1p0,8675
+educommon/integration_entities/helpers.py,sha256=ETX_sn6PeKpUK9mBQQ3vtJy143EklRRB6koOQtpc-5I,9888
 educommon/integration_entities/mixins.py,sha256=wWb2nA8BAtDC3dAn66CkpvGwrW17E_tJE9f6BcI9EXg,1122
 educommon/ioc/__init__.py,sha256=1X6uu-hwwxbwRZ6g0whIE04GbpXgU7K80QmtE0v-4kQ,4028
 educommon/logger/__init__.py,sha256=KhXTyv0V96wX_6QShkVrRIk_mqJtDYpeBMBb8PtBl-A,822
@@ -325,8 +325,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.6.0.dist-info/METADATA,sha256=tAlMk2oXeRbPChjaTE_rTNcTage5mFDMgTA6eD-kJbA,1735
-educommon-3.6.0.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-educommon-3.6.0.dist-info/dependency_links.txt,sha256=RNlr4t-BxZRm7e_IfVo1ikr5ln-7viimzLHvQMO1C_Q,43
-educommon-3.6.0.dist-info/top_level.txt,sha256=z5fbW7bz_0V1foUm_FGcZ9_MTpW3N1dBN7-kEmMowl4,10
-educommon-3.6.0.dist-info/RECORD,,
+educommon-3.6.1.dist-info/METADATA,sha256=j7fq3ajpRnYwfk1aYrW_xomuaEyvu5SBE8ePinJisTY,1736
+educommon-3.6.1.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+educommon-3.6.1.dist-info/dependency_links.txt,sha256=RNlr4t-BxZRm7e_IfVo1ikr5ln-7viimzLHvQMO1C_Q,43
+educommon-3.6.1.dist-info/top_level.txt,sha256=z5fbW7bz_0V1foUm_FGcZ9_MTpW3N1dBN7-kEmMowl4,10
+educommon-3.6.1.dist-info/RECORD,,