edu-rdm-integration 3.2.0__py3-none-any.whl → 3.2.2__py3-none-any.whl

edu_rdm_integration/app_settings.py

@@ -37,7 +37,6 @@ RDM_TRANSFER_TASK_MINUTE = '0'
 RDM_TRANSFER_TASK_HOUR = '*/4'
 RDM_TRANSFER_TASK_DAY_OF_WEEK = '*'
 RDM_TRANSFER_TASK_LOCK_EXPIRE_SECONDS = 60 * 60 * 6
-RDM_TRANSFER_TASK_TIMEDELTA = 3600
 
 # Настройка запуска периодической задачи статуса загрузки данных в витрину:
 RDM_UPLOAD_STATUS_TASK_MINUTE = '*/30'

edu_rdm_integration/collect_data/collect.py

@@ -18,14 +18,6 @@ from typing import (
 from django.conf import (
     settings,
 )
-from django.db.models import (
-    F,
-    Max,
-    CharField,
-)
-from django.db.models.functions import (
-    Cast,
-)
 from django.utils import (
     timezone,
 )
@@ -33,9 +25,6 @@ from django.utils import (
 from educommon import (
     logger,
 )
-from educommon.audit_log.models import (
-    AuditLog,
-)
 from educommon.utils.date import (
     get_today_min_datetime,
 )
@@ -56,11 +45,12 @@ from edu_rdm_integration.consts import (
     LOGS_SUB_PERIOD_DAYS,
     REGIONAL_DATA_MART_INTEGRATION_COLLECTING_DATA,
 )
+from edu_rdm_integration.helpers import (
+    get_collecting_managers_max_period_ended_dates,
+)
 from edu_rdm_integration.models import (
     CollectingDataStageStatus,
-    CollectingDataSubStageStatus,
     CollectingExportedDataStage,
-    CollectingExportedDataSubStage,
     RegionalDataMartModelEnum,
 )
 from edu_rdm_integration.signals import (
@@ -72,6 +62,10 @@ from edu_rdm_integration.storages import (
 
 
 if TYPE_CHECKING:
+    from educommon.audit_log.models import (
+        AuditLog,
+    )
+
     from edu_rdm_integration.collect_data.generators import (
         BaseEduLogGenerator,
     )
@@ -141,7 +135,7 @@ class BaseCollectModelsData(BaseOperationData):
 
         logger.info('collecting models data managers finished')
 
-    def _collect_models_data(self, *args, logs: Optional[Dict[str, List[AuditLog]]] = None, **kwargs):
+    def _collect_models_data(self, *args, logs: Optional[Dict[str, List['AuditLog']]] = None, **kwargs):
         """
         Запуск Функций по формированию данных моделей РВД из логов.
         """
@@ -227,7 +221,7 @@ class BaseCollectModelsDataByGeneratingLogs(BaseCollectModelsData):
         if temp_logs_period_ended_at > self.logs_period_ended_at:
             temp_logs_period_ended_at = self.logs_period_ended_at
 
-        temp_logs: Dict[str, List[AuditLog]] = {}
+        temp_logs: Dict[str, List['AuditLog']] = {}
 
         while temp_logs_period_started_at < temp_logs_period_ended_at <= self.logs_period_ended_at:
             for model in self.models:
@@ -254,7 +248,7 @@ class BaseCollectModelsDataByGeneratingLogs(BaseCollectModelsData):
         """
         Генерация логов за весь период.
         """
-        temp_logs: Dict[str, List[AuditLog]] = {}
+        temp_logs: Dict[str, List['AuditLog']] = {}
 
         for model in self.models:
             logs = self.log_generator.generate(
@@ -268,7 +262,7 @@ class BaseCollectModelsDataByGeneratingLogs(BaseCollectModelsData):
 
         return [(temp_logs, self.logs_period_started_at, self.logs_period_ended_at)]
 
-    def _generate_logs(self) -> List[Tuple[Dict[str, List[AuditLog]], datetime, datetime]]:
+    def _generate_logs(self) -> List[Tuple[Dict[str, List['AuditLog']], datetime, datetime]]:
         """
         Генерация логов.
 
@@ -318,47 +312,28 @@ class BaseCollectLatestModelsData(BaseCollectModelsData):
 
         return stage_created_or_in_progress
 
-    def _get_last_model_date(self, date_field: str) -> Dict[str, datetime]:
-        """
-        Возвращает словарь с uuid менеджера и крайней датой из переданного поля по указанным моделям.
-        """
-        manager_to_start_date = dict(
-            CollectingExportedDataSubStage.objects.annotate(
-                max_date=Max(f'stage__{date_field}'),
-            ).values(
-                'stage__manager_id', 'max_date',
-            ).annotate(
-                manager_id=Cast('stage__manager_id', output_field=CharField()),
-                date=F('max_date'),
-            ).filter(
-                status_id=CollectingDataSubStageStatus.READY_TO_EXPORT.key,
-                manager_id__in=(m.uuid for m in
-                                self._collecting_data_managers.values()),
-            ).values_list('manager_id', 'date')
-        )
-
-        return manager_to_start_date
-
-    def _collect_models_data(self, *args, logs: Optional[Dict[str, List[AuditLog]]] = None, **kwargs) -> None:
+    def _collect_models_data(self, *args, logs: Optional[Dict[str, List['AuditLog']]] = None, **kwargs) -> None:
         """
         Запуск Функций по формированию данных из логов для дальнейшей выгрузки.
         """
         logger.info('collect models data..')
 
-        last_finished_model_upload = self._get_last_model_date('logs_period_ended_at')
-        last_model_start = self._get_last_model_date('started_at')
+        managers_max_period_ended_dates = get_collecting_managers_max_period_ended_dates(
+            self._collecting_data_managers.values()
+        )
 
         for model_key, manager_class in self._collecting_data_managers.items():
             model_logs = logs.get(model_key) if logs else None
+            manager_max_dates = managers_max_period_ended_dates.get(manager_class.uuid, {})
 
             kwargs['logs_period_started_at'] = (
-                last_finished_model_upload.get(manager_class.uuid)
+                manager_max_dates.get('max_period_ended_at')
                 or get_today_min_datetime()
             )
             kwargs['logs_period_ended_at'] = timezone.now()
 
             if kwargs['logs_period_started_at'] > kwargs['logs_period_ended_at']:
-                kwargs['logs_period_started_at'] = last_model_start.get(manager_class.uuid)
+                kwargs['logs_period_started_at'] = manager_max_dates['max_started_at']
 
             manager = manager_class(*args, logs=model_logs, **kwargs)
 

edu_rdm_integration/export_data/base/functions.py

@@ -291,7 +291,7 @@ class BaseExportDataFunction(
                 self.do_on_save(sub_stage_uploader_client_log)
 
                 if result.error:
-                    logger.error(
+                    logger.warning(
                         f'{result.error}\nrequest - "{result.log.request}"\nresponse - "{result.log.response}"'
                     )
 

edu_rdm_integration/export_data/export.py

@@ -9,6 +9,7 @@ from datetime import (
     timedelta,
 )
 from typing import (
+    TYPE_CHECKING,
     Dict,
     Iterable,
     List,
@@ -21,7 +22,6 @@ from django.conf import (
 )
 from django.db.models import (
     F,
-    Max,
     Model,
     Value,
 )
@@ -53,9 +53,6 @@ from educommon.utils.date import (
 from educommon.utils.seqtools import (
     make_chunks,
 )
-from function_tools.managers import (
-    RunnerManager,
-)
 from m3_db_utils.consts import (
     DEFAULT_ORDER_NUMBER,
 )
@@ -72,9 +69,11 @@ from edu_rdm_integration.consts import (
 from edu_rdm_integration.enums import (
     FileUploadStatusEnum,
 )
+from edu_rdm_integration.helpers import (
+    get_exporting_managers_max_period_ended_dates,
+)
 from edu_rdm_integration.models import (
     ExportingDataStage,
-    ExportingDataSubStage,
     ExportingDataSubStageStatus,
     RegionalDataMartEntityEnum,
 )
@@ -86,6 +85,12 @@ from edu_rdm_integration.storages import (
 )
 
 
+if TYPE_CHECKING:
+    from function_tools.managers import (
+        RunnerManager,
+    )
+
+
 class BaseExportEntitiesData(BaseOperationData):
     """Базовый класс экспорта сущностей РВД за указанных период."""
 
@@ -108,7 +113,7 @@ class BaseExportEntitiesData(BaseOperationData):
         self.period_ended_at = period_ended_at
 
         # Классы менеджеров Функций, которые должны быть запущены для выгрузки данных
-        self._exporting_data_managers: Set[Type[RunnerManager]] = set()
+        self._exporting_data_managers: Set[Type['RunnerManager']] = set()
 
         # Результаты работы Функций выгрузки данных
         self._exporting_data_results = []
@@ -277,7 +282,7 @@ class BaseExportLatestEntitiesData(BaseExportEntitiesData):
     ):
         super().__init__(entities, period_started_at, period_ended_at, **kwargs)
 
-        self._exporting_data_managers: Set[Type[RunnerManager]] = OrderedSet()
+        self._exporting_data_managers: Set[Type['RunnerManager']] = OrderedSet()
 
         # Словарь данных с классами менеджеров и их сущностями
         self._manager_entities_map: Dict[Type[object], List[str]] = defaultdict(set)
@@ -353,20 +358,6 @@ class BaseExportLatestEntitiesData(BaseExportEntitiesData):
                 ):
                     queryset.filter(id__in=model_ids).update(modified=now)
 
-    def _calculate_last_finished_entity_export(self) -> Dict[str, datetime]:
-        """Находит левую границу экспорта данных для сущностей."""
-        manager_to_last_date = ExportingDataSubStage.objects.values(
-            'stage__manager_id',
-        ).annotate(
-            max_ended_at=Max('ended_at'),
-            entity_uuid=F('stage__manager_id'),
-        ).filter(
-            status_id=ExportingDataSubStageStatus.FINISHED.key,
-            entity_uuid__in=[m.uuid for m in self._exporting_data_managers],
-        ).values('entity_uuid', 'max_ended_at')
-
-        return {str(m['entity_uuid']): m['max_ended_at'] for m in manager_to_last_date}
-
     def _export_entities_data(self, *args, **kwargs) -> None:
         """
         Запуск Функций по для экспорта данных.
@@ -376,26 +367,24 @@ class BaseExportLatestEntitiesData(BaseExportEntitiesData):
         # Массив с выгружаемыми сущностями для поля "Описание" в асинхронной задаче
         exported_entities = []
 
-        last_finished_entity_export = self._calculate_last_finished_entity_export()
+        managers_max_period_ended_dates = get_exporting_managers_max_period_ended_dates(
+            self._exporting_data_managers
+        )
 
         for manager_class in self._exporting_data_managers:
-            last_finished_export_data = last_finished_entity_export.get(
-                manager_class.uuid,
-                timezone.now(),
-            )
-            # Обновить поля modified у модели сущности:
-            self._update_model_modified_field(
-                manager_id=manager_class.uuid,
-                last_finished_export_data=last_finished_export_data,
-            )
+            manager_max_dates = managers_max_period_ended_dates.get(manager_class.uuid, {})
 
-            kwargs['period_started_at'] = last_finished_export_data
+            kwargs['period_started_at'] = manager_max_dates.get('max_period_ended_at') or timezone.now()
             kwargs['period_ended_at'] = get_today_max_datetime()
 
             if kwargs['period_started_at'] > kwargs['period_ended_at']:
-                kwargs['period_started_at'] = kwargs['period_ended_at'] - timedelta(
-                    seconds=settings.RDM_TRANSFER_TASK_TIMEDELTA
-                )
+                kwargs['period_started_at'] = manager_max_dates['max_started_at']
+
+            # Обновить поля modified у модели сущности:
+            self._update_model_modified_field(
+                manager_id=manager_class.uuid,
+                last_finished_export_data=kwargs['period_started_at'],
+            )
 
             manager = manager_class(*args, **kwargs)
 

edu_rdm_integration/helpers.py

@@ -11,6 +11,7 @@ from typing import (
     Any,
     Dict,
     List,
+    Iterable,
     Optional,
     Tuple,
     Union,
@@ -23,15 +24,20 @@ from django.db import (
     transaction,
 )
 from django.db.models import (
+    CharField,
+    Max,
     QuerySet,
 )
-from uploader_client.adapters import (
-    adapter,
+from django.db.models.functions import (
+    Cast,
 )
 
 from educommon import (
     logger,
 )
+from uploader_client.adapters import (
+    adapter,
+)
 
 from edu_rdm_integration.collect_and_export_data.models import (
     EduRdmCollectDataCommandProgress,
@@ -45,12 +51,25 @@ from edu_rdm_integration.export_data.base.requests import (
 )
 from edu_rdm_integration.models import (
     DataMartRequestStatus,
+    ExportingDataStage,
+    CollectingDataStageStatus,
+    CollectingExportedDataStage,
     ExportingDataSubStageUploaderClientLog,
     UploadStatusRequestLog,
+    ExportingDataStageStatus,
 )
 
-
 if TYPE_CHECKING:
+    from datetime import (
+        datetime,
+    )
+
+    from edu_rdm_integration.collect_data.non_calculated.base.managers import (
+        BaseCollectingExportedDataRunnerManager,
+    )
+    from edu_rdm_integration.export_data.base.managers import (
+        BaseExportDataRunnerManager,
+    )
     from uploader_client.models import (
         Entry,
     )
@@ -88,7 +107,7 @@ class UploadStatusHelper:
         response = None
 
         if result.error:
-            logger.error(
+            logger.warning(
                 f'Ошибка при получении статуса загрузки данных в витрину. Идентификатор загрузки: {request_id}. '
                 f'Ошибка: {result.error}, запрос: {result.log.request}, ответ: {result.log.response}',
             )
@@ -281,3 +300,55 @@ def save_command_log_link(
     if os.path.exists(log_file):
         command.logs_link = os.path.join(log_dir, f'{command.id}.log')
         command.save()
+
+
+def get_collecting_managers_max_period_ended_dates(
+    collecting_managers: Iterable['BaseCollectingExportedDataRunnerManager'],
+) -> Dict[str, Dict[str, 'datetime']]:
+    """Возвращает даты и времени последнего успешного этапа сбора для менеджеров Функций сбора."""
+    managers_max_period_ended_dates = CollectingExportedDataStage.objects.filter(
+        status_id=CollectingDataStageStatus.FINISHED.key,
+        manager_id__in=[manager.uuid for manager in collecting_managers],
+    ).values(
+        'manager_id',
+    ).annotate(
+        str_manager_id=Cast('manager_id', output_field=CharField()),
+        max_period_ended_at=Max('logs_period_ended_at'),
+        max_started_at=Max('started_at'),
+    ).values_list(
+        'str_manager_id', 'max_period_ended_at', 'max_started_at',
+    )
+
+    return {
+        manager_id: {
+            'max_period_ended_at': max_period_ended_at,
+            'max_started_at': max_started_at,
+        }
+        for manager_id, max_period_ended_at, max_started_at in managers_max_period_ended_dates
+    }
+
+
+def get_exporting_managers_max_period_ended_dates(
+    exporting_managers: Iterable['BaseExportDataRunnerManager'],
+) -> Dict[str, Dict[str, 'datetime']]:
+    """Возвращает даты и времени последнего успешного этапа экспорта для менеджеров Функций экспорта."""
+    managers_max_period_ended_dates = ExportingDataStage.objects.filter(
+        status_id=ExportingDataStageStatus.FINISHED.key,
+        manager_id__in=[manager.uuid for manager in exporting_managers],
+    ).values(
+        'manager_id',
+    ).annotate(
+        str_manager_id=Cast('manager_id', output_field=CharField()),
+        max_period_ended_at=Max('period_ended_at'),
+        max_started_at=Max('started_at'),
+    ).values_list(
+        'str_manager_id', 'max_period_ended_at', 'max_started_at',
+    )
+
+    return {
+        manager_id: {
+            'max_period_ended_at': max_period_ended_at,
+            'max_started_at': max_started_at,
+        }
+        for manager_id, max_period_ended_at, max_started_at in managers_max_period_ended_dates
+    }

edu_rdm_integration/tasks.py

@@ -28,7 +28,6 @@ from django.db.models.functions import (
 from django.utils import (
     timezone,
 )
-
 from educommon.async_task.locker import (
     TaskLocker,
 )
@@ -72,14 +71,12 @@ from edu_rdm_integration.export_data.helpers import (
     set_failed_status_suspended_exporting_data_stages,
 )
 from edu_rdm_integration.helpers import (
+    get_collecting_managers_max_period_ended_dates,
+    get_exporting_managers_max_period_ended_dates,
     UploadStatusHelper,
     save_command_log_link,
 )
 from edu_rdm_integration.models import (
-    CollectingDataSubStageStatus,
-    CollectingExportedDataSubStage,
-    ExportingDataSubStage,
-    ExportingDataSubStageStatus,
     ExportingDataSubStageUploaderClientLog,
     RegionalDataMartEntityEnum,
     TransferredEntity,
@@ -88,7 +85,6 @@ from edu_rdm_integration.storages import (
     RegionalDataMartEntityStorage,
 )
 
-
 if TYPE_CHECKING:
     from datetime import (
         datetime,
@@ -214,10 +210,10 @@ class TransferLatestEntitiesDataPeriodicTask(UniquePeriodicAsyncTask):
         super().__init__()
 
         self._collecting_data_managers: Dict[str, Type['RunnerManager']] = {}
-        self._collecting_data_manager_to_logs_period_end: Dict[str, datetime] = {}
+        self._collecting_data_manager_to_logs_period_end: Dict[str, 'datetime'] = {}
 
         self._exporting_data_managers: Dict[str, Type['RunnerManager']] = {}
-        self._exporting_data_manager_to_period_end: Dict[str, datetime] = {}
+        self._exporting_data_manager_to_period_end: Dict[str, 'datetime'] = {}
 
         self._transferred_entities = []
 
@@ -296,40 +292,34 @@ class TransferLatestEntitiesDataPeriodicTask(UniquePeriodicAsyncTask):
 
     def _calculate_collecting_managers_logs_period_ended_at(self) -> None:
         """Определяет дату последнего успешного этапа сбора у менеджеров Функций сбора."""
-        self._collecting_data_manager_to_logs_period_end = dict(
-            CollectingExportedDataSubStage.objects.annotate(
-                manager_id=Cast('stage__manager_id', output_field=CharField()),
-                max_logs_period_ended_at=Max('stage__logs_period_ended_at'),
-            ).filter(
-                status_id=CollectingDataSubStageStatus.READY_TO_EXPORT.key,
-                manager_id__in=[manager.uuid for manager in self._collecting_data_managers.values()],
-            ).values_list('manager_id', 'max_logs_period_ended_at'),
+        self._collecting_data_manager_to_logs_period_end = get_collecting_managers_max_period_ended_dates(
+            self._collecting_data_managers.values()
         )
 
     def _calculate_exporting_managers_ended_at(self) -> None:
         """Определяет дату последнего успешного подэтапа экспорта у менеджеров Функций экспорта."""
-        self._exporting_data_manager_to_period_end = dict(
-            ExportingDataSubStage.objects.annotate(
-                manager_id=Cast('stage__manager_id', output_field=CharField()),
-                max_ended_at=Max('ended_at'),
-            ).filter(
-                status_id=ExportingDataSubStageStatus.FINISHED.key,
-                manager_id__in=[manager.uuid for manager in self._exporting_data_managers.values()],
-            ).values_list('manager_id', 'max_ended_at'),
+        self._exporting_data_manager_to_period_end = get_exporting_managers_max_period_ended_dates(
+            self._exporting_data_managers.values()
         )
 
     def _create_collect_command(self, model: str, task_id: str) -> EduRdmCollectDataCommandProgress:
         """Создает команду сбора данных моделей РВД."""
         manager = self._collecting_data_managers[model]
-        logs_period_started_at = (
+        manager_last_collected = (
             self._collecting_data_manager_to_logs_period_end.get(manager.uuid)
             or get_today_min_datetime()
         )
 
+        period_started_at = manager_last_collected['max_period_ended_at']
+        period_ended_at = timezone.now()
+
+        if period_started_at >= period_ended_at:
+            period_started_at = manager_last_collected['max_started_at']
+
         return EduRdmCollectDataCommandProgress.objects.create(
             model_id=model,
-            logs_period_started_at=logs_period_started_at,
-            logs_period_ended_at=timezone.now(),
+            logs_period_started_at=period_started_at,
+            logs_period_ended_at=period_ended_at,
             task_id=task_id,
             type=CommandType.AUTO,
         )
@@ -337,13 +327,19 @@ class TransferLatestEntitiesDataPeriodicTask(UniquePeriodicAsyncTask):
     def _create_export_command(self, entity: str, task_id: str) -> Optional[EduRdmExportDataCommandProgress]:
         """Создает команду экспорта данных сущностей РВД."""
         manager = self._exporting_data_managers[entity]
-        period_started_at = self._exporting_data_manager_to_period_end.get(manager.uuid)
+        manager_last_exported = self._exporting_data_manager_to_period_end.get(manager.uuid)
+
+        if manager_last_exported:
+            period_started_at = manager_last_exported['max_period_ended_at']
+            period_ended_at = timezone.now()
+
+            if period_started_at >= period_ended_at:
+                period_started_at = manager_last_exported['max_started_at']
 
-        if period_started_at:
             return EduRdmExportDataCommandProgress.objects.create(
                 entity_id=entity,
                 period_started_at=period_started_at,
-                period_ended_at=timezone.now(),
+                period_ended_at=period_ended_at,
                 task_id=task_id,
                 type=CommandType.AUTO,
             )

{edu_rdm_integration-3.2.0.dist-info → edu_rdm_integration-3.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: edu-rdm-integration
-Version: 3.2.0
+Version: 3.2.2
 Summary: Интеграция с Региональной витриной данных
 Home-page: 
 Download-URL: 
@@ -148,7 +148,6 @@ Requires-Dist: uploader-client <1,>=0.2.1
     RDM_TRANSFER_TASK_HOUR = conf.get('rdm_transfer_task', 'HOUR')
     RDM_TRANSFER_TASK_DAY_OF_WEEK = conf.get('rdm_transfer_task', 'DAY_OF_WEEK')
     RDM_TRANSFER_TASK_EXPIRE_SECOND = conf.get('rdm_transfer_task', 'LOCK_EXPIRE_SECONDS')
-    RDM_TRANSFER_TASK_TIMEDELTA = conf.get_int('rdm_transfer_task', 'TIMEDELTA')
 
     # Настройка запуска периодической задачи статуса загрузки данных в витрину:
     RDM_UPLOAD_STATUS_TASK_MINUTE = conf.get('rdm_upload_status_task', 'MINUTE')
@@ -198,7 +197,6 @@ Requires-Dist: uploader-client <1,>=0.2.1
     | RDM_TRANSFER_TASK_HOUR                       | Настройка запуска периодической задачи выгрузки данных. Час                                                                        | '*/4'                   |
     | RDM_TRANSFER_TASK_DAY_OF_WEEK                | Настройка запуска периодической задачи выгрузки данных. День недели                                                                | '*'                     |
     | RDM_TRANSFER_TASK_LOCK_EXPIRE_SECONDS        | Время по истечении которого, блокировка может быть снята (в секунадх)                                                              | 21600                   |
-    | RDM_TRANSFER_TASK_TIMEDELTA                  | Дельта между предыдущим и следующим запуском периодической задачи в секундах                                                       | 3600                    |
     | RDM_UPLOAD_STATUS_TASK_MINUTE                | Настройка запуска периодической задачи статуса загрузки данных в витрину. Минута                                                   | '*/30'                  |
     | RDM_UPLOAD_STATUS_TASK_HOUR                  | Настройка запуска периодической задачи статуса загрузки данных в витрину. Час                                                      | '*'                     |
     | RDM_UPLOAD_STATUS_TASK_DAY_OF_WEEK           | Настройка запуска периодической задачи статуса загрузки данных в витрину. День недели                                              | '*'                     |
@@ -303,6 +301,27 @@ Requires-Dist: uploader-client <1,>=0.2.1
 
 ### Удалено
 
+## 3.2.2 - 2024-05-21
+Изменения в переодической задаче TransferLatestEntitiesDataPeriodicTask,
+Изменено определение даты последнего успешного этапа сбора у менеджеров Функций сбора и экспорта.
+Изменения получения крайней даты из переданного поля по указанным моделям в BaseCollectLatestModelsData.
+Удалён параметр RDM_TRANSFER_TASK_TIMEDELTA.
+
+### Изменено
+- [EDUSCHL-21804](https://jira.bars.group/browse/EDUSCHL-21804)
+  PATCH Изменение определения даты последнего успешного этапа сбора у менеджеров Функций сбора и экспорта
+  Изменения получения крайней даты из переданного поля по указанным моделям в BaseCollectLatestModelsData.
+  Реализованы функции get_collecting_managers_max_period_ended_dates и get_exporting_managers_max_period_ended_dates 
+  для получения даты времени успешного этапа сбора/экспорта.
+
+
+## 3.2.1 - 2024-05-03
+Понижен уровень логирования при возникновении ошибки отправки запросов в РВД с ERROR до WARNING
+
+### Изменено
+- [EDUSCHL-21903](https://jira.bars.group/browse/EDUSCHL-21903)
+  PATCH Понижен уровень логирования при возникновении ошибки отправки запросов в РВД
+
 
 ## 3.2.0 - 2024-05-02
 Периодические задачи RDMCheckUploadStatus, CheckSuspendedExportedStagePeriodicTask, 
@@ -315,6 +334,14 @@ TransferLatestEntitiesDataPeriodicTask сделаны уникальными.
   поставить новую подобную задачу.
 
 
+## 3.1.1 - 2024-05-03
+Понижен уровень логирования при возникновении ошибки отправки запросов в РВД с ERROR до WARNING
+
+### Изменено
+- [EDUSCHL-21903](https://jira.bars.group/browse/EDUSCHL-21903)
+  PATCH Понижен уровень логирования при возникновении ошибки отправки запросов в РВД
+
+
 ## 3.1.0 - 2024-04-23
 Добавлена поддержка setuptools 69.*.
 Поднята минимальная версия пакета pip 23.2.1

{edu_rdm_integration-3.2.0.dist-info → edu_rdm_integration-3.2.2.dist-info}/RECORD

@@ -1,17 +1,17 @@
 edu_rdm_integration/__init__.py,sha256=fVCvQ7QGI_iCyAeE8dMapyY8gOM617ye5GQqAVGPlZI,72
 edu_rdm_integration/app_meta.py,sha256=v5IU69yaeLbyHF0Ln6iPN_IfizbtF3rCWrz2n71m8dU,337
-edu_rdm_integration/app_settings.py,sha256=rsXBw40Air-fUamS2ZmtSZMAs9mSCoDa50z5WlBONo0,2165
+edu_rdm_integration/app_settings.py,sha256=b8lkNz0ht7hTIKB3ZOrbF3Pp0XAJeNEs5z1WXFxHKEc,2130
 edu_rdm_integration/apps.py,sha256=5OgNdmuqe26fbu4wYb69haQJe-XFO_rDbnU1vPqJU-U,3571
 edu_rdm_integration/base.py,sha256=_G0qPTAXe6bXfgDHNiZMSsYt3sMuUhLKnHuQCWSFttU,1341
 edu_rdm_integration/consts.py,sha256=FFwcMHNsfjP_s9LfkccLAHjJMEMp7ppPmrRlJcgV88k,1104
 edu_rdm_integration/entities.py,sha256=qNVWUhjwvX298Ak86_AKmqBZioP0czGwBcAz_4dtUUE,14552
 edu_rdm_integration/enums.py,sha256=T3Mu5D-CbKO3BSg16MPPnIPlcc_YGLYR-ThS8dzl9gg,4246
-edu_rdm_integration/helpers.py,sha256=wsVd3GiO7qgb_jtZBqEuedBTW8Q9-j2xcfMBi45O0cw,10997
+edu_rdm_integration/helpers.py,sha256=pGgefbVCsi4-qb4KTy8ONV3gVNKx-FiJibFkK6hKzMM,13725
 edu_rdm_integration/mapping.py,sha256=bwa2fJCbV4YjQcAgRrgT3hgM6dJhr_uBtQgx3L3F2Ck,473
 edu_rdm_integration/models.py,sha256=Wg8NYj4C6Xqw-15AsQGU0TWNzUjdwBW_YZDzmPqx3GY,29327
 edu_rdm_integration/signals.py,sha256=3eRlpkDcFCF6TN80-QM8yBYLcyozzcmoPjz6r4_ApWg,73
 edu_rdm_integration/storages.py,sha256=o5WqUG7SnkeuMt-z8spUi-IraivST-7KHzfY-M3v7FA,6807
-edu_rdm_integration/tasks.py,sha256=blG952xd84DspIQZepF6Vdsz6i7O5pKxN3CGOlDwB2g,15253
+edu_rdm_integration/tasks.py,sha256=LPbEbfRtEwYlfneLrMvE3EnyN0B52qwnwMUEAIFgQDs,14998
 edu_rdm_integration/utils.py,sha256=-my8q9fude6Nc9r_qUDww-8QaU2tcv-xOexewYqOPJw,10369
 edu_rdm_integration/adapters/__init__.py,sha256=cU0swn4Ny5ZQz5buWRcWsT1mpWuUFJaUlHf2l7TtEBo,83
 edu_rdm_integration/adapters/apps.py,sha256=TyJTkSPs2qAHJ11fqbwLGk3Ea7ujtqWwbxqmvYNQxG8,363
@@ -37,7 +37,7 @@ edu_rdm_integration/collect_and_export_data/utils.py,sha256=lBWqqhLgMyz2IQN7r9zu
 edu_rdm_integration/collect_and_export_data/migrations/0001_initial.py,sha256=UkoaXzh3tokZ8QdCdB09v3rRZfcHhvEwNMuj3mQIB74,4714
 edu_rdm_integration/collect_and_export_data/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edu_rdm_integration/collect_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-edu_rdm_integration/collect_data/collect.py,sha256=TfjDD25opR6UlV6oWbMXs3T7nQguSg5IT0k2oFasWJI,14543
+edu_rdm_integration/collect_data/collect.py,sha256=i5kf__jrlBOIZC2rRD-CHXn2HeAKWpQXrqxQg-fk94M,13596
 edu_rdm_integration/collect_data/generators.py,sha256=f34AAwdEcQNIokX0ypqYgjRD1XolwBVLER_HYv9ibNw,9075
 edu_rdm_integration/collect_data/helpers.py,sha256=gAFZAm9YhMtQhvlwSF3LMthPPa8LsqG_zbVe7vnW_Ag,2995
 edu_rdm_integration/collect_data/tests.py,sha256=-UNX3-GL0H9i89GXRfICT0ABltn_9aN_I_cmn1gQcDA,5367
@@ -85,7 +85,7 @@ edu_rdm_integration/enum_register/mixins.py,sha256=nmHue9-9bqKZn9_MFiL0E-5wBUBIZ
 edu_rdm_integration/enum_register/register.py,sha256=5OWOjK-M0Erd_5CENpBaXhVtfL0pEaDl3Bev5QKNDJc,2218
 edu_rdm_integration/export_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edu_rdm_integration/export_data/consts.py,sha256=Z6Uho8oViMc0t1tyQFZfrPFBwPx6KnhUf_iZ0qgob8o,16
-edu_rdm_integration/export_data/export.py,sha256=m1C2gmpQb_Dlr9qtYplHSTJOtU-Ll1d9S5tzPGp73os,17231
+edu_rdm_integration/export_data/export.py,sha256=AAN_DqOAPENKEtlbnMF2j4CPmkoy57vJQ8t2yQRZtrM,16595
 edu_rdm_integration/export_data/generators.py,sha256=yLDOcHB1PoilJwXtKGxZQhDjpeKBzEWoosahbJJ4Ba4,4020
 edu_rdm_integration/export_data/helpers.py,sha256=hU346RmQ17Ra2etFvxXI7JQlLyp_0KxH1jm-eeCqejc,2933
 edu_rdm_integration/export_data/strategies.py,sha256=ocHskG-x54U-ESX56OlZPgOibkGkuv7VKmK7hVmqj_0,6725
@@ -94,7 +94,7 @@ 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=YwmPHOtIobUPS8WotjBFwKcq9qzf9DV3T1cX89cJ1Ac,12784
+edu_rdm_integration/export_data/base/functions.py,sha256=ZCf3j0HA3rFrQiYHB-fG2xAW-pKyXDuDUm0yJrHyssg,12786
 edu_rdm_integration/export_data/base/helpers.py,sha256=h0S_fItbaygZfNZb9oUUPNF4dmeOojNx2nHCv3m3TWU,4609
 edu_rdm_integration/export_data/base/managers.py,sha256=AJBBOmQbW-cnVEa3d2DCpyoNbnRxXmgpAcUCBu1rDiI,6075
 edu_rdm_integration/export_data/base/presenters.py,sha256=JXh8nwyezaC-2h_TYfPPYUZRitFr9Y9Ifp-j7CaUCL0,403
@@ -162,9 +162,9 @@ edu_rdm_integration/uploader_log/apps.py,sha256=tYJj4-sDlq8fLOSvw18L_yys7SILpTKW
 edu_rdm_integration/uploader_log/enums.py,sha256=rgSO3BL2rh2xpfm0Pt4waQW8fB1VMJLdsGmr3SXwH_U,266
 edu_rdm_integration/uploader_log/managers.py,sha256=y5wTSMzF9hpOpIU_A7nIafL_LBU3QEie6LAYWoB-pBQ,3203
 edu_rdm_integration/uploader_log/ui.py,sha256=YM9Buqp2wxE95Wf5gvAATBzuYzDOossK1sEmvFk07cI,2110
-edu_rdm_integration-3.2.0.dist-info/LICENSE,sha256=uw43Gjjj-1vXWCItfSrNDpbejnOwZMrNerUh8oWbq8Q,3458
-edu_rdm_integration-3.2.0.dist-info/METADATA,sha256=H5B9TuvSmXOEUFSIguHL7MzfkLyhlskeZkJHpgWOKG0,63284
-edu_rdm_integration-3.2.0.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-edu_rdm_integration-3.2.0.dist-info/namespace_packages.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-edu_rdm_integration-3.2.0.dist-info/top_level.txt,sha256=nRJV0O14UtNE-jGIYG03sohgFnZClvf57H5m6VBXe9Y,20
-edu_rdm_integration-3.2.0.dist-info/RECORD,,
+edu_rdm_integration-3.2.2.dist-info/LICENSE,sha256=uw43Gjjj-1vXWCItfSrNDpbejnOwZMrNerUh8oWbq8Q,3458
+edu_rdm_integration-3.2.2.dist-info/METADATA,sha256=pf2mWm6W814a7FE1IGxpN0bhvun_2q7Zm0dmi1k6SHQ,65013
+edu_rdm_integration-3.2.2.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+edu_rdm_integration-3.2.2.dist-info/namespace_packages.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+edu_rdm_integration-3.2.2.dist-info/top_level.txt,sha256=nRJV0O14UtNE-jGIYG03sohgFnZClvf57H5m6VBXe9Y,20
+edu_rdm_integration-3.2.2.dist-info/RECORD,,