edu-rdm-integration 3.10.3__py3-none-any.whl → 3.11.0__py3-none-any.whl

edu_rdm_integration/stages/collect_data/registry/apps.py

@@ -8,4 +8,4 @@ class RDMCollectDataRegistryAppConfig(AppConfig):
 
     name = 'edu_rdm_integration.stages.collect_data.registry'
     label = 'edu_rdm_integration_collect_data_registry'
-    verbose_name = 'Сбор данных моделей РВД из интерфейса'
+    verbose_name = 'Сбор данных моделей РВД из интерфейса'

edu_rdm_integration/stages/collect_data/registry/ui.py

@@ -29,7 +29,7 @@ from edu_rdm_integration.core.registry.ui import (
     BaseCreateCommandWindow,
 )
 from edu_rdm_integration.rdm_models.models import (
-    RegionalDataMartModelEnum,
+    RDMModelEnum,
 )
 from edu_rdm_integration.stages.collect_data.consts import (
     ALL_UNITS_IN_COMMAND,
@@ -52,9 +52,7 @@ class CreateCollectCommandWindow(BaseCreateCommandWindow):
             trigger_action_all=True,
             allow_blank=False,
         )
-        model.set_store(
-            ExtDataStore((idx, key) for idx, key in enumerate(RegionalDataMartModelEnum.get_model_enum_keys()))
-        )
+        model.set_store(ExtDataStore((idx, key) for idx, key in enumerate(RDMModelEnum.get_model_enum_keys())))
         logs_period_started_at = ExtDateTimeField(
             name='logs_period_started_at',
             label='Начало периода',

edu_rdm_integration/stages/collect_data/tests.py

@@ -42,8 +42,8 @@ from edu_rdm_integration.core.consts import (
     REGIONAL_DATA_MART_INTEGRATION_COLLECTING_DATA,
 )
 from edu_rdm_integration.stages.collect_data.models import (
-    CollectingExportedDataStage,
-    CollectingExportedDataSubStage,
+    RDMCollectingDataStage,
+    RDMCollectingDataSubStage,
 )
 
 
@@ -127,7 +127,7 @@ class BaseCollectingFunctionTestCase(TestCase):
             operation=operation,
         )
 
-    def create_sub_stage(self, *class_names: str) -> CollectingExportedDataSubStage:
+    def create_sub_stage(self, *class_names: str) -> RDMCollectingDataSubStage:
         """Создает подэтап сбора данных."""
         function_tools_entities = dict(
             Entity.objects.filter(
@@ -136,11 +136,11 @@ class BaseCollectingFunctionTestCase(TestCase):
                 class_name__in=class_names,
             ).values_list('type', 'uuid'),
         )
