edu-rdm-integration 3.15.4__py3-none-any.whl → 3.16.1__py3-none-any.whl

edu_rdm_integration/stages/collect_data/models.py

@@ -17,6 +17,9 @@ from django.db.models import (
 from django.utils import (
     timezone,
 )
+from edu_function_tools.models import (
+    EduEntity,
+)
 from m3.db import (
     BaseObjectModel,
 )
@@ -28,9 +31,6 @@ from educommon.utils.date import (
     get_today_max_datetime,
     get_today_min_datetime,
 )
-from edu_function_tools.models import (
-    EduEntity,
-)
 from m3_db_utils.models import (
     ModelEnumValue,
     TitledModelEnum,
@@ -124,6 +124,11 @@ class RDMCollectingDataStage(ReprStrPreModelMixin, BaseObjectModel):
 
     def save(self, *args, **kwargs):
         """Сохранение этапа сбора данных модели РВД."""
+        if 'update_fields' in kwargs:
+            kwargs['update_fields'] = set(kwargs['update_fields'])
+            # Добавляем все поля, которые меняются в save()
+            kwargs['update_fields'].update({'ended_at'})
+
         if (
             self.status_id in (RDMCollectingDataStageStatus.FAILED.key, RDMCollectingDataStageStatus.FINISHED.key)
             and not self.ended_at
@@ -221,6 +226,11 @@ class RDMCollectingDataSubStage(ReprStrPreModelMixin, BaseObjectModel):
 
     def save(self, *args, **kwargs):
         """Сохранение подэтапа сбора данных."""
+        if 'update_fields' in kwargs:
+            kwargs['update_fields'] = set(kwargs['update_fields'])
+            # Добавляем все поля, которые меняются в save()
+            kwargs['update_fields'].update({'ended_at'})
+
         if (
             self.status_id
             in (RDMCollectingDataSubStageStatus.FAILED.key, RDMCollectingDataSubStageStatus.READY_TO_EXPORT.key)

edu_rdm_integration/stages/export_data/models.py

@@ -18,6 +18,9 @@ from django.db.models import (
 from django.utils import (
     timezone,
 )
+from edu_function_tools.models import (
+    EduEntity,
+)
 from m3.db import (
     BaseObjectModel,
 )
@@ -28,9 +31,6 @@ from educommon.django.db.mixins import (
 from educommon.integration_entities.enums import (
     EntityLogOperation,
 )
-from edu_function_tools.models import (
-    EduEntity,
-)
 from m3_db_utils.models import (
     ModelEnumValue,
     TitledModelEnum,
@@ -126,6 +126,11 @@ class RDMExportingDataStage(ReprStrPreModelMixin, BaseObjectModel):
 
     def save(self, *args, **kwargs):
         """Сохранение этапа экспорта данных."""
+        if 'update_fields' in kwargs:
+            kwargs['update_fields'] = set(kwargs['update_fields'])
+            # Добавляем все поля, которые меняются в save()
+            kwargs['update_fields'].update({'ended_at'})
+
         if (
             self.status_id in (RDMExportingDataStageStatus.FAILED.key, RDMExportingDataStageStatus.FINISHED.key)
             and not self.ended_at
@@ -213,6 +218,11 @@ class RDMExportingDataSubStage(ReprStrPreModelMixin, BaseObjectModel):
 
     def save(self, *args, **kwargs):
         """Сохранение экземпляра модели."""
+        if 'update_fields' in kwargs:
+            kwargs['update_fields'] = set(kwargs['update_fields'])
+            # Добавляем все поля, которые меняются в save()
+            kwargs['update_fields'].update({'ended_at'})
+
         if (
             self.status_id
             in {

{edu_rdm_integration-3.15.4.dist-info → edu_rdm_integration-3.16.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: edu-rdm-integration
-Version: 3.15.4
+Version: 3.16.1
 Summary: Интеграция с Региональной витриной данных
 Author-email: BARS Group <education_dev@bars.group>
 Project-URL: Homepage, https://stash.bars-open.ru/projects/EDUBASE/repos/edu-rdm-integration/browse
@@ -17,6 +17,7 @@ Classifier: Framework :: Django :: 3.1
 Classifier: Framework :: Django :: 3.2
 Classifier: Framework :: Django :: 4.0
 Classifier: Framework :: Django :: 4.1
+Classifier: Framework :: Django :: 4.2
 Classifier: Intended Audience :: Developers
 Classifier: Environment :: Web Environment
 Requires-Python: >=3.9

{edu_rdm_integration-3.15.4.dist-info → edu_rdm_integration-3.16.1.dist-info}/RECORD

@@ -80,7 +80,7 @@ edu_rdm_integration/stages/collect_data/consts.py,sha256=tzaK9oxzdMRq3oTEocPz4um
 edu_rdm_integration/stages/collect_data/generators.py,sha256=OM5KsInz_as8K2TX4XLJ-AWTnul-VR4v6oS5ORdU0fI,12970
 edu_rdm_integration/stages/collect_data/helpers.py,sha256=xy8z9yJKEMjNUPNhrsRRtnYy6RVbwDoD5zSDAX7y_6U,5260
 edu_rdm_integration/stages/collect_data/mixins.py,sha256=izioaiPC26BDODgi_Lhy33IaH207945tGjFnbFLMQyI,2072
-edu_rdm_integration/stages/collect_data/models.py,sha256=hxB2JUF0U0d7Gr8UcPDEhONLACTuqA63SFPEK5qn2Mo,8916
+edu_rdm_integration/stages/collect_data/models.py,sha256=wBN1hT6c4pRotsv8EhW-dnvjJvbfk_3w49NMCF5uUyM,9426
 edu_rdm_integration/stages/collect_data/operations.py,sha256=eqE_npV6Z72UYatwncaxYhSCwoHv4H09uLtEg19dQ08,11849
 edu_rdm_integration/stages/collect_data/tests.py,sha256=qVSeJYWMCQkOVXP1sMe8XzCgdvRFXs9KdcOA_USLteQ,5550
 edu_rdm_integration/stages/collect_data/function_templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -163,7 +163,7 @@ edu_rdm_integration/stages/export_data/consts.py,sha256=ZEi1kXMs-54KFKxkyGIQVwZ4
 edu_rdm_integration/stages/export_data/generators.py,sha256=XsTGcKm0oDgE3fUVDxRMkNFriOeuPDBAWi32nx5ASuc,3974
 edu_rdm_integration/stages/export_data/helpers.py,sha256=uBl85AWS-V0usHeLf7VeAsy0ywvqXL_zT1Kgho-MRTM,6537
 edu_rdm_integration/stages/export_data/mixins.py,sha256=YCr5aNcZmDx07JIr-vMietQQ3sZ82caWc7SWOMfdSjY,1772
-edu_rdm_integration/stages/export_data/models.py,sha256=eFu6R5SY5aTRXxMSUMn7JxgqsLmLoDWECSYRZtXufrs,11257
+edu_rdm_integration/stages/export_data/models.py,sha256=2qaVF86WEtAuQHBPF9wmDVg0F64SYEDyV8gV7dI4dkE,11767
 edu_rdm_integration/stages/export_data/operations.py,sha256=g8rj4TaFnkRkaBD4omckBTGwsTlYpuBydOwwxY9hEiI,13188
 edu_rdm_integration/stages/export_data/strategies.py,sha256=l_KXWbYanhhdJ1ldf_pSGO7IkUoXpOOPKhaOzTcqiJY,6519
 edu_rdm_integration/stages/export_data/function_templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -246,8 +246,8 @@ edu_rdm_integration/stages/upload_data/uploader_log/ui.py,sha256=mU3XA9zVKHGqzNk
 edu_rdm_integration/stages/upload_data/uploader_log/migrations/0001_initial.py,sha256=r5oOB7DBK9-mfuqPAgjXUJY5-hEcmMdILCwDTpaLnBc,753
 edu_rdm_integration/stages/upload_data/uploader_log/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edu_rdm_integration/stages/upload_data/uploader_log/templates/ui-js/object-grid-buttons.js,sha256=2xyGe0wdVokM0RhpzRzcRvJPBkBmPe3SlZry4oP4Nzs,6201
-edu_rdm_integration-3.15.4.dist-info/licenses/LICENSE,sha256=uw43Gjjj-1vXWCItfSrNDpbejnOwZMrNerUh8oWbq8Q,3458
-edu_rdm_integration-3.15.4.dist-info/METADATA,sha256=hkEr7M93oXb0udY1lgc4_zF_YdGnuH9wEZStdA4xV00,39741
-edu_rdm_integration-3.15.4.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-edu_rdm_integration-3.15.4.dist-info/top_level.txt,sha256=nRJV0O14UtNE-jGIYG03sohgFnZClvf57H5m6VBXe9Y,20
-edu_rdm_integration-3.15.4.dist-info/RECORD,,
+edu_rdm_integration-3.16.1.dist-info/licenses/LICENSE,sha256=uw43Gjjj-1vXWCItfSrNDpbejnOwZMrNerUh8oWbq8Q,3458
+edu_rdm_integration-3.16.1.dist-info/METADATA,sha256=oFZgonV1BYPkEAzdOOQFI-NpB2NNW_FTbtzMzCmjyA8,39780
+edu_rdm_integration-3.16.1.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+edu_rdm_integration-3.16.1.dist-info/top_level.txt,sha256=nRJV0O14UtNE-jGIYG03sohgFnZClvf57H5m6VBXe9Y,20
+edu_rdm_integration-3.16.1.dist-info/RECORD,,