edu-rdm-integration 3.11.1__py3-none-any.whl → 3.12.0__py3-none-any.whl

edu_rdm_integration/migrations/0002_init_data_uploadstatus.py

@@ -4,19 +4,9 @@ from django.db import (
 )
 
 
-def load_initial_data(apps, schema_editor):
-    # Вместо модели UploadStatus создана модель-перечисление DataMartRequestStatus (см. миграцию 0004)
-    pass
-
-
-def delete_all_data(apps, schema_editor):
-    """Удаление всех данных из модели UploadStatus при откате миграции."""
-    apps.get_model('regional_data_mart_integration', 'UploadStatus').objects.all().delete()
-
-
 class Migration(migrations.Migration):
     dependencies = [
         ('edu_rdm_integration', '0001_initial'),
     ]
 
-    operations = [migrations.RunPython(load_initial_data, reverse_code=delete_all_data)]
+    operations = []

edu_rdm_integration/stages/export_data/functions/base/consts.py

@@ -18,3 +18,6 @@ OPERATIONS_URLS_MAP = {
     EntityLogOperation.UPDATE: 'upload',
     EntityLogOperation.DELETE: 'delete',
 }
+
+
+TEST_DIR = 'test_data'

edu_rdm_integration/stages/export_data/functions/base/functions.py

@@ -72,11 +72,6 @@ class BaseExportDataFunction(
         RDMExportingDataSubStageEntity.objects.create(
             exporting_data_sub_stage=self._sub_stage, entity_id=self.first_entity.key
         )
-        # Проставление подэтапа выгрузки
-        self.entities[0].main_model_enum.model.objects.filter(pk__in=model_ids).update(
-            exporting_sub_stage=self._sub_stage,
-        )
-
         self._chunk_index = kwargs.get('chunk_index')
 
         logger.info(f'{LOGS_DELIMITER * 3}{repr(self._sub_stage)} created.')
@@ -90,6 +85,13 @@ class BaseExportDataFunction(
         }
 
         self.has_data = False
+        # Id записей моделей РВД, которые в итоге попали в файл
+        self.exported_to_file_model_ids = set()
+
+    @property
+    def _models_unique_id(self) -> str:
+        """Возвращает название уникального идентификатора записи модели рвд."""
+        return 'id'
 
     def _prepare_helper_class(self) -> type[BaseExportDataFunctionHelper]:
         """Возвращает класс помощника функции."""
@@ -141,8 +143,9 @@ class BaseExportDataFunction(
                     entity_instance=entity_instance,
                 )
             )
-
-            entity_instance.exporting_sub_stage = self._sub_stage
+            entity_instance_id = getattr(entity_instance, self._models_unique_id, None)
+            if entity_instance_id:
+                self.exported_to_file_model_ids.add(entity_instance_id)
 
         for operation in EntityLogOperation.values.keys():
             entities = self._data.get(operation)
@@ -217,9 +220,20 @@ class BaseExportDataFunction(
                 if not self.has_data
                 else RDMExportingDataSubStageStatus.READY_FOR_EXPORT.key
             )
+            # Проставление подэтапа выгрузки
+            if self.exported_to_file_model_ids:
+                self.entities[0].main_model_enum.model.objects.filter(pk__in=self.exported_to_file_model_ids).update(
+                    exporting_sub_stage=self._sub_stage,
+                )
+
         else:
             self._sub_stage.status_id = RDMExportingDataSubStageStatus.FAILED.key
 
         self._sub_stage.save()
 
         logger.info(f'{LOGS_DELIMITER * 3}change status {repr(self._sub_stage)}')
+
+    def get_function_data(self):
+        """Возвращает словарь с данными сущностей подготовленных к выгрузке."""
+        return self._data
+

edu_rdm_integration/stages/export_data/functions/base/tests.py

@@ -1 +1,162 @@
 # Реализуйте свои unit-тесты здесь