-        stage = CollectingExportedDataStage.objects.create(
+        stage = RDMCollectingDataStage.objects.create(
             manager_id=function_tools_entities[EntityType.MANAGER.key],
         )
 
-        return CollectingExportedDataSubStage.objects.create(
+        return RDMCollectingDataSubStage.objects.create(
             function_id=function_tools_entities[EntityType.FUNCTION.key],
             stage=stage,
         )

edu_rdm_integration/stages/export_data/function_templates/function_export_data_template/functions.py-tpl

@@ -7,7 +7,7 @@ from edu_rdm_integration.core.consts import (
     REGIONAL_DATA_MART_INTEGRATION_EXPORTING_DATA,
 )
 from edu_rdm_integration.rdm_entities.models import (
-    RegionalDataMartEntityEnum,
+    RDMEntityEnum,
 )
 
 from {{ strategy.function_class_module }} import (
@@ -51,7 +51,7 @@ class {{ camel_case_function_name }}Function({{ strategy.function_class_name }})
     def _prepare_entities(cls) -> list['ModelEnumValue']:
         """Формирование списка ключей модели-перечисления сущностей."""
         entities = [
-            RegionalDataMartEntityEnum.,
+            RDMEntityEnum.,
         ]
 
         return entities

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

@@ -47,11 +47,11 @@ from edu_rdm_integration.stages.export_data.helpers import (
     get_exporting_data_stage_attachment_path,
 )
 from edu_rdm_integration.stages.export_data.models import (
-    ExportingDataStage,
-    ExportingDataSubStage,
-    ExportingDataSubStageAttachment,
-    ExportingDataSubStageEntity,
-    ExportingDataSubStageStatus,
+    RDMExportingDataStage,
+    RDMExportingDataSubStage,
+    RDMExportingDataSubStageAttachment,
+    RDMExportingDataSubStageEntity,
+    RDMExportingDataSubStageStatus,
 )
 
 
@@ -62,14 +62,14 @@ class BaseExportDataFunction(
 ):
     """Базовый класс функций выгрузки данных для интеграции с "Региональная витрина данных"."""
 
-    def __init__(self, *args, stage: ExportingDataStage, model_ids: list[Union[int, str]], **kwargs):
+    def __init__(self, *args, stage: RDMExportingDataStage, model_ids: list[Union[int, str]], **kwargs):
         super().__init__(*args, entities=self.entities, model_ids=model_ids, **kwargs)
 
-        self._sub_stage = ExportingDataSubStage.objects.create(
+        self._sub_stage = RDMExportingDataSubStage.objects.create(
             stage=stage,
             function_id=self.uuid,
         )
-        ExportingDataSubStageEntity.objects.create(
+        RDMExportingDataSubStageEntity.objects.create(
             exporting_data_sub_stage=self._sub_stage, entity_id=self.first_entity.key
         )
         # Проставление подэтапа выгрузки
@@ -105,7 +105,7 @@ class BaseExportDataFunction(
 
     def _before_prepare(self, *args, **kwargs):
         """Выполнение действий функций системы."""
-        self._sub_stage.status_id = ExportingDataSubStageStatus.IN_PROGRESS.key
+        self._sub_stage.status_id = RDMExportingDataSubStageStatus.IN_PROGRESS.key
         self._sub_stage.save()
 
         logger.info(f'{LOGS_DELIMITER * 3}change status {repr(self._sub_stage)}')
@@ -167,7 +167,7 @@ class BaseExportDataFunction(
 
                 joined_records = '\n'.join([title_record, *[f'{DELIMITER}'.join(record) for record in records]])
 
-                sub_stage_attachment = ExportingDataSubStageAttachment(
+                sub_stage_attachment = RDMExportingDataSubStageAttachment(
                     exporting_data_sub_stage=self._sub_stage,
                     operation=operation,
                 )
@@ -213,12 +213,12 @@ class BaseExportDataFunction(
 
         if self.result.has_not_errors:
             self._sub_stage.status_id = (
-                ExportingDataSubStageStatus.FINISHED.key
+                RDMExportingDataSubStageStatus.FINISHED.key
                 if not self.has_data
-                else ExportingDataSubStageStatus.READY_FOR_EXPORT.key
+                else RDMExportingDataSubStageStatus.READY_FOR_EXPORT.key
             )
         else:
-            self._sub_stage.status_id = ExportingDataSubStageStatus.FAILED.key
+            self._sub_stage.status_id = RDMExportingDataSubStageStatus.FAILED.key
 
         self._sub_stage.save()
 

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

@@ -27,14 +27,14 @@ from edu_rdm_integration.core.storages import (
     RegionalDataMartEntityStorage,
 )
 from edu_rdm_integration.stages.collect_data.models import (
-    CollectingDataStageStatus,
+    RDMCollectingDataStageStatus,
 )
 from edu_rdm_integration.stages.export_data.functions.base.runners import (
     BaseExportDataRunner,
 )
 from edu_rdm_integration.stages.export_data.models import (
-    ExportingDataStage,
-    ExportingDataStageStatus,
+    RDMExportingDataStage,
+    RDMExportingDataStageStatus,
 )
 
 
@@ -56,7 +56,7 @@ class BaseExportDataRunnerManager(WebEduRunnerManager, metaclass=ABCMeta):
 
         self._period_started_at, self._period_ended_at = self._prepare_period(*args, **kwargs)
 
-        self._stage = ExportingDataStage.objects.create(
+        self._stage = RDMExportingDataStage.objects.create(
             manager_id=self.uuid,
             period_started_at=self._period_started_at,
             period_ended_at=self._period_ended_at,
@@ -74,11 +74,11 @@ class BaseExportDataRunnerManager(WebEduRunnerManager, metaclass=ABCMeta):
         entity_storage = RegionalDataMartEntityStorage()
         entity_storage.prepare()
 
-        exporting_data_stage = ExportingDataStage.objects.filter(
+        exporting_data_stage = RDMExportingDataStage.objects.filter(
             manager_id=self.uuid,
             status_id__in=(
-                CollectingDataStageStatus.FAILED.key,
-                CollectingDataStageStatus.FINISHED.key,
+                RDMCollectingDataStageStatus.FAILED.key,
+                RDMCollectingDataStageStatus.FINISHED.key,
             ),
         ).latest('period_ended_at')
 
@@ -123,7 +123,7 @@ class BaseExportDataRunnerManager(WebEduRunnerManager, metaclass=ABCMeta):
         """
         model_ids_map = self._prepare_model_ids_map()
 
-        self._stage.status_id = ExportingDataStageStatus.IN_PROGRESS.key
+        self._stage.status_id = RDMExportingDataStageStatus.IN_PROGRESS.key
         self._stage.save()
 
         super()._create_runner(
@@ -146,9 +146,9 @@ class BaseExportDataRunnerManager(WebEduRunnerManager, metaclass=ABCMeta):
     def _after_start_runner(self, *args, **kwargs):
         """Точка расширения поведения менеджера ранера после запуска ранера."""
         if self._runner.result.has_not_errors:
-            self._stage.status_id = ExportingDataStageStatus.FINISHED.key
+            self._stage.status_id = RDMExportingDataStageStatus.FINISHED.key
         else:
-            self._stage.status_id = ExportingDataStageStatus.FAILED.key
+            self._stage.status_id = RDMExportingDataStageStatus.FAILED.key
 
         self._stage.save()
 

edu_rdm_integration/stages/export_data/generators.py

@@ -21,7 +21,7 @@ from edu_rdm_integration.core.consts import (
     DATE_FORMAT,
 )
 from edu_rdm_integration.rdm_entities.models import (
-    RegionalDataMartEntityEnum,
+    RDMEntityEnum,
 )
 
 
@@ -38,10 +38,8 @@ class BaseFirstExportEntitiesDataCommandsGenerator:
     ):
         """Инициализация."""
         # Если сущности не указаны, берется значение по умолчанию - все сущности:
-        entities = entities if entities else RegionalDataMartEntityEnum.get_enum_data().keys()
-        self.entities: list[ModelEnumValue] = [
-            RegionalDataMartEntityEnum.get_model_enum_value(entity) for entity in entities
-        ]
+        entities = entities if entities else RDMEntityEnum.get_enum_data().keys()
+        self.entities: list[ModelEnumValue] = [RDMEntityEnum.get_model_enum_value(entity) for entity in entities]
 
         self.period_started_at = period_started_at
         self.period_ended_at = period_ended_at

edu_rdm_integration/stages/export_data/helpers.py

@@ -48,7 +48,7 @@ if TYPE_CHECKING:
     )
 
     from edu_rdm_integration.rdm_models.models import (
-        BaseEntityModel,
+        BaseRDMModel,
     )
     from edu_rdm_integration.stages.export_data.functions.base.managers import (
         BaseExportDataRunnerManager,
@@ -64,10 +64,10 @@ def set_failed_status_suspended_exporting_data_stages() -> dict[str, int]:
     в настройках приложения.
     """
     from edu_rdm_integration.stages.export_data.models import (
-        ExportingDataStage,
-        ExportingDataStageStatus,
-        ExportingDataSubStage,
-        ExportingDataSubStageStatus,
+        RDMExportingDataStage,
+        RDMExportingDataStageStatus,
+        RDMExportingDataSubStage,
+        RDMExportingDataSubStageStatus,
     )
 
     changed_status_result = {
@@ -79,10 +79,10 @@ def set_failed_status_suspended_exporting_data_stages() -> dict[str, int]:
     suspended_time_at = current_datetime - timedelta(minutes=settings.RDM_CHECK_SUSPEND_TASK_STAGE_TIMEOUT)
 
     suspended_stage_ids = set(
-        ExportingDataStage.objects.annotate(
+        RDMExportingDataStage.objects.annotate(
             last_sub_stage_started_at=Coalesce(
                 Subquery(
-                    ExportingDataSubStage.objects.filter(stage_id=OuterRef('pk'))
+                    RDMExportingDataSubStage.objects.filter(stage_id=OuterRef('pk'))
                     .values('started_at')
                     .order_by('-started_at')[:1]
                 ),
@@ -92,8 +92,8 @@ def set_failed_status_suspended_exporting_data_stages() -> dict[str, int]:
         .filter(
             last_sub_stage_started_at__lt=suspended_time_at,
             status__in=(
-                ExportingDataStageStatus.CREATED.key,
-                ExportingDataStageStatus.IN_PROGRESS.key,
+                RDMExportingDataStageStatus.CREATED.key,
+                RDMExportingDataStageStatus.IN_PROGRESS.key,
             ),
         )
         .values_list('pk', flat=True)
@@ -102,17 +102,17 @@ def set_failed_status_suspended_exporting_data_stages() -> dict[str, int]:
     if suspended_stage_ids:
         logger.info(f'find suspended ExportingDataStage: {", ".join(map(str, suspended_stage_ids))}..')
 
-        change_stage_count = ExportingDataStage.objects.filter(
+        change_stage_count = RDMExportingDataStage.objects.filter(
             pk__in=suspended_stage_ids,
         ).update(
-            status=ExportingDataStageStatus.FAILED.key,
+            status=RDMExportingDataStageStatus.FAILED.key,
             ended_at=current_datetime,
         )
 
-        change_sub_stage_count = ExportingDataSubStage.objects.filter(
+        change_sub_stage_count = RDMExportingDataSubStage.objects.filter(
             stage_id__in=suspended_stage_ids,
         ).update(
-            status=ExportingDataSubStageStatus.FAILED.key,
+            status=RDMExportingDataSubStageStatus.FAILED.key,
             ended_at=current_datetime,
         )
 
@@ -131,17 +131,17 @@ def get_exporting_managers_max_period_ended_dates(
 ) -> dict[str, 'datetime']:
     """Возвращает дату и время последнего успешного этапа экспорта для менеджеров Функций экспорта."""
     from edu_rdm_integration.stages.export_data.models import (
-        ExportingDataStage,
-        ExportingDataStageStatus,
+        RDMExportingDataStage,
+        RDMExportingDataStageStatus,
     )
 
     managers_last_period_ended = (
-        ExportingDataStage.objects.filter(
+        RDMExportingDataStage.objects.filter(
             manager_id__in=[manager.uuid for manager in exporting_managers],
             id=Subquery(
-                ExportingDataStage.objects.filter(
+                RDMExportingDataStage.objects.filter(
                     manager_id=OuterRef('manager_id'),
-                    status_id=ExportingDataStageStatus.FINISHED.key,
+                    status_id=RDMExportingDataStageStatus.FINISHED.key,
                 )
                 .order_by('-id')
                 .values('id')[:1]
@@ -184,7 +184,7 @@ def get_exporting_data_stage_attachment_path(instance, filename):
 
 
 def set_entity_field_by_model_object(
-    entity: 'BaseEntityModel', model_object: Union['Model', 'NamedTuple'], mapping: dict[str, str]
+    entity: 'BaseRDMModel', model_object: Union['Model', 'NamedTuple'], mapping: dict[str, str]
 ) -> None:
     """Обновление значений полей сущности по измененным полям модели.
 

edu_rdm_integration/stages/export_data/management/base.py

@@ -16,7 +16,7 @@ from edu_rdm_integration.core.consts import (
     DATETIME_FORMAT,
 )
 from edu_rdm_integration.rdm_entities.models import (
-    RegionalDataMartEntityEnum,
+    RDMEntityEnum,
 )
 from edu_rdm_integration.stages.export_data.operations import (
     BaseExportEntitiesData,
@@ -34,9 +34,7 @@ class BaseExportEntityDataCommand(BaseCommand):
 
     def add_arguments(self, parser: 'CommandParser'):
         """Добавление параметров."""
-        entities = ', '.join(
-            [f'{key} - {value.title}' for key, value in RegionalDataMartEntityEnum.get_enum_data().items()]
-        )
+        entities = ', '.join([f'{key} - {value.title}' for key, value in RDMEntityEnum.get_enum_data().items()])
         entities_help_text = (
             f'Значением параметра является перечисление сущностей РВД, для которых должена быть произведена выгрузка '
             f'данных. Перечисление сущностей:\n{entities}. Если сущности не указываются, то выгрузка данных '

edu_rdm_integration/stages/export_data/migrations/0001_initial.py

@@ -22,6 +22,7 @@ class Migration(migrations.Migration):
         ('edu_rdm_integration_entities', '0001_initial'),
         ('function_tools', '0005_auto_20220724_0050'),
         ('async_task', '0003_alter_runningtask_options'),
+        ('rdm_collect_and_export_data', '0003_auto_20250704_0725'),
     ]
 
     operations = [

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

@@ -0,0 +1,47 @@
+# Generated by Django 3.2.24 on 2025-07-04 08:10
+
+from django.db import (
+    migrations,
+)
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('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'),
+    ]
+
+    operations = [
+        migrations.RenameModel(
+            old_name='EduRdmExportDataCommandProgress',
+            new_name='RDMExportingDataCommandProgress',
+        ),
+        migrations.RenameModel(
+            old_name='ExportingDataStage',
+            new_name='RDMExportingDataStage',
+        ),
+        migrations.RenameModel(
+            old_name='ExportingDataStageStatus',
+            new_name='RDMExportingDataStageStatus',
+        ),
+        migrations.RenameModel(
+            old_name='ExportingDataSubStage',
+            new_name='RDMExportingDataSubStage',
+        ),
+        migrations.RenameModel(
+            old_name='ExportingDataSubStageAttachment',
+            new_name='RDMExportingDataSubStageAttachment',
+        ),
+        migrations.RenameModel(
+            old_name='ExportingDataSubStageEntity',
+            new_name='RDMExportingDataSubStageEntity',
+        ),
+        migrations.RenameModel(
+            old_name='ExportingDataSubStageStatus',
+            new_name='RDMExportingDataSubStageStatus',
+        ),
+    ]

edu_rdm_integration/stages/export_data/mixins.py

@@ -9,7 +9,7 @@ from edu_rdm_integration.core.helpers import (
     save_command_log_link,
 )
 from edu_rdm_integration.stages.export_data.models import (
-    EduRdmExportDataCommandProgress,
+    RDMExportingDataCommandProgress,
 )
 from edu_rdm_integration.stages.export_data.operations import (
     ExportEntitiesData,
@@ -24,13 +24,13 @@ class ExportCommandMixin:
     description = 'Экспорт данных сущностей РВД'
     task_type = AsyncTaskType.SYSTEM
 
-    def get_export_command(self, command_id: int) -> EduRdmExportDataCommandProgress:
+    def get_export_command(self, command_id: int) -> RDMExportingDataCommandProgress:
         """Возвращает экземпляр модели команды запуска."""
-        command = EduRdmExportDataCommandProgress.objects.get(id=command_id)
+        command = RDMExportingDataCommandProgress.objects.get(id=command_id)
 
         return command
 
-    def run_export_command(self, command: EduRdmExportDataCommandProgress) -> None:
+    def run_export_command(self, command: RDMExportingDataCommandProgress) -> None:
         """Запуск команды выгрузки."""
         ExportEntitiesData(
             entities=(command.entity_id,),
@@ -43,7 +43,7 @@ class ExportCommandMixin:
         """Сохранение ссылки на файл логов в команде."""
         try:
             command = self.get_export_command(command_id)
-        except EduRdmExportDataCommandProgress.DoesNotExist:
+        except RDMExportingDataCommandProgress.DoesNotExist:
             command = None
 
         if command:

edu_rdm_integration/stages/export_data/models.py

@@ -43,14 +43,14 @@ from edu_rdm_integration.core.utils import (
     get_data_command_progress_attachment_path,
 )
 from edu_rdm_integration.rdm_entities.models import (
-    RegionalDataMartEntityEnum,
+    RDMEntityEnum,
 )
 from edu_rdm_integration.stages.export_data.helpers import (
     get_exporting_data_stage_attachment_path,
 )
 
 
-class ExportingDataStageStatus(TitledModelEnum):
+class RDMExportingDataStageStatus(TitledModelEnum):
     """Статус этапа выгрузки данных."""
 
     CREATED = ModelEnumValue(
@@ -75,7 +75,7 @@ class ExportingDataStageStatus(TitledModelEnum):
         verbose_name_plural = 'Модели-перечисления статусов этапов выгрузки данных'
 
 
-class ExportingDataStage(ReprStrPreModelMixin, BaseObjectModel):
+class RDMExportingDataStage(ReprStrPreModelMixin, BaseObjectModel):
     """Этап выгрузки данных."""
 
     manager = ForeignKey(
@@ -108,10 +108,10 @@ class ExportingDataStage(ReprStrPreModelMixin, BaseObjectModel):
     )
 
     status = ForeignKey(
-        to=ExportingDataStageStatus,
+        to=RDMExportingDataStageStatus,
         verbose_name='Статус',
         on_delete=PROTECT,
-        default=ExportingDataStageStatus.CREATED.key,
+        default=RDMExportingDataStageStatus.CREATED.key,
     )
 
     class Meta:
@@ -127,7 +127,7 @@ class ExportingDataStage(ReprStrPreModelMixin, BaseObjectModel):
     def save(self, *args, **kwargs):
         """Сохранение этапа экспорта данных."""
         if (
-            self.status_id in (ExportingDataStageStatus.FAILED.key, ExportingDataStageStatus.FINISHED.key)
+            self.status_id in (RDMExportingDataStageStatus.FAILED.key, RDMExportingDataStageStatus.FINISHED.key)
             and not self.ended_at
         ):
             self.ended_at = datetime.now()
@@ -135,7 +135,7 @@ class ExportingDataStage(ReprStrPreModelMixin, BaseObjectModel):
         super().save(*args, **kwargs)
 
 
-class ExportingDataSubStageStatus(TitledModelEnum):
+class RDMExportingDataSubStageStatus(TitledModelEnum):
     """Модель-перечисление статусов этапа выгрузки данных."""
 
     CREATED = ModelEnumValue(
@@ -164,7 +164,7 @@ class ExportingDataSubStageStatus(TitledModelEnum):
         verbose_name_plural = 'Модели-перечисления статусов подэтапов выгрузки данных'
 
 
-class ExportingDataSubStage(ReprStrPreModelMixin, BaseObjectModel):
+class RDMExportingDataSubStage(ReprStrPreModelMixin, BaseObjectModel):
     """Подэтап выгрузки данных."""
 
     function = ForeignKey(
@@ -176,7 +176,7 @@ class ExportingDataSubStage(ReprStrPreModelMixin, BaseObjectModel):
     )
 
     stage = ForeignKey(
-        to=ExportingDataStage,
+        to=RDMExportingDataStage,
         verbose_name='Этап выгрузки данных',
         on_delete=CASCADE,
     )
@@ -195,10 +195,10 @@ class ExportingDataSubStage(ReprStrPreModelMixin, BaseObjectModel):
     )
 
     status = ForeignKey(
-        to=ExportingDataSubStageStatus,
+        to=RDMExportingDataSubStageStatus,
         verbose_name='Статус',
         on_delete=PROTECT,
-        default=ExportingDataSubStageStatus.CREATED.key,
+        default=RDMExportingDataSubStageStatus.CREATED.key,
     )
 
     class Meta:
@@ -216,9 +216,9 @@ class ExportingDataSubStage(ReprStrPreModelMixin, BaseObjectModel):
         if (
             self.status_id
             in {
-                ExportingDataSubStageStatus.FAILED.key,
-                ExportingDataSubStageStatus.FINISHED.key,
-                ExportingDataSubStageStatus.READY_FOR_EXPORT.key,
+                RDMExportingDataSubStageStatus.FAILED.key,
+                RDMExportingDataSubStageStatus.FINISHED.key,
+                RDMExportingDataSubStageStatus.READY_FOR_EXPORT.key,
             }
             and not self.ended_at
         ):
@@ -227,11 +227,11 @@ class ExportingDataSubStage(ReprStrPreModelMixin, BaseObjectModel):
         super().save(*args, **kwargs)
 
 
-class ExportingDataSubStageAttachment(ReprStrPreModelMixin, BaseObjectModel):
+class RDMExportingDataSubStageAttachment(ReprStrPreModelMixin, BaseObjectModel):
     """Сгенерированный файл для дальнейшей выгрузки в "Региональная витрина данных"."""
 
     exporting_data_sub_stage = ForeignKey(
-        to=ExportingDataSubStage,
+        to=RDMExportingDataSubStage,
         verbose_name='Подэтап выгрузки данных',
         on_delete=CASCADE,
     )
@@ -276,17 +276,17 @@ class ExportingDataSubStageAttachment(ReprStrPreModelMixin, BaseObjectModel):
         return ['exporting_data_sub_stage_id', 'attachment', 'operation', 'created', 'modified']
 
 
-class ExportingDataSubStageEntity(BaseObjectModel):
+class RDMExportingDataSubStageEntity(BaseObjectModel):
     """Модель связи сущности и подэтапа выгрузки."""
 
     entity = ForeignKey(
-        to=RegionalDataMartEntityEnum,
+        to=RDMEntityEnum,
         verbose_name='Сущность РВД',
         on_delete=PROTECT,
     )
 
     exporting_data_sub_stage = ForeignKey(
-        to=ExportingDataSubStage,
+        to=RDMExportingDataSubStage,
         verbose_name='Подэтап выгрузки данных',
         on_delete=CASCADE,
     )
@@ -297,22 +297,34 @@ class ExportingDataSubStageEntity(BaseObjectModel):
         verbose_name_plural = 'Связи сущности и подэтапа выгрузки'
 
 
-class AbstractExportDataCommandProgress(ReprStrPreModelMixin, BaseObjectModel):
+class RDMExportingDataCommandProgress(ReprStrPreModelMixin, BaseObjectModel):
     """Команда экспорта данных."""
 
-    task = ...
-
-    logs_link = ...
-
+    task = ForeignKey(
+        to='async_task.RunningTask',
+        verbose_name='Асинхронная задача',
+        null=True,
+        blank=True,
+        on_delete=SET_NULL,
+    )
+    logs_link = FileField(
+        upload_to=get_data_command_progress_attachment_path,
+        max_length=255,
+        verbose_name='Файл лога',
+    )
+    type = PositiveSmallIntegerField(  # noqa: A003
+        verbose_name='Тип команды',
+        choices=CommandType.get_choices(),
+    )
     stage = ForeignKey(
-        to='edu_rdm_integration_export_data_stage.ExportingDataStage',
+        to=RDMExportingDataStage,
         verbose_name='Этап выгрузки данных',
         null=True,
         blank=True,
         on_delete=SET_NULL,
     )
     entity = ForeignKey(
-        to=RegionalDataMartEntityEnum,
+        to=RDMEntityEnum,
         verbose_name='Сущность РВД',
         on_delete=PROTECT,
     )
@@ -332,31 +344,6 @@ class AbstractExportDataCommandProgress(ReprStrPreModelMixin, BaseObjectModel):
     )
 
     class Meta:
-        abstract = True
-        db_table = 'rdm_exporting_data_command_progress'
+        db_table = 'edu_rdm_exporting_data_command_progress'
         verbose_name = 'Команда экспорта данных'
         verbose_name_plural = 'Команды экспорта данных'
-
-
-class EduRdmExportDataCommandProgress(AbstractExportDataCommandProgress):
-    """Команда экспорта данных."""
-
-    task = ForeignKey(
-        to='async_task.RunningTask',
-        verbose_name='Асинхронная задача',
-        null=True,
-        blank=True,
-        on_delete=SET_NULL,
-    )
-    logs_link = FileField(
-        upload_to=get_data_command_progress_attachment_path,
-        max_length=255,
-        verbose_name='Файл лога',
-    )
-    type = PositiveSmallIntegerField(  # noqa: A003
-        verbose_name='Тип команды',
-        choices=CommandType.get_choices(),
-    )
-
-    class Meta(AbstractExportDataCommandProgress.Meta):
-        db_table = 'edu_rdm_exporting_data_command_progress'