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

edu_rdm_integration/collect_data/collect.py

@@ -318,23 +318,17 @@ class BaseCollectLatestModelsData(BaseCollectModelsData):
         """
         logger.info('collect models data..')
 
-        managers_max_period_ended_dates = get_collecting_managers_max_period_ended_dates(
+        managers_last_period_ended_at = 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, {})
+            manager_last_period_ended_at = managers_last_period_ended_at.get(manager_class.uuid)
 
-            kwargs['logs_period_started_at'] = (
-                manager_max_dates.get('max_period_ended_at')
-                or get_today_min_datetime()
-            )
+            kwargs['logs_period_started_at'] = manager_last_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'] = manager_max_dates['max_started_at']
-
             manager = manager_class(*args, logs=model_logs, **kwargs)
 
             if self.command_id:

edu_rdm_integration/export_data/export.py

@@ -367,19 +367,16 @@ class BaseExportLatestEntitiesData(BaseExportEntitiesData):
         # Массив с выгружаемыми сущностями для поля "Описание" в асинхронной задаче
         exported_entities = []
 
-        managers_max_period_ended_dates = get_exporting_managers_max_period_ended_dates(
+        managers_max_period_ended = get_exporting_managers_max_period_ended_dates(
             self._exporting_data_managers
         )
 
         for manager_class in self._exporting_data_managers:
-            manager_max_dates = managers_max_period_ended_dates.get(manager_class.uuid, {})
+            manager_last_exported = managers_max_period_ended.get(manager_class.uuid)
 
-            kwargs['period_started_at'] = manager_max_dates.get('max_period_ended_at') or timezone.now()
+            kwargs['period_started_at'] = manager_last_exported or timezone.now()
             kwargs['period_ended_at'] = get_today_max_datetime()
 
-            if kwargs['period_started_at'] > kwargs['period_ended_at']:
-                kwargs['period_started_at'] = manager_max_dates['max_started_at']
-
             # Обновить поля modified у модели сущности:
             self._update_model_modified_field(
                 manager_id=manager_class.uuid,

edu_rdm_integration/helpers.py

@@ -25,11 +25,13 @@ from django.db import (
 )
 from django.db.models import (
     CharField,
-    Max,
+    OuterRef,
     QuerySet,
+    Subquery,
 )
 from django.db.models.functions import (
     Cast,
+    Least,
 )
 
 from educommon import (
@@ -304,51 +306,49 @@ def save_command_log_link(
 
 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(
+) -> Dict[str, 'datetime']:
+    """Возвращает дату и время завершения последнего успешного этапа сбора для менеджеров Функций сбора."""
+    managers_last_period_ended = CollectingExportedDataStage.objects.filter(
         status_id=CollectingDataStageStatus.FINISHED.key,
         manager_id__in=[manager.uuid for manager in collecting_managers],
-    ).values(
-        'manager_id',
+        id=Subquery(
+            CollectingExportedDataStage.objects.filter(
+                manager_id=OuterRef('manager_id')
+            ).order_by('-id').values('id')[:1]
+        ),
     ).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'),
+        last_period_ended_at=Least('logs_period_ended_at', 'started_at'),
     ).values_list(
-        'str_manager_id', 'max_period_ended_at', 'max_started_at',
+        'str_manager_id', 'last_period_ended_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
+        manager_id: last_period_ended_at
+        for manager_id, last_period_ended_at in managers_last_period_ended
     }
 
 
 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(
+) -> Dict[str, 'datetime']:
+    """Возвращает дату и время последнего успешного этапа экспорта для менеджеров Функций экспорта."""
+    managers_last_period_ended = ExportingDataStage.objects.filter(
         status_id=ExportingDataStageStatus.FINISHED.key,
         manager_id__in=[manager.uuid for manager in exporting_managers],
-    ).values(
-        'manager_id',
+        id=Subquery(
+            ExportingDataStage.objects.filter(
+                manager_id=OuterRef('manager_id')
+            ).order_by('-id').values('id')[:1]
+        ),
     ).annotate(
         str_manager_id=Cast('manager_id', output_field=CharField()),
-        max_period_ended_at=Max('period_ended_at'),
-        max_started_at=Max('started_at'),
+        last_period_ended_at=Least('period_ended_at', 'started_at'),
     ).values_list(
-        'str_manager_id', 'max_period_ended_at', 'max_started_at',
+        'str_manager_id', 'last_period_ended_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
+        manager_id: last_period_ended_at
+        for manager_id, last_period_ended_at in managers_last_period_ended
     }

edu_rdm_integration/tasks.py

@@ -310,12 +310,9 @@ class TransferLatestEntitiesDataPeriodicTask(UniquePeriodicAsyncTask):
             or get_today_min_datetime()
         )
 
-        period_started_at = manager_last_collected['max_period_ended_at']
+        period_started_at = manager_last_collected
         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=period_started_at,
@@ -330,12 +327,9 @@ class TransferLatestEntitiesDataPeriodicTask(UniquePeriodicAsyncTask):
         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_started_at = manager_last_exported
             period_ended_at = timezone.now()
 
-            if period_started_at >= period_ended_at:
-                period_started_at = manager_last_exported['max_started_at']
-
             return EduRdmExportDataCommandProgress.objects.create(
                 entity_id=entity,
                 period_started_at=period_started_at,

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: edu-rdm-integration
-Version: 3.2.2
+Version: 3.2.3
 Summary: Интеграция с Региональной витриной данных
 Home-page: 
 Download-URL: 
@@ -301,6 +301,16 @@ Requires-Dist: uploader-client <1,>=0.2.1
 
 ### Удалено
 
+
+## 3.2.3 - 2024-06-06
+Внесены корректировки в запросы используемые в функциях get_collecting_managers_max_period_ended_dates и get_exporting_managers_max_period_ended_dates.
+
+### Изменено
+- [EDUSCHL-21804](https://jira.bars.group/browse/EDUSCHL-21804)
+  PATCH Внесены корректировки в запросы используемые в функциях get_collecting_managers_max_period_ended_dates и get_exporting_managers_max_period_ended_dates.
+  Дата и время окончания предыдущего сбора/экспорта могла быть не корректно определена.
+
+
 ## 3.2.2 - 2024-05-21
 Изменения в переодической задаче TransferLatestEntitiesDataPeriodicTask,
 Изменено определение даты последнего успешного этапа сбора у менеджеров Функций сбора и экспорта.

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

@@ -6,12 +6,12 @@ edu_rdm_integration/base.py,sha256=_G0qPTAXe6bXfgDHNiZMSsYt3sMuUhLKnHuQCWSFttU,1
 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=pGgefbVCsi4-qb4KTy8ONV3gVNKx-FiJibFkK6hKzMM,13725
+edu_rdm_integration/helpers.py,sha256=lUJv8X8gCY-w2SfcyOShNRtydOTJe0dGHN4h2Y6elqk,13715
 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=LPbEbfRtEwYlfneLrMvE3EnyN0B52qwnwMUEAIFgQDs,14998
+edu_rdm_integration/tasks.py,sha256=PEqJeuGaWA_GgE4N6RU57dj-p2hRzGqYmKLRdSg2otQ,14699
 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=i5kf__jrlBOIZC2rRD-CHXn2HeAKWpQXrqxQg-fk94M,13596
+edu_rdm_integration/collect_data/collect.py,sha256=UR4thiSJ4qFCgMRpJxKtylP5fcrtvxK2Q4FLZSSkN_4,13365
 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=AAN_DqOAPENKEtlbnMF2j4CPmkoy57vJQ8t2yQRZtrM,16595
+edu_rdm_integration/export_data/export.py,sha256=3d1POl4xzyh4GVXJYdkXkcyfiUIqsrlPKPO-apw30Uk,16405
 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
@@ -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.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,,
+edu_rdm_integration-3.2.3.dist-info/LICENSE,sha256=uw43Gjjj-1vXWCItfSrNDpbejnOwZMrNerUh8oWbq8Q,3458
+edu_rdm_integration-3.2.3.dist-info/METADATA,sha256=gDOXDSYZhHOgHPJgrkZPEzWC4NFV8oZX_hbIaVoORjk,65697
+edu_rdm_integration-3.2.3.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+edu_rdm_integration-3.2.3.dist-info/namespace_packages.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+edu_rdm_integration-3.2.3.dist-info/top_level.txt,sha256=nRJV0O14UtNE-jGIYG03sohgFnZClvf57H5m6VBXe9Y,20
+edu_rdm_integration-3.2.3.dist-info/RECORD,,