+import datetime
+import shutil
+from typing import (
+    TYPE_CHECKING,
+)
+
+from django.conf import (
+    settings,
+)
+from django.test import (
+    TestCase,
+    override_settings,
+)
+from django.utils import (
+    timezone,
+)
+
+from function_tools.models import (
+    Entity,
+    EntityType,
+)
+
+from edu_rdm_integration.core.consts import (
+    REGIONAL_DATA_MART_INTEGRATION_COLLECTING_DATA,
+    REGIONAL_DATA_MART_INTEGRATION_EXPORTING_DATA,
+)
+from edu_rdm_integration.stages.collect_data.models import (
+    CollectingExportedDataStage,
+    CollectingExportedDataSubStage,
+)
+from edu_rdm_integration.stages.export_data.functions.base.consts import (
+    TEST_DIR,
+)
+from edu_rdm_integration.stages.export_data.models import (
+    ExportingDataStage,
+    ExportingDataSubStage,
+)
+
+
+if TYPE_CHECKING:
+    from function_tools.managers import (
+        RunnerManager,
+    )
+
+    from edu_rdm_integration.stages.export_data.functions.base.functions import (
+        BaseExportDataFunction,
+    )
+
+
+class BaseExportTestCase(TestCase):
+    """Базовый тест экспорта сущности РВД."""
+
+    databases = (settings.DEFAULT_DB_ALIAS, settings.SERVICE_DB_ALIAS)
+
+    def setUp(self) -> None:
+        """Подготавливает фикстуры."""
+        self.now = timezone.now()
+
+        self.export_period_started_at = datetime.datetime.combine(self.now, datetime.time.min)
+        self.export_period_ended_at = datetime.datetime.combine(self.now, datetime.time.max)
+
+    def create_sub_stage(self, *class_names: str) -> CollectingExportedDataSubStage:
+        """Создает подэтап сбора данных."""
+        function_tools_entities = dict(
+            Entity.objects.filter(
+                type__in=(EntityType.MANAGER.key, EntityType.FUNCTION.key),
+                tags__contains=[REGIONAL_DATA_MART_INTEGRATION_COLLECTING_DATA],
+                class_name__in=class_names,
+            ).values_list('type', 'uuid'),
+        )
+        stage = CollectingExportedDataStage.objects.create(
+            manager_id=function_tools_entities[EntityType.MANAGER.key],
+        )
+
+        return CollectingExportedDataSubStage.objects.create(
+            function_id=function_tools_entities[EntityType.FUNCTION.key],
+            stage=stage,
+        )
+
+    @classmethod
+    def tearDownClass(cls) -> None:
+        try:
+            shutil.rmtree(TEST_DIR)
+        except OSError:
+            pass
+
+        super().tearDownClass()
+
+
+class BaseExportManagerTestCase(BaseExportTestCase):
+    """Базовый тест менеджера экспорта сущности РВД."""
+
+    @property
+    def manager(self) -> type['RunnerManager']:
+        """Менеджер раннера Функции экспорта'."""
+        raise NotImplementedError
+
+    @override_settings(MEDIA_ROOT=(TEST_DIR + '/media'))
+    def run_exporting_manager(self) -> None:
+        """Запускает менеджер экспорта."""
+        runner_manager = self.manager(
+            period_started_at=self.export_period_started_at,
+            period_ended_at=self.export_period_ended_at,
+        )
+        runner_manager.run()
+
+    def get_exporting_stage_sub_stage(self, *class_names) -> tuple[ExportingDataStage, ExportingDataSubStage]:
+        """Возвращает этап и подэтап экспорта."""
+        function_tools_entities = dict(
+            Entity.objects.filter(
+                type__in=(EntityType.MANAGER.key, EntityType.FUNCTION.key),
+                tags__contains=[REGIONAL_DATA_MART_INTEGRATION_EXPORTING_DATA],
+                class_name__in=class_names,
+            ).values_list('type', 'uuid'),
+        )
+        exported_data_stage = ExportingDataStage.objects.filter(
+            manager_id=function_tools_entities[EntityType.MANAGER.key],
+            period_started_at=self.export_period_started_at,
+            period_ended_at=self.export_period_ended_at,
+        ).first()
+        exported_data_substage = ExportingDataSubStage.objects.filter(
+            function_id=function_tools_entities[EntityType.FUNCTION.key],
+            stage=exported_data_stage
+        ).first()
+
+        return exported_data_stage, exported_data_substage
+
+
+class BaseExportFunctionTestCase(BaseExportTestCase):
+    """Базовый тест менеджера экспорта сущности РВД."""
+
+    @property
+    def export_function(self) -> type['BaseExportDataFunction']:
+        """Функция экспорта."""
+        raise NotImplementedError
+
+    def create_exporting_stage(self, *class_names: str) -> ExportingDataStage:
+        """Создает этап экспорта данных."""
+        function_tools_entities = dict(
+            Entity.objects.filter(
+                type__in=(EntityType.MANAGER.key, EntityType.FUNCTION.key),
+                tags__contains=[REGIONAL_DATA_MART_INTEGRATION_EXPORTING_DATA],
+                class_name__in=class_names,
+            ).values_list('type', 'uuid'),
+        )
+        return ExportingDataStage.objects.create(
+            manager_id=function_tools_entities[EntityType.MANAGER.key],
+            period_started_at=self.export_period_started_at,
+            period_ended_at=self.export_period_ended_at,
+        )
+
+    @override_settings(MEDIA_ROOT=(TEST_DIR + '/media'))
+    def run_exporting_function(self, exporting_stage: ExportingDataStage, model_ids: list[int]) -> dict:
+        """Запускает функцию экспорта."""
+        exporting_function = self.export_function(
+            stage=exporting_stage,
+            model_ids=model_ids
+        )
+        exporting_function.run()
+
+        return exporting_function.get_function_data()

