edu-rdm-integration 0.5.6__py3-none-any.whl → 0.5.8__py3-none-any.whl

edu_rdm_integration/export_data/export.py

@@ -24,10 +24,14 @@ from django.db.models import (
     Max,
     Model,
     Q,
+    Value,
 )
 from django.db.models.base import (
     ModelBase,
 )
+from django.db.models.functions import (
+    Concat,
+)
 from django.utils import (
     timezone,
 )
@@ -248,7 +252,10 @@ class BaseExportLatestEntitiesData(BaseExportEntitiesData):
             self.async_task.objects.filter(
                 task_id=self.task_id,
             ).update(
-                description=F('description') + f': {", ".join(exported_entities)}',
+                description=Concat(
+                    'description',
+                    Value(f': {", ".join(exported_entities)}')
+                ),
             )
 
     def _fill_manager_entities_map(self, entity_storage: RegionalDataMartEntityStorage) -> None:
@@ -282,7 +289,7 @@ class BaseExportLatestEntitiesData(BaseExportEntitiesData):
             )
             # 3. Подэтап выгрузки указанной в записи модели имеет статус FAILED:
             | Q(
-                collecting_sub_stage__status_id=ExportingDataSubStageStatus.FAILED.key,
+                exporting_sub_stage__status_id=ExportingDataSubStageStatus.FAILED.key,
             )
             # 4. Связь лога подэтапа выгрузки с логом загрузки данных (ExportingDataSubStageUploaderClientLog)
             # имеет статус FileUploadStatusEnum.ERROR:
@@ -319,14 +326,17 @@ class BaseExportLatestEntitiesData(BaseExportEntitiesData):
         last_finished_entity_export = self._calculate_last_finished_entity_export()
 
         for manager_class in self._exporting_data_managers:
-            last_finished_export_data = last_finished_entity_export.get(manager_class.uuid)
+            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,
             )
 
-            kwargs['period_started_at'] = last_finished_export_data or get_today_min_datetime()
+            kwargs['period_started_at'] = last_finished_export_data
             kwargs['period_ended_at'] = get_today_max_datetime()
 
             if kwargs['period_started_at'] > kwargs['period_ended_at']:

{edu_rdm_integration-0.5.6.dist-info → edu_rdm_integration-0.5.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: edu-rdm-integration
-Version: 0.5.6
+Version: 0.5.8
 Summary: Интеграция с Региональной витриной данных
 Home-page: 
 Download-URL: 
@@ -220,6 +220,31 @@ ENABLE_REQUEST_EMULATION = True
 ### Удалено
 
 
+## [0.5.8] - 2023-09-13
+
+Исправлена ошибка добавления в описание асинхронной задачи списка выгруженных сущностей 
+BaseExportLatestEntitiesData._set_description_to_async_task.
+
+### Исправлено
+
+- [EDUSCHL-20334](https://jira.bars.group/browse/EDUSCHL-20334)
+  PATCH - Баг с обновлением поля description в BaseExportLatestEntitiesData._set_description_to_async_task.
+
+## [0.5.7] - 2023-09-12
+
+Баг фикс и дополнение поведения BaseExportLatestEntitiesData.
+
+### Изменено
+
+- [EDUSCHL-20435](https://jira.bars.group/browse/EDUSCHL-20435)
+  PATCH - BaseExportLatestEntitiesData теперь поддерживает выгрузку ни разу невыгруженных сущностей.
+
+### Исправлено
+
+- [EDUSCHL-20435](https://jira.bars.group/browse/EDUSCHL-20435)
+  PATCH - Баг с условием в фильтре в BaseExportLatestEntitiesData._update_model_modified_field.
+
+
 ## [0.5.6] - 2023-09-06
 
 Доработаны классы BaseExportLatestEntitiesData и BaseExportEntitiesData.

{edu_rdm_integration-0.5.6.dist-info → edu_rdm_integration-0.5.8.dist-info}/RECORD

@@ -69,7 +69,7 @@ edu_rdm_integration/collect_data/non_calculated/base/tests.py,sha256=MoRY-a75Ow-
 edu_rdm_integration/collect_data/non_calculated/base/validators.py,sha256=0YvnfrfK1iFcZVSB-M-Xv82tIjYxEU_BwLofAEuGVW4,973
 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=VaTuFdQ-kVrfU8Ob6oIZhF9ZtD0dk__aCBdpEcTWy8k,14766
+edu_rdm_integration/export_data/export.py,sha256=jqJYXg-Vm_IwkOxposZKk5QY8d4aBhNmGJOw4PRFJjk,14935
 edu_rdm_integration/export_data/generators.py,sha256=huonSRK5arfBzU09BnLAHC7AsSFYU0sCz5utCtejdJk,3950
 edu_rdm_integration/export_data/strategies.py,sha256=NcI2VsDfAmm9k-Nul6LZkSxruCmo7B-XH7wzgW6-vfE,6718
 edu_rdm_integration/export_data/base/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -95,9 +95,9 @@ edu_rdm_integration/management/commands/export_entities_data.py,sha256=Mas1zwsH-
 edu_rdm_integration/migrations/0001_initial.py,sha256=toNuYoHZePe5wJ6AKEW9oPOdt2OefmxDEDDJGYQIrFk,18719
 edu_rdm_integration/migrations/0002_init_data_uploadstatus.py,sha256=kht966YNuDbC3qTGrcWswJPsVuAtNO59Ck15G2eS2bU,944
 edu_rdm_integration/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-edu_rdm_integration-0.5.6.dist-info/LICENSE,sha256=uw43Gjjj-1vXWCItfSrNDpbejnOwZMrNerUh8oWbq8Q,3458
-edu_rdm_integration-0.5.6.dist-info/METADATA,sha256=w8HR9Y17VR3LSGel5iM4QLKIz0k32prl94eZ-ZtlqlQ,26131
-edu_rdm_integration-0.5.6.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-edu_rdm_integration-0.5.6.dist-info/namespace_packages.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-edu_rdm_integration-0.5.6.dist-info/top_level.txt,sha256=nRJV0O14UtNE-jGIYG03sohgFnZClvf57H5m6VBXe9Y,20
-edu_rdm_integration-0.5.6.dist-info/RECORD,,
+edu_rdm_integration-0.5.8.dist-info/LICENSE,sha256=uw43Gjjj-1vXWCItfSrNDpbejnOwZMrNerUh8oWbq8Q,3458
+edu_rdm_integration-0.5.8.dist-info/METADATA,sha256=oZOtI1PqMYci7BAdkSw16is1fA-1EjmIz6C2qJwCGGk,27170
+edu_rdm_integration-0.5.8.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+edu_rdm_integration-0.5.8.dist-info/namespace_packages.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+edu_rdm_integration-0.5.8.dist-info/top_level.txt,sha256=nRJV0O14UtNE-jGIYG03sohgFnZClvf57H5m6VBXe9Y,20
+edu_rdm_integration-0.5.8.dist-info/RECORD,,