edu-rdm-integration 0.6.9__py3-none-any.whl → 0.7.0__py3-none-any.whl

edu_rdm_integration/collect_data/base/managers.py

@@ -1,13 +1,23 @@
+import logging
+import os
 from abc import (
     ABCMeta,
 )
 from datetime import (
     datetime,
 )
+from django.apps import (
+    apps,
+)
 from typing import (
     TYPE_CHECKING,
     List,
     Type,
+    Set,
+)
+
+from django.conf import (
+    settings,
 )
 
 from educommon import (
@@ -61,21 +71,46 @@ class BaseCollectingDataRunnerManager(WebEduRunnerManager, metaclass=ABCMeta):
         self._logs = logs
 
         self._logs_period_started_at = logs_period_started_at
-
-        logger.info(f'{LOGS_DELIMITER}logs period started at {self._logs_period_started_at.strftime(DATETIME_FORMAT)}')
-
         self._logs_period_ended_at = logs_period_ended_at
-
-        logger.info(f'{LOGS_DELIMITER}log period ended at {self._logs_period_ended_at.strftime(DATETIME_FORMAT)}')
-
         self._stage = CollectingExportedDataStage.objects.create(
             manager_id=self.uuid,
             logs_period_started_at=logs_period_started_at,
             logs_period_ended_at=logs_period_ended_at,
         )
 
+        self._command_id = kwargs.get('command_id')
+        self._file_handler = None
+
+        self._add_file_handler()
+
+        logger.info(f'{LOGS_DELIMITER}logs period started at {self._logs_period_started_at.strftime(DATETIME_FORMAT)}')
+        logger.info(f'{LOGS_DELIMITER}log period ended at {self._logs_period_ended_at.strftime(DATETIME_FORMAT)}')
         logger.info(f'{LOGS_DELIMITER}created {repr(self._stage)}')
 
+    def _add_file_handler(self) -> None:
+        """
+        Добавляет обработчик логов.
+        """
+        if self._command_id:
+            self._file_handler = logging.FileHandler(
+                os.path.join(
+                    settings.MEDIA_ROOT,
+                    settings.RDM_COLLECT_LOG_DIR,
+                    f'{self._stage.id}.log',
+                ),
+            )
+            logging.getLogger('info_logger').addHandler(self._file_handler)
+            logging.getLogger('exception_logger').addHandler(self._file_handler)
+
+    def _remove_file_handler(self) -> None:
+        """
+        Удаляет обработчик логов.
+        """
+        if self._command_id:
+            logging.getLogger('info_logger').removeHandler(self._file_handler)
+            logging.getLogger('exception_logger').removeHandler(self._file_handler)
+            self._file_handler.close()
+
     def _collect_runner_regional_data_mart_integration_entities(
         self,
         runner_class: Type[BaseRunner],
@@ -98,11 +133,11 @@ class BaseCollectingDataRunnerManager(WebEduRunnerManager, metaclass=ABCMeta):
 
                 runner_regional_data_mart_integration_entities.extend(entities)
 
-    def _get_loggable_models(self) -> List['Model']:
+    def _get_loggable_models(self) -> Set['Model']:
         """
         Возвращает перечень моделей по которым собираются логи.
         """
-        loggable_models = []
+        loggable_models = set()
         regional_data_mart_integration_entities = []
 
         self._collect_runner_regional_data_mart_integration_entities(
@@ -110,7 +145,19 @@ class BaseCollectingDataRunnerManager(WebEduRunnerManager, metaclass=ABCMeta):
             regional_data_mart_integration_entities,
         )
         for entity in regional_data_mart_integration_entities:
-            loggable_models.extend(entity.loggable_models)
+            loggable_models.update(entity.loggable_models)
+            # TODO: EDUSCHL-20938 Произвести рефакторинг plugins_info.
+            if hasattr(entity, 'plugins_info'):
+                for app_name, app_content in entity.plugins_info.items():
+                    if not apps.is_installed(app_name):
+                        continue
+
+                    app_label, model_name = app_content.split('.')
+                    try:
+                        model = apps.get_model(app_label=app_label, model_name=model_name)
+                        loggable_models.add(model)
+                    except (ValueError, LookupError):
+                        continue
 
         return loggable_models
 
@@ -177,3 +224,15 @@ class BaseCollectingDataRunnerManager(WebEduRunnerManager, metaclass=ABCMeta):
         self._stage.save()
 
         logger.info(f'{LOGS_DELIMITER}change status {repr(self._stage)}')
+
+    def run(self, *args, **kwargs):
+        """
+        Запускает менеджер ранера.
+        """
+        try:
+            super().run(*args, **kwargs)
+        except Exception as err:
+            logger.exception(err)
+            raise
+        finally:
+            self._remove_file_handler()

edu_rdm_integration/collect_data/collect.py

@@ -138,7 +138,7 @@ class BaseCollectModelsData:
 
         for model_key, manager_class in self._collecting_data_managers.items():
             model_logs = logs.get(model_key) if logs else None
-            manager = manager_class(*args, logs=model_logs, **kwargs)
+            manager = manager_class(*args, logs=model_logs, command_id=self.command_id, **kwargs)
 
             if self.command_id:
                 # Подается сигнал, что менеджер создан:

edu_rdm_integration/collect_data/tests.py

@@ -127,7 +127,7 @@ class BaseCollectingFunctionTestCase(TestCase):
             operation=operation,
         )
 
-    def create_sub_stage(self, *class_names: Tuple[str, str]) -> CollectingExportedDataSubStage:
+    def create_sub_stage(self, *class_names: str) -> CollectingExportedDataSubStage:
         """Создает подэтап сбора данных."""
         function_tools_entities = dict(
             Entity.objects.filter(

edu_rdm_integration/export_data/base/functions.py

@@ -156,6 +156,7 @@ class BaseExportDataFunction(
         primary_key_fields = self.first_entity.entity.get_primary_key_fields()
         foreign_key_fields = self.first_entity.entity.get_foreign_key_fields()
         hashable_fields = self.first_entity.entity.get_hashable_fields()
+        ignore_prefix_fields = self.first_entity.entity.get_ignore_prefix_key_fields()
 
         field_values = self.helper.prepare_record(
             entity_instance=entity_instance,
@@ -163,6 +164,7 @@ class BaseExportDataFunction(
             primary_key_fields=primary_key_fields,
             foreign_key_fields=foreign_key_fields,
             hashable_fields=hashable_fields,
+            ignore_prefix_fields=ignore_prefix_fields,
         )
 
         return field_values

edu_rdm_integration/export_data/base/helpers.py

@@ -62,13 +62,15 @@ class BaseExportDataFunctionHelper(WebEduFunctionHelper):
         ordered_fields,
         primary_key_fields,
         foreign_key_fields,
-        hashable_fields
+        hashable_fields,
+        ignore_prefix_fields,
     ) -> List[str]:
         """
         Формирование списка строковых значений полей.
         """
         field_values = []
         key_fields = set(chain(primary_key_fields, foreign_key_fields))
+        add_prefix_fields = key_fields - set(ignore_prefix_fields)
 
         for field in ordered_fields:
             field_value = getattr(entity_instance, field)
@@ -84,7 +86,7 @@ class BaseExportDataFunctionHelper(WebEduFunctionHelper):
             else:
                 field_value = str(field_value if field_value is not None else '')
 
-            if field_value and field in key_fields:
+            if field_value and field in add_prefix_fields:
                 field_value = f'{settings.RDM_EXPORT_ENTITY_ID_PREFIX}-{field_value}'
 
             if field_value and field in hashable_fields:

edu_rdm_integration/function_templates/function_collect_data_template/functions.py-tpl

@@ -1,4 +1,6 @@
 from typing import (
+    TYPE_CHECKING,
+    Any,
     Dict,
     List,
     Optional,
@@ -12,6 +14,13 @@ from educommon.integration_entities.helpers import (
     EntitySaver,
 )
 
+from edu_rdm_integration.consts import (
+    REGIONAL_DATA_MART_INTEGRATION_COLLECTING_DATA,
+)
+from edu_rdm_integration.models import (
+    RegionalDataMartModelEnum,
+)
+
 from {{ strategy.function_class_module }} import (
     {{ strategy.function_class_name }},
 )
@@ -27,6 +36,12 @@ from {{ function_python_path }}.validators import (
 )
 
 
+if TYPE_CHECKING:
+    from m3_db_utils.models import (
+        ModelEnumValue,
+    )
+
+
 class {{ camel_case_function_name }}Function({{ strategy.function_class_name }}):
     """Функция "{{ function_verbose_name }}"."""
 
@@ -37,20 +52,15 @@ class {{ camel_case_function_name }}Function({{ strategy.function_class_name }})
     ):
         super().__init__(*args, **kwargs)
 
-        # Ключ результата работы функции, используется в презентере
-        # self.result.key =
-        # Сообщение об успешном выполнении функции
-        # self.result.message =
-
         self._to_save_entities = {
             EntityLogOperation.CREATE: {},
             EntityLogOperation.UPDATE: {},
         }
 
         self._preparing_functions_map = {
-            EntityLogOperation.CREATE: self._prepare_entity_for_create,
-            EntityLogOperation.UPDATE: self._prepare_entity_for_update,
-            EntityLogOperation.DELETE: self._prepare_entity_for_delete,
+            EntityLogOperation.CREATE: self._prepare_model_instances_for_create,
+            EntityLogOperation.UPDATE: self._prepare_model_instances_for_update,
+            EntityLogOperation.DELETE: self._prepare_model_instances_for_delete,
         }
 
     @classmethod
@@ -59,7 +69,7 @@ class {{ camel_case_function_name }}Function({{ strategy.function_class_name }})
 
         Если ничего не возвращает, то регистрация в БД не будет произведена.
         """
-        return
+        return '{{ strategy.function_uuid }}'
 
     @classmethod
     def _prepare_verbose_name(cls) -> str:
@@ -69,9 +79,21 @@ class {{ camel_case_function_name }}Function({{ strategy.function_class_name }})
     @classmethod
     def _prepare_tags(cls) -> List[str]:
         """Список тегов, по которым сущность можно будет осуществлять поиск."""
-        tags = []
+        tags = [
+            REGIONAL_DATA_MART_INTEGRATION_COLLECTING_DATA,
+        ]
+
         return tags
 
+    @classmethod
+    def _prepare_entities(cls) -> List['ModelEnumValue']:
+        """Формирование списка ключей модели-перечисления моделей РВД."""
+        rdm_models = [
+            RegionalDataMartModelEnum.,
+        ]
+
+        return rdm_models
+
     def _prepare_helper_class(self) -> Type[{{ camel_case_function_name }}FunctionHelper]:
         """Возвращает класс помощника функции."""
         return {{ camel_case_function_name }}FunctionHelper
@@ -84,23 +106,24 @@ class {{ camel_case_function_name }}Function({{ strategy.function_class_name }})
         """Возвращает класс результата функции."""
         return {{ camel_case_function_name }}FunctionResult
 
-    def _prepare_entity_for_create(self, class_id: int, **kwargs) -> None:
-        """Подготовка объектов модели для создания."""
+    def _prepare_model_instances_for_create(self, class_id: int, **kwargs) -> None:
+        """Подготовка объектов модели РВД для создания."""
         raise NotImplementedError
 
-    def _prepare_entity_for_update(self, class_id: int, log_changes: Dict[str, any], **kwargs) -> None:
-        """Подготовка объектов модели для обновления."""
+    def _prepare_model_instances_for_update(self, class_id: int, log_changes: Dict[str, Any], **kwargs) -> None:
+        """Подготовка объектов модели РВД для обновления."""
         raise NotImplementedError
 
-    def _prepare_entity_for_delete(self, class_id: int, **kwargs) -> None:
-        """Подготовка объектов модели для удаления."""
+    def _prepare_model_instances_for_delete(self, class_id: int, **kwargs) -> None:
+        """Подготовка объектов модели РВД для удаления."""
         raise NotImplementedError
 
-    def _prepare_entity_instances(self):
-        """Подготовка объектов сущности для сохранения.
+    def _prepare_model_instances(self):
+        """Подготовка объектов модели РВД для сохранения.
 
         Производится обработка логов и на их основе выбирается подходящий метод для дальнейшей обработки.
         """
+        # !!! Удалить после реализации !!!
         # for some_id, log_changes in <some logs>:
         #     for log_change in log_changes:
         #         func = self._preparing_functions_map[log_change.operation]
@@ -109,12 +132,12 @@ class {{ camel_case_function_name }}Function({{ strategy.function_class_name }})
 
     def _prepare(self, *args, **kwargs):
         """Выполнение действий функций системы."""
-        save_entities = EntitySaver(
+        save_model_instances = EntitySaver(
             to_save_entities=self._to_save_entities,
             model=self.first_entity.model,
         )
 
-        self._prepare_entity_instances()
+        self._prepare_model_instances()
 
         if self.result.has_not_errors:
-            self.do_on_save(save_entities)
+            self.do_on_save(save_model_instances)

edu_rdm_integration/function_templates/function_collect_data_template/helpers.py-tpl

@@ -27,7 +27,5 @@ class {{ camel_case_function_name }}FunctionHelper({{ strategy.function_helper_c
     """Помощник функции "{{ function_verbose_name }}"."""
 
     def _prepare_cache_class(self) -> Type[{{ camel_case_function_name }}FunctionCacheStorage]:
-        """
-        Возвращает класс кеша помощника функции.
-        """
+        """Возвращает класс кеша помощника функции."""
         return {{ camel_case_function_name }}FunctionCacheStorage

edu_rdm_integration/function_templates/function_collect_data_template/managers.py-tpl

@@ -4,6 +4,10 @@ from typing import (
     Type,
 )
 
+from edu_rdm_integration.consts import (
+    REGIONAL_DATA_MART_INTEGRATION_COLLECTING_DATA,
+)
+
 from {{ strategy.manager_class_module }} import (
     {{ strategy.manager_class_name }},
 )
@@ -22,7 +26,7 @@ class {{ camel_case_function_name }}RunnerManager({{ strategy.manager_class_name
 
         Если ничего не возвращает, то регистрация в БД не будет произведена.
         """
-        return
+        return '{{ strategy.manager_uuid }}'
 
     @classmethod
     def _prepare_verbose_name(cls) -> str:
@@ -32,7 +36,10 @@ class {{ camel_case_function_name }}RunnerManager({{ strategy.manager_class_name
     @classmethod
     def _prepare_tags(cls) -> List[str]:
         """Список тегов, по которым сущность можно будет осуществлять поиск."""
-        tags = []
+        tags = [
+            REGIONAL_DATA_MART_INTEGRATION_COLLECTING_DATA,
+        ]
+        
         return tags
 
     @classmethod

edu_rdm_integration/function_templates/function_collect_data_template/runners.py-tpl

@@ -8,6 +8,10 @@ from function_tools.general import (
     RunnableObject,
 )
 
+from edu_rdm_integration.consts import (
+    REGIONAL_DATA_MART_INTEGRATION_COLLECTING_DATA,
+)
+
 from {{ strategy.runner_class_module }} import (
     {{ strategy.runner_class_name }},
 )
@@ -35,7 +39,7 @@ class {{ camel_case_function_name }}Runner({{ strategy.runner_class_name }}):
 
         Если ничего не возвращает, то регистрация в БД не будет произведена.
         """
-        return
+        return '{{ strategy.runner_uuid }}'
 
     @classmethod
     def _prepare_verbose_name(cls) -> str:
@@ -45,7 +49,11 @@ class {{ camel_case_function_name }}Runner({{ strategy.runner_class_name }}):
     @classmethod
     def _prepare_tags(cls) -> List[str]:
         """Список тегов, по которым сущность можно будет осуществлять поиск."""
-        return []
+        tags = [
+            REGIONAL_DATA_MART_INTEGRATION_COLLECTING_DATA,
+        ]
+        
+        return tags
 
     @classmethod
     def _prepare_runnable_classes(cls) -> Optional[List[Type[RunnableObject]]]:

edu_rdm_integration/function_templates/function_collect_data_template/tests.py-tpl

@@ -1 +1,31 @@
-# Реализуйте свои unit-тесты здесь
+from typing import (
+    TYPE_CHECKING,
+    Type,
+)
+
+from edu_rdm_integration.collect_data.tests import (
+    BaseCollectingFunctionTestCase,
+)
+
+from {{ function_python_path }}.managers import (
+    {{ camel_case_function_name }}RunnerManager,
+)
+
+
+if TYPE_CHECKING:
+    from function_tools.managers import (
+        RunnerManager,
+    )
+
+
+class Base{{ camel_case_function_name }}TestCase(BaseCollectingFunctionTestCase):
+    """Базовый класс тестирования Функции "{{ function_verbose_name }}"."""
+
+    @property
+    def manager(self) -> Type['RunnerManager']:
+        """Менеджер раннера Функции сбора."""
+        return {{ camel_case_function_name }}RunnerManager
+
+    def setUp(self) -> None:
+        """Подготавливает фикстуры."""
+        super().setUp()

edu_rdm_integration/function_templates/function_collect_data_template/validators.py-tpl

@@ -9,14 +9,6 @@ from {{ strategy.runner_validator_class_module }} import (
 class {{ camel_case_function_name }}RunnerValidator({{ strategy.runner_validator_class_name }}):
     """Валидатор ранера функции "{{ function_verbose_name }}"."""
 
-    def validate(self, runnable):
-        """Выполнение валидации."""
-        super().validate(runnable=runnable)
-
 
 class {{ camel_case_function_name }}FunctionValidator({{ strategy.function_validator_class_name }}):
     """Валидатор функции "{{ function_verbose_name }}"."""
-
-    def validate(self, runnable):
-        """Выполнение валидации."""
-        super().validate(runnable=runnable)

edu_rdm_integration/function_templates/function_export_data_template/caches.py-tpl

@@ -1,3 +1,8 @@
+from typing import (
+    TYPE_CHECKING,
+    List,
+)
+
 from {{ strategy.function_cache_storage_class_module }} import (
     {{ strategy.function_cache_storage_class_name }},
 )
@@ -6,24 +11,21 @@ from {{ strategy.runner_cache_storage_class_module }} import (
 )
 
 
-class {{ camel_case_function_name }}RunnerCacheStorage({{ strategy.runner_cache_storage_class_name }}):
-    """Кеш помощника ранера функции "{{ function_verbose_name }}"."""
+if TYPE_CHECKING:
+    from educommon.integration_entities.entities import (
+        BaseEntity,
+    )
 
-    def __init__(self, *args, **kwargs):
-        """Инициализация хранилища кешей ранера."""
 
-        super().__init__(*args, **kwargs)
-
-    def _prepare(self, *args, **kwargs):
-        """Наполнение кешей данными."""
-        super()._prepare(*args, **kwargs)
+class {{ camel_case_function_name }}RunnerCacheStorage({{ strategy.runner_cache_storage_class_name }}):
+    """Кеш помощника ранера функции "{{ function_verbose_name }}"."""
 
 
 class {{ camel_case_function_name }}FunctionCacheStorage({{ strategy.function_cache_storage_class_name }}):
     """Кеш помощника функции "{{ function_verbose_name }}"."""
 
-    def _prepare_entity_instances(self, model_ids, *args, **kwargs) -> List[BaseEntity]:
-        """Подготовка данных для экспорта."""
+    def _prepare_entity_instances(self, model_ids, *args, **kwargs) -> List['BaseEntity']:
+        """Подготовка данных для экспорта в виде экземпляров сущности."""
         instances = []
 
         return instances

edu_rdm_integration/function_templates/function_export_data_template/functions.py-tpl

@@ -1,9 +1,17 @@
 from typing import (
+    TYPE_CHECKING,
     List,
     Optional,
     Type,
 )
 
+from edu_rdm_integration.consts import (
+    REGIONAL_DATA_MART_INTEGRATION_EXPORTING_DATA,
+)
+from edu_rdm_integration.models import (
+    RegionalDataMartEntityEnum,
+)
+
 from {{ strategy.function_class_module }} import (
     {{ strategy.function_class_name }},
 )
@@ -19,20 +27,14 @@ from {{ function_python_path }}.validators import (
 )
 
 
-class {{ camel_case_function_name }}Function({{ strategy.function_class_name }}):
-    """Функция "{{ function_verbose_name }}"."""
+if TYPE_CHECKING:
+    from m3_db_utils.models import (
+        ModelEnumValue,
+    )
 
-    def __init__(
-        self,
-        *args,
-        **kwargs,
-    ):
-        super().__init__(*args, **kwargs)
 
-        # Ключ результата работы функции, используется в презентере
-        # self.result.key =
-        # Сообщение об успешном выполнении функции
-        # self.result.message =
+class {{ camel_case_function_name }}Function({{ strategy.function_class_name }}):
+    """Функция "{{ function_verbose_name }}"."""
 
     @classmethod
     def _prepare_uuid(cls) -> Optional[str]:
@@ -40,17 +42,30 @@ class {{ camel_case_function_name }}Function({{ strategy.function_class_name }})
 
         Если ничего не возвращает, то регистрация в БД не будет произведена.
         """
-        return
+        return '{{ strategy.function_uuid }}'
 
     @classmethod
     def _prepare_verbose_name(cls) -> str:
         """Полное наименование для дальнейшей регистрации и отображения пользователю."""
         return 'Функция "{{ function_verbose_name }}"'
 
+    @classmethod
+    def _prepare_entities(cls) -> List['ModelEnumValue']:
+        """Формирование списка ключей модели-перечисления сущностей."""
+        entities = [
+            RegionalDataMartEntityEnum.,
+        ]
+        
+        return entities
+
     @classmethod
     def _prepare_tags(cls) -> List[str]:
         """Список тегов, по которым сущность можно будет осуществлять поиск."""
-        return []
+        tags = [
+            REGIONAL_DATA_MART_INTEGRATION_EXPORTING_DATA,
+        ]
+        
+        return tags
 
     def _prepare_helper_class(self) -> Type[{{ camel_case_function_name }}FunctionHelper]:
         """Возвращает класс помощника функции."""
@@ -63,8 +78,3 @@ class {{ camel_case_function_name }}Function({{ strategy.function_class_name }})
     def _prepare_result_class(self) -> Type[{{ camel_case_function_name }}FunctionResult]:
         """Возвращает класс результата функции."""
         return {{ camel_case_function_name }}FunctionResult
-
-    def _prepare(self, *args, **kwargs):
-        """Выполнение действий функции."""
-        if self.result.has_not_errors:
-            pass

edu_rdm_integration/function_templates/function_export_data_template/managers.py-tpl

@@ -1,9 +1,19 @@
 from typing import (
+    TYPE_CHECKING,
+    Dict,
+    Iterator,
     List,
     Optional,
     Type,
 )
 
+from edu_rdm_integration.consts import (
+    REGIONAL_DATA_MART_INTEGRATION_EXPORTING_DATA,
+)
+from edu_rdm_integration.models import (
+    RegionalDataMartModelEnum,
+)
+
 from {{ strategy.manager_class_module }} import (
     {{ strategy.manager_class_name }},
 )
@@ -13,6 +23,12 @@ from {{ function_python_path }}.runners import (
 )
 
 
+if TYPE_CHECKING:
+    from m3_db_utils.models import (
+        ModelEnumValue,
+    )
+
+
 class {{ camel_case_function_name }}RunnerManager({{ strategy.manager_class_name }}):
     """Менеджер ранера функций "{{ function_verbose_name }}"."""
 
@@ -22,7 +38,7 @@ class {{ camel_case_function_name }}RunnerManager({{ strategy.manager_class_name
 
         Если ничего не возвращает, то регистрация в БД не будет произведена.
         """
-        return
+        return '{{ strategy.manager_uuid }}'
 
     @classmethod
     def _prepare_verbose_name(cls) -> str:
@@ -32,7 +48,11 @@ class {{ camel_case_function_name }}RunnerManager({{ strategy.manager_class_name
     @classmethod
     def _prepare_tags(cls) -> List[str]:
         """Список тегов, по которым сущность можно будет осуществлять поиск."""
-        return []
+        tags = [
+            REGIONAL_DATA_MART_INTEGRATION_EXPORTING_DATA,
+        ]
+        
+        return tags
 
     @classmethod
     def _prepare_runner_class(cls) -> Type[{{ camel_case_function_name }}Runner]:
@@ -45,12 +65,12 @@ class {{ camel_case_function_name }}RunnerManager({{ strategy.manager_class_name
         В выборках (QuerySet) необходимо использовать iterator().
         """
         model_ids_map = {
-            RegionalDataMartModelEnum.<some model>: (
-                RegionalDataMartModelEnum.<some model>.model.objects.filter(
+            RegionalDataMartModelEnum.: (
+                RegionalDataMartModelEnum..model.objects.filter(
                     modified__gte=self._period_started_at,
                     modified__lt=self._period_ended_at,
                 ).values_list('pk', flat=True).iterator()
             ),
         }
 
-        return model_ids_map
+        return model_ids_map

edu_rdm_integration/function_templates/function_export_data_template/runners.py-tpl

@@ -4,10 +4,24 @@ from typing import (
     Type,
 )
 
+from django.conf import (
+    settings,
+)
+
+from educommon.utils.seqtools import (
+    make_chunks,
+)
 from function_tools.general import (
     RunnableObject,
 )
 
+from edu_rdm_integration.consts import (
+    REGIONAL_DATA_MART_INTEGRATION_EXPORTING_DATA,
+)
+from edu_rdm_integration.models import (
+    RegionalDataMartModelEnum,
+)
+
 from {{ strategy.runner_class_module }} import (
     {{ strategy.runner_class_name }},
 )
@@ -35,7 +49,7 @@ class {{ camel_case_function_name }}Runner({{ strategy.runner_class_name }}):
 
         Если ничего не возвращает, то регистрация в БД не будет произведена.
         """
-        return
+        return '{{ strategy.runner_uuid }}'
 
     @classmethod
     def _prepare_verbose_name(cls) -> str:
@@ -45,7 +59,11 @@ class {{ camel_case_function_name }}Runner({{ strategy.runner_class_name }}):
     @classmethod
     def _prepare_tags(cls) -> List[str]:
         """Список тегов, по которым сущность можно будет осуществлять поиск."""
-        return []
+        tags = [
+            REGIONAL_DATA_MART_INTEGRATION_EXPORTING_DATA,
+        ]
+
+        return tags
 
     @classmethod
     def _prepare_runnable_classes(cls) -> Optional[List[Type[RunnableObject]]]:
@@ -68,10 +86,10 @@ class {{ camel_case_function_name }}Runner({{ strategy.runner_class_name }}):
         """Формирование чанков идентификаторов записей моделей для дальнейшей работы в рамках функций."""
         if model_ids_map:
             model_ids_chunks = make_chunks(
-                iterable=model_ids_map[RegionalDataMartModelEnum.<some model>],
+                iterable=model_ids_map[RegionalDataMartModelEnum.],
                 size=settings.RDM_EXPORT_CHUNK_SIZE,
             )
         else:
             model_ids_chunks = ()
 
-        return model_ids_chunks
+        return model_ids_chunks

edu_rdm_integration/function_templates/function_export_data_template/validators.py-tpl

@@ -9,14 +9,6 @@ from {{ strategy.runner_validator_class_module }} import (
 class {{ camel_case_function_name }}RunnerValidator({{ strategy.runner_validator_class_name }}):
     """Валидатор ранера функции "{{ function_verbose_name }}"."""
 
-    def validate(self, runnable):
-        """Выполнение валидации."""
-        super().validate(runnable=runnable)
-
 
 class {{ camel_case_function_name }}FunctionValidator({{ strategy.function_validator_class_name }}):
     """Валидатор функции "{{ function_verbose_name }}"."""
-
-    def validate(self, runnable):
-        """Выполнение валидации."""
-        super().validate(runnable=runnable)

{edu_rdm_integration-0.6.9.dist-info → edu_rdm_integration-0.7.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: edu-rdm-integration
-Version: 0.6.9
+Version: 0.7.0
 Summary: Интеграция с Региональной витриной данных
 Home-page: 
 Download-URL: 
@@ -29,7 +29,7 @@ Requires-Dist: wheel <0.42,>=0.37.1
 Requires-Dist: transliterate <2
 Requires-Dist: Django <2.3,>=1.11
 Requires-Dist: educommon <4,>=3.0.0
-Requires-Dist: function-tools <1,>=0.5.0
+Requires-Dist: function-tools <1,>=0.8.0
 Requires-Dist: m3-db-utils <1,>=0.3.8
 Requires-Dist: uploader-client <1,>=0.2.1
 
@@ -290,6 +290,42 @@ Requires-Dist: uploader-client <1,>=0.2.1
 ### Удалено
 
 
+## [0.7.0] - 2023-12-02
+
+Добавлено формирование логов для последующего скачивания. 
+Доработаны шаблоны реализации Функций сбора и выгрузки данных.
+Написана документация для реализации функционала новой Сущности.
+Добавлено получение моделей на основе данных plugins_info при работе метода _get_loggable_models.
+
+### Добавлено
+
+- [EDUSCHL-20072](https://jira.bars.group/browse/EDUSCHL-20072)
+  MINOR - Реестр сбора и выгрузки. Логи
+
+- [EDUSCHL-20954](https://jira.bars.group/browse/EDUSCHL-20954)
+  PATCH Добавлена документация для реализации функционала новой Сущности.
+
+### Изменено
+
+- [EDUSCHL-20954](https://jira.bars.group/browse/EDUSCHL-20954)
+  PATCH Произведена доработка шаблонов Функций сбора и выгрузки данных.
+
+- [EDUSCHL-19576](https://jira.bars.group/browse/EDUSCHL-19576)
+  PATCH - Добавлено получение моделей на основе данных plugins_info при работе метода _get_loggable_models.
+
+
+## [0.6.10] - 2023-11-30
+
+При добавлении префикса RDM_EXPORT_ENTITY_ID_PREFIX в классе BaseExportDataFunctionHelper 
+учтены поля из get_ignore_prefix_key_fields.
+
+### Изменено
+
+- [EDUSCHL-20961](https://jira.bars.group/browse/EDUSCHL-20961)
+  PATCH - При добавлении префикса RDM_EXPORT_ENTITY_ID_PREFIX в классе BaseExportDataFunctionHelper учтены поля 
+        - из get_ignore_prefix_key_fields.
+
+
 ## [0.6.9] - 2023-11-30
 
 Доработка обработки ответа при отправке файлов в РВД.

{edu_rdm_integration-0.6.9.dist-info → edu_rdm_integration-0.7.0.dist-info}/RECORD

@@ -27,14 +27,14 @@ edu_rdm_integration/adapters/strings.py,sha256=-k9dex8A7hCpkzUkudVkKRAbNRuuqog2h
 edu_rdm_integration/adapters/tests.py,sha256=MoRY-a75Ow-7EjeQYxkXWunwqTGuBMaUyEkEV2oy05I,59
 edu_rdm_integration/adapters/validators.py,sha256=LJWnCY8PtXDOj-fm3fBWjQYsHsSLfyKf_D97pqPv73s,496
 edu_rdm_integration/collect_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-edu_rdm_integration/collect_data/collect.py,sha256=LokNsirTCRBUmzwZAW9d_n8bek_DDKVYzdU12h3xRhE,14040
+edu_rdm_integration/collect_data/collect.py,sha256=LjMjBwf4nQ5KGkbMun6wx-sF6TZfibRqWGdwDTrUwVY,14068
 edu_rdm_integration/collect_data/generators.py,sha256=DA5EQ4xvIE-xe-H1RFTku3BfHZtCSVe_UCUx4qWB9D0,8988
 edu_rdm_integration/collect_data/helpers.py,sha256=pthYW-ugOww5TveWxONYcJby2VwWG6goJwbdTkNdVUU,3009
-edu_rdm_integration/collect_data/tests.py,sha256=eTHwyxb3UFyZ62BWS7evC-C9c75PSlHwew8tlt0xsjU,5175
+edu_rdm_integration/collect_data/tests.py,sha256=WilmfMllgXCsEhT77fnK9URJEOx66EmdNMcTXo4LgCg,5163
 edu_rdm_integration/collect_data/base/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edu_rdm_integration/collect_data/base/caches.py,sha256=3BaJxYBk9fi0aiAVzym-Jz8aNP1eSOqh4Y8OVw1HnSg,763
 edu_rdm_integration/collect_data/base/functions.py,sha256=HT23EyiD-H50p4NLx2_LtioktTHHFVLRmAgWdbuHErw,2379
-edu_rdm_integration/collect_data/base/managers.py,sha256=6dcngwr6R76NQ7R_DL8bH8udBRlzCdFUwC_Yf1CqVnA,6032
+edu_rdm_integration/collect_data/base/managers.py,sha256=hvxVQ7EXRol-kXHNVSLppG-9ojlbOf9t2u_p8xO4d7Y,8127
 edu_rdm_integration/collect_data/base/mixins.py,sha256=Rp3ECccl3vOWZH2QHR_ArAbibQMq92IMGPoP5XAfgVc,3180
 edu_rdm_integration/collect_data/base/runners.py,sha256=OjhdTmMab6dCoIZp2zmXZTK4H5Haz__QHddwGxjOuB0,2829
 edu_rdm_integration/collect_data/calculated/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -83,8 +83,8 @@ edu_rdm_integration/export_data/base/caches.py,sha256=dj8LGB7TMtX3cSfp-1UB3dnzcT
 edu_rdm_integration/export_data/base/consts.py,sha256=jLuy2y7YQ921OrEuzDld3F0k6YxgCnr5yorWBQJiLLw,519
 edu_rdm_integration/export_data/base/enums.py,sha256=BSmwrkzYwEQhz9NbZCJsldY532PqgZJzxzsVk6ue0bM,93
 edu_rdm_integration/export_data/base/errors.py,sha256=SaxXgKWNGG8RZQ8soFlzbX8d2_j58gWVmikzNZG1s74,291
-edu_rdm_integration/export_data/base/functions.py,sha256=og6MoWgPD3WxggWxwe-fUcW1LDtJS2d73sGC5a9OiW0,11881
-edu_rdm_integration/export_data/base/helpers.py,sha256=t2VLuvI8s84ZAVVnRLmV8jjYqSkn8hflfpgkQqzKJ3Q,3375
+edu_rdm_integration/export_data/base/functions.py,sha256=nObDvmUcX1o8qq30VpOf9bsngMlebiaswJiRFHGpyjI,12023
+edu_rdm_integration/export_data/base/helpers.py,sha256=-fpPTMrSHV3odfMjN5pRGzL7Q3BWsik0Vvl2DyCgHC4,3480
 edu_rdm_integration/export_data/base/managers.py,sha256=RuItunDuKIql065Xen6BSl_EEI8PHR9XeEyCDNgPBCg,6714
 edu_rdm_integration/export_data/base/presenters.py,sha256=JXh8nwyezaC-2h_TYfPPYUZRitFr9Y9Ifp-j7CaUCL0,403
 edu_rdm_integration/export_data/base/requests.py,sha256=-4Kn4hSl6IuKrpd8uIYTe4gO4Dz11HLfjJXLvmf9jTk,2576
@@ -100,30 +100,30 @@ edu_rdm_integration/function_templates/function_collect_data_template/caches.py-
 edu_rdm_integration/function_templates/function_collect_data_template/consts.py-tpl,sha256=pds1t4eHzovm7Yz2o5je3UHqRE8gqfT2sL-IwpoBN_o,66
 edu_rdm_integration/function_templates/function_collect_data_template/enums.py-tpl,sha256=BSmwrkzYwEQhz9NbZCJsldY532PqgZJzxzsVk6ue0bM,93
 edu_rdm_integration/function_templates/function_collect_data_template/errors.py-tpl,sha256=dFPgKvChYiv5iyMdoqOG8szqX7BEp8BTmDog2trqueE,247
-edu_rdm_integration/function_templates/function_collect_data_template/functions.py-tpl,sha256=oCUutLVvXHyPTt-2Jh-hZS6zU6xGVl1-a11gDj7BJU8,4772
-edu_rdm_integration/function_templates/function_collect_data_template/helpers.py-tpl,sha256=tySl3pBeaGjORX5qc2y1zvC8YogpcwbNqvGhh1Ow1Ws,1272
-edu_rdm_integration/function_templates/function_collect_data_template/managers.py-tpl,sha256=CxBaixZT-pIyEG7xl0l_sboieVNe8srkR-bEkt7hSwE,1527
+edu_rdm_integration/function_templates/function_collect_data_template/functions.py-tpl,sha256=GA0x0J7Y0MjwePQeDUaqvZujfbpzRAKD6fwGavXJPrE,5349
+edu_rdm_integration/function_templates/function_collect_data_template/helpers.py-tpl,sha256=otsT4yC70ZGGicgjNgdk7poDrmbOrqJyYTUbPPjQei8,1254
+edu_rdm_integration/function_templates/function_collect_data_template/managers.py-tpl,sha256=iTtad4XjtUvHpk1TYTb75JneDB1o0cbwngYOmmjqAeQ,1731
 edu_rdm_integration/function_templates/function_collect_data_template/presenters.py-tpl,sha256=2Jv_xfrz1Qxj-NXEIaa08uWrIhb5QVZEr9uRxVXczAA,316
 edu_rdm_integration/function_templates/function_collect_data_template/results.py-tpl,sha256=2iyHuzzS0YPZ688hAhSnPKnkY5BZNRNiZpLRcrn40CE,589
-edu_rdm_integration/function_templates/function_collect_data_template/runners.py-tpl,sha256=5yWyPTLgKCAbYCTT-yuxdshKoO7eKZ9Ej1M5bHhmw00,2714
+edu_rdm_integration/function_templates/function_collect_data_template/runners.py-tpl,sha256=_uJpzU_DyJUN2S07cjrw_UnYibeI_fj3SVIdWFgBdNk,2937
 edu_rdm_integration/function_templates/function_collect_data_template/strings.py-tpl,sha256=-k9dex8A7hCpkzUkudVkKRAbNRuuqog2hYl2xmibl8I,181
-edu_rdm_integration/function_templates/function_collect_data_template/tests.py-tpl,sha256=MoRY-a75Ow-7EjeQYxkXWunwqTGuBMaUyEkEV2oy05I,59
-edu_rdm_integration/function_templates/function_collect_data_template/validators.py-tpl,sha256=j9pcpMlD-2Ydc380WlZQ1HCHpxsdND9I-E03VH3mTRQ,855
+edu_rdm_integration/function_templates/function_collect_data_template/tests.py-tpl,sha256=dga5UYQSZsWUTsWiRoT2VcJ3FLxQmy7MX9KihrEWFBg,838
+edu_rdm_integration/function_templates/function_collect_data_template/validators.py-tpl,sha256=TIPYLk-rPGE9A1hViZ1Mym8XVJjk1qRlG67YTGZHcIE,587
 edu_rdm_integration/function_templates/function_export_data_template/__init__.py-tpl,sha256=wnHVZJb9qLDSBrWBNWKNd3vSwHfHl2QHB-WH_iN-OtQ,107
 edu_rdm_integration/function_templates/function_export_data_template/apps.py-tpl,sha256=PU5vgYdhtqu440mRAtIzZ78eIc-no3CsPS3rr1kPpOU,319
-edu_rdm_integration/function_templates/function_export_data_template/caches.py-tpl,sha256=tMYb5WhSyfWDBz7JbVYhL6LnJUvJ_VrsVqFmAx2dZgo,1159
+edu_rdm_integration/function_templates/function_export_data_template/caches.py-tpl,sha256=g6eJ726bVQUkbd3y7sAcLELeKt4oxM5smcZhcd6j2Kc,1054
 edu_rdm_integration/function_templates/function_export_data_template/consts.py-tpl,sha256=pds1t4eHzovm7Yz2o5je3UHqRE8gqfT2sL-IwpoBN_o,66
 edu_rdm_integration/function_templates/function_export_data_template/enums.py-tpl,sha256=BSmwrkzYwEQhz9NbZCJsldY532PqgZJzxzsVk6ue0bM,93
 edu_rdm_integration/function_templates/function_export_data_template/errors.py-tpl,sha256=dFPgKvChYiv5iyMdoqOG8szqX7BEp8BTmDog2trqueE,247
-edu_rdm_integration/function_templates/function_export_data_template/functions.py-tpl,sha256=t1fkefbofvuyVq24EjL0-ZWUNXa_ipct85evGYJuqHs,2721
+edu_rdm_integration/function_templates/function_export_data_template/functions.py-tpl,sha256=QhhZiZ1cBYIuzzH5Pe7zQjd1QQwJglRA_Gf1iNeK4GY,2882
 edu_rdm_integration/function_templates/function_export_data_template/helpers.py-tpl,sha256=tySl3pBeaGjORX5qc2y1zvC8YogpcwbNqvGhh1Ow1Ws,1272
-edu_rdm_integration/function_templates/function_export_data_template/managers.py-tpl,sha256=Ad8iGzvQqp8EirLijzkBSI6KCHwCNmEQWch9708-jR8,2266
+edu_rdm_integration/function_templates/function_export_data_template/managers.py-tpl,sha256=tK5GLit5n1TTfLdsxClWxpwlRbfUITRJUWsJwrI7Iqs,2669
 edu_rdm_integration/function_templates/function_export_data_template/presenters.py-tpl,sha256=2Jv_xfrz1Qxj-NXEIaa08uWrIhb5QVZEr9uRxVXczAA,316
 edu_rdm_integration/function_templates/function_export_data_template/results.py-tpl,sha256=2iyHuzzS0YPZ688hAhSnPKnkY5BZNRNiZpLRcrn40CE,589
-edu_rdm_integration/function_templates/function_export_data_template/runners.py-tpl,sha256=O_pvfbxgyVJCOt0lL89fGhcrGauyltc1aAdrbVhub3Y,3276
+edu_rdm_integration/function_templates/function_export_data_template/runners.py-tpl,sha256=_5csHUJ79u7NqLAgjbH05tAbOcWH-sHZGYcKliZPmKQ,3653
 edu_rdm_integration/function_templates/function_export_data_template/strings.py-tpl,sha256=-k9dex8A7hCpkzUkudVkKRAbNRuuqog2hYl2xmibl8I,181
 edu_rdm_integration/function_templates/function_export_data_template/tests.py-tpl,sha256=MoRY-a75Ow-7EjeQYxkXWunwqTGuBMaUyEkEV2oy05I,59
-edu_rdm_integration/function_templates/function_export_data_template/validators.py-tpl,sha256=j9pcpMlD-2Ydc380WlZQ1HCHpxsdND9I-E03VH3mTRQ,855
+edu_rdm_integration/function_templates/function_export_data_template/validators.py-tpl,sha256=TIPYLk-rPGE9A1hViZ1Mym8XVJjk1qRlG67YTGZHcIE,587
 edu_rdm_integration/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edu_rdm_integration/management/general.py,sha256=Yem9IcU9es_xA6Ap8v2IpAjNL1CI5VkkvQffUoJhQhY,13381
 edu_rdm_integration/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -135,9 +135,9 @@ edu_rdm_integration/migrations/0001_initial.py,sha256=toNuYoHZePe5wJ6AKEW9oPOdt2
 edu_rdm_integration/migrations/0002_init_data_uploadstatus.py,sha256=kht966YNuDbC3qTGrcWswJPsVuAtNO59Ck15G2eS2bU,944
 edu_rdm_integration/migrations/0003_create_index_file_upload_status.py,sha256=TiLnqQ8bxkVI7sRa5-D3JQ6jopFYDoH1ytSxmU6USUo,735
 edu_rdm_integration/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-edu_rdm_integration-0.6.9.dist-info/LICENSE,sha256=uw43Gjjj-1vXWCItfSrNDpbejnOwZMrNerUh8oWbq8Q,3458
-edu_rdm_integration-0.6.9.dist-info/METADATA,sha256=41t4NhdqobC8JS9XmDiEA7BUUjBSTIzPU6HCtgwM-30,41295
-edu_rdm_integration-0.6.9.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-edu_rdm_integration-0.6.9.dist-info/namespace_packages.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-edu_rdm_integration-0.6.9.dist-info/top_level.txt,sha256=nRJV0O14UtNE-jGIYG03sohgFnZClvf57H5m6VBXe9Y,20
-edu_rdm_integration-0.6.9.dist-info/RECORD,,
+edu_rdm_integration-0.7.0.dist-info/LICENSE,sha256=uw43Gjjj-1vXWCItfSrNDpbejnOwZMrNerUh8oWbq8Q,3458
+edu_rdm_integration-0.7.0.dist-info/METADATA,sha256=MfxAPyf9iF899ul9s_WEb_nyMvKv7qalR_QfiycHs-Y,43101
+edu_rdm_integration-0.7.0.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+edu_rdm_integration-0.7.0.dist-info/namespace_packages.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+edu_rdm_integration-0.7.0.dist-info/top_level.txt,sha256=nRJV0O14UtNE-jGIYG03sohgFnZClvf57H5m6VBXe9Y,20
+edu_rdm_integration-0.7.0.dist-info/RECORD,,