edu_rdm_integration/stages/export_data/migrations/0002_auto_20250704_0810.py

@@ -10,7 +10,6 @@ class Migration(migrations.Migration):
         ('function_tools', '0005_auto_20220724_0050'),
         ('edu_rdm_integration_upload_data_stage', '0001_initial'),
         ('async_task', '0003_alter_runningtask_options'),
-        ('regional_data_mart_integration', '0163_auto_20250704_0725'),
         ('edu_rdm_integration_entities', '0002_rename_regionaldatamartentityenum_rdmentityenum'),
         ('edu_rdm_integration_export_data_stage', '0001_initial'),
     ]

{edu_rdm_integration-3.11.1.dist-info → edu_rdm_integration-3.12.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: edu-rdm-integration
-Version: 3.11.1
+Version: 3.12.0
 Summary: Интеграция с Региональной витриной данных
 Author-email: BARS Group <education_dev@bars.group>
 Project-URL: Homepage, https://stash.bars-open.ru/projects/EDUBASE/repos/edu-rdm-integration/browse
@@ -25,7 +25,7 @@ Requires-Dist: transliterate<2
 Requires-Dist: Django<5.0,>=3.1
 Requires-Dist: celery<5.3,>=4.4.7
 Requires-Dist: asyncpg==0.23.0
-Requires-Dist: educommon<4,>=3.11.0
+Requires-Dist: educommon<4,>=3.21.0
 Requires-Dist: function-tools<1,>=0.9.0
 Requires-Dist: m3-db-utils<1,>=0.3.10
 Requires-Dist: m3-django-compat<2,>=1.10.2

{edu_rdm_integration-3.11.1.dist-info → edu_rdm_integration-3.12.0.dist-info}/RECORD

@@ -42,7 +42,7 @@ edu_rdm_integration/core/registry/apps.py,sha256=ioBzfLzvKb36KmuVVCHbg9wxM6PHy4Z
 edu_rdm_integration/core/registry/ui.py,sha256=93N7kzsS0_01NNhPM0KfDEy2WGj3pb0YBDmCp74Vx8I,4213
 edu_rdm_integration/core/registry/templates/ui-js/start-task.js,sha256=mwLMFFOZku5AS0CF7AzPoIP_jGP36uetlN6noUE2pBw,1490
 edu_rdm_integration/migrations/0001_initial.py,sha256=8ApUOjeS8HY63lILdZuZwZjPWlrZQsvIY6GnxI_Jp4E,24152
-edu_rdm_integration/migrations/0002_init_data_uploadstatus.py,sha256=8YwdwQJjUZ0VJf6IenUOR_n73ccR10gXklpM38O8s1g,723
+edu_rdm_integration/migrations/0002_init_data_uploadstatus.py,sha256=1r92Gjzoi-nrujpCWnDLKOhLa429Qdxoqx74IwH7Cjk,195
 edu_rdm_integration/migrations/0003_create_index_file_upload_status.py,sha256=cPubppoL4kbu2MFGjdVcjwbPcorXjEPgMPoPkmyh7q8,734
 edu_rdm_integration/migrations/0004_uploaderclientlog.py,sha256=tbWauXEcWdWoS6FRKe5n3Hes0NelpLjBSk0WqLaVAeM,624
 edu_rdm_integration/migrations/0005_auto_20231204_1224.py,sha256=OAEKL-v-R80yl5KYVvRdKWjebkTCWDC4AHVOISkTwo4,2011
@@ -199,10 +199,10 @@ edu_rdm_integration/stages/export_data/function_templates/function_export_data_t
 edu_rdm_integration/stages/export_data/functions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edu_rdm_integration/stages/export_data/functions/base/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edu_rdm_integration/stages/export_data/functions/base/caches.py,sha256=WsZY0hUzhydCuC0KO-04norF9qTmncdX_Txk5HTgiFc,1478
-edu_rdm_integration/stages/export_data/functions/base/consts.py,sha256=jLuy2y7YQ921OrEuzDld3F0k6YxgCnr5yorWBQJiLLw,519
+edu_rdm_integration/stages/export_data/functions/base/consts.py,sha256=wRwgxRhQ21uFm9vF0Ub_R7cmep2nYWqGFQDxsIiM2ys,544
 edu_rdm_integration/stages/export_data/functions/base/enums.py,sha256=BSmwrkzYwEQhz9NbZCJsldY532PqgZJzxzsVk6ue0bM,93
 edu_rdm_integration/stages/export_data/functions/base/errors.py,sha256=LusnB7wDkF8upSAgnxPb2c9N51QiTfp3G1l2-3J2AnM,281
-edu_rdm_integration/stages/export_data/functions/base/functions.py,sha256=91xQKvvfBvuicEYgSup7xWaec9DlZ0m80ZD-M0-U5zs,8694
+edu_rdm_integration/stages/export_data/functions/base/functions.py,sha256=4ydnkqQXUjydzV5okrwATIH-UdGjDctX1fgzmWMdSaM,9484
 edu_rdm_integration/stages/export_data/functions/base/helpers.py,sha256=f2CFUd6Efu7ZIljjjMi71UxWRFJr3q2mn4nyZPQVCLU,4517
 edu_rdm_integration/stages/export_data/functions/base/managers.py,sha256=RvUjBYl8e6akA0hD7Qlaa_foGB5r0AfsyAFzyGL8o38,6098
 edu_rdm_integration/stages/export_data/functions/base/presenters.py,sha256=83BvbpXlR8Pn7EyyWOuJJneQyWs5F8U0ugZK0FoRDUE,393
@@ -210,7 +210,7 @@ edu_rdm_integration/stages/export_data/functions/base/requests.py,sha256=kZkjuNB
 edu_rdm_integration/stages/export_data/functions/base/results.py,sha256=asAaDbbm9REFit7HweqdEZPvYUPH8GP-wh4FHJo5B4U,527
 edu_rdm_integration/stages/export_data/functions/base/runners.py,sha256=QK5WjWK-nnOJ1MdEGCVosFpuRFWpPWOzYQfJN5cIBl0,2438
 edu_rdm_integration/stages/export_data/functions/base/strings.py,sha256=-k9dex8A7hCpkzUkudVkKRAbNRuuqog2hYl2xmibl8I,181
-edu_rdm_integration/stages/export_data/functions/base/tests.py,sha256=MoRY-a75Ow-7EjeQYxkXWunwqTGuBMaUyEkEV2oy05I,59
+edu_rdm_integration/stages/export_data/functions/base/tests.py,sha256=Kxlf3aXzGcZ6QqfozCxlSrRU0l1lIcFDgupstOnwwhM,5756
 edu_rdm_integration/stages/export_data/functions/base/validators.py,sha256=s6Ne37zMS5UOyB-Od2fFQDmvD2c0jBWZ_XFUaaYX-6I,905
 edu_rdm_integration/stages/export_data/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edu_rdm_integration/stages/export_data/management/base.py,sha256=u_4Oc6F5OoMiYH7BHYD42Vv7c56vnHxFVqNyPaPv6MI,4068
@@ -218,7 +218,7 @@ edu_rdm_integration/stages/export_data/management/commands/__init__.py,sha256=47
 edu_rdm_integration/stages/export_data/management/commands/export_entities_data.py,sha256=0WTmc0-B1vQsXHERhYfzDIe_y_glIxy0lE67GLCfrPc,937
 edu_rdm_integration/stages/export_data/management/commands/export_latest_entities_data.py,sha256=eYjBs_tZxcUAIseCyvsy5Jk-8k9Gm3xrG2dCuWNnrEs,1163
 edu_rdm_integration/stages/export_data/migrations/0001_initial.py,sha256=h7HIT-QkWONCzIergDp2c861Lw_-f9TZQ5FPIREeHTk,16864
-edu_rdm_integration/stages/export_data/migrations/0002_auto_20250704_0810.py,sha256=fSrlEckUEp6oP4Jd1Uxh7FjzxFqr-JBB76llJIcbgkE,1629
+edu_rdm_integration/stages/export_data/migrations/0002_auto_20250704_0810.py,sha256=yjGlH25Mke2_VAe188LEkWZ04Xy1qenai7D2zOA-ecY,1558
 edu_rdm_integration/stages/export_data/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edu_rdm_integration/stages/export_data/registry/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edu_rdm_integration/stages/export_data/registry/actions.py,sha256=r-NAPs4pYVectt_J38UzMsnKrWfYkjy2rhx3LUGKQWk,10423
@@ -259,8 +259,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.11.1.dist-info/licenses/LICENSE,sha256=uw43Gjjj-1vXWCItfSrNDpbejnOwZMrNerUh8oWbq8Q,3458
-edu_rdm_integration-3.11.1.dist-info/METADATA,sha256=Jm7ZC3kDTyTGpWxTM01F7twi9Jmfk4oaAcmf_-jQ_VY,39698
-edu_rdm_integration-3.11.1.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-edu_rdm_integration-3.11.1.dist-info/top_level.txt,sha256=nRJV0O14UtNE-jGIYG03sohgFnZClvf57H5m6VBXe9Y,20
-edu_rdm_integration-3.11.1.dist-info/RECORD,,
+edu_rdm_integration-3.12.0.dist-info/licenses/LICENSE,sha256=uw43Gjjj-1vXWCItfSrNDpbejnOwZMrNerUh8oWbq8Q,3458
+edu_rdm_integration-3.12.0.dist-info/METADATA,sha256=RN9RcZsmrWMilZyredeZmb_9M_PICTrNxrhPvXfmIEs,39698
+edu_rdm_integration-3.12.0.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+edu_rdm_integration-3.12.0.dist-info/top_level.txt,sha256=nRJV0O14UtNE-jGIYG03sohgFnZClvf57H5m6VBXe9Y,20
+edu_rdm_integration-3.12.0.dist-info/RECORD,,