edu-rdm-integration 1.0.1__py3-none-any.whl → 2.0.1__py3-none-any.whl

edu_rdm_integration/collect_data/collect.py

@@ -202,14 +202,14 @@ class BaseCollectModelsDataByGeneratingLogs(BaseCollectModelsData):
         logs_period_started_at=datetime.combine(date.today(), time.min),
         logs_period_ended_at=datetime.combine(date.today(), time.min),
         logs_sub_period_days=LOGS_SUB_PERIOD_DAYS,
-        school_ids=(),
+        institute_ids=(),
         **kwargs,
     ):
         super().__init__(models, logs_period_started_at, logs_period_ended_at, **kwargs)
 
         self.logs_sub_period_days = logs_sub_period_days
-        # Школы, для которых производится выгрузка
-        self.school_ids = school_ids
+        # Учебные заведения, для которых производится выгрузка
+        self.institute_ids = institute_ids
         # Генератор логов
         self.log_generator = self._prepare_log_generator()
 
@@ -235,7 +235,7 @@ class BaseCollectModelsDataByGeneratingLogs(BaseCollectModelsData):
                     model=model,
                     logs_period_started_at=temp_logs_period_started_at,
                     logs_period_ended_at=temp_logs_period_ended_at,
-                    school_ids=self.school_ids,
+                    institute_ids=self.institute_ids,
                 )
 
                 temp_logs[model.key] = logs
@@ -261,7 +261,7 @@ class BaseCollectModelsDataByGeneratingLogs(BaseCollectModelsData):
                 model=model,
                 logs_period_started_at=self.logs_period_started_at,
                 logs_period_ended_at=self.logs_period_ended_at,
-                school_ids=self.school_ids,
+                institute_ids=self.institute_ids,
             )
 
             temp_logs[model.key] = logs

edu_rdm_integration/collect_data/generators.py

@@ -61,7 +61,7 @@ class BaseEduLogGenerator:
         model: ModelEnumValue,
         logs_period_started_at: datetime = datetime.combine(date.today(), time.min),
         logs_period_ended_at: datetime = datetime.combine(date.today(), time.max),
-        school_ids: Optional[Tuple[int]] = (),
+        institute_ids: Optional[Tuple[int]] = (),
     ) -> List['AuditLog']:
         """
         Возвращает список сгенерированных экземпляров модели AuditLog.
@@ -72,14 +72,14 @@ class BaseEduLogGenerator:
             model: значение модели РВД из модели-перечисления;
             logs_period_started_at: начало периода формирования логов;
             logs_period_ended_at: конец периода формирования логов;
-            school_ids: список идентификаторов школ.
+            institute_ids: идентификаторы учебных заведений.
         """
         generate_logs_method = self._get_generate_logs_method(model)
 
         logs = generate_logs_method(
             logs_period_started_at=logs_period_started_at,
             logs_period_ended_at=logs_period_ended_at,
-            school_ids=school_ids,
+            institute_ids=institute_ids,
         )
 
         return logs

edu_rdm_integration/export_data/export.py

@@ -348,14 +348,14 @@ class BaseExportLatestEntitiesData(BaseExportEntitiesData):
         manager_to_last_date = ExportingDataSubStage.objects.values(
             'stage__manager_id',
         ).annotate(
-            max_ended_at=Max('ended_at'),
+            last_period_ended_at=F('stage__period_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')
+        ).values('entity_uuid', 'last_period_ended_at')
 
-        return {str(m['entity_uuid']): m['max_ended_at'] for m in manager_to_last_date}
+        return {str(m['entity_uuid']): m['last_period_ended_at'] for m in manager_to_last_date}
 
     def _export_entities_data(self, *args, **kwargs) -> None:
         """

edu_rdm_integration/management/general.py

@@ -218,12 +218,12 @@ class BaseCollectModelsDataByGeneratingLogsCommand(BaseCollectModelDataCommand):
         )
 
         parser.add_argument(
-            '--school_ids',
+            '--institute_ids',
             action='store',
-            dest='school_ids',
+            dest='institute_ids',
             type=lambda v: tuple(map(int, v.split(','))),
             default=(),
-            help='Школы, для которых производится выгрузка.',
+            help='Идентификаторы учебных заведений, для которых производится выгрузка.',
         )
 
 

{edu_rdm_integration-1.0.1.dist-info → edu_rdm_integration-2.0.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: edu-rdm-integration
-Version: 1.0.1
+Version: 2.0.1
 Summary: Интеграция с Региональной витриной данных
 Home-page: 
 Download-URL: 
@@ -288,6 +288,26 @@ Requires-Dist: uploader-client <1,>=0.2.1
 
 ### Удалено
 
+## [2.0.1] - 2024-03-01
+
+Изменена работа метода _calculate_last_finished_entity_export класса BaseExportLatestEntitiesData
+
+### Исправлено
+
+- [EDUSCHL-21503](https://jira.bars.group/browse/EDUSCHL-21503)
+  PATCH ЭШ. Все модели РВД. Некорректное определение начала периода экспорта командой при сборе 
+  командой collect_latest_models_data 
+
+
+## [2.0.0] - 2024-02-21
+
+Параметр school_ids переименован в institute_ids.
+
+### Изменено
+
+- [EDUSCHL-20485](https://jira.bars.group/browse/EDUSCHL-20485)
+  MAJOR Произвести переименование параметра school_ids на institute_ids
+
 
 ## [1.0.1] - 2024-02-20
 

{edu_rdm_integration-1.0.1.dist-info → edu_rdm_integration-2.0.1.dist-info}/RECORD

@@ -31,8 +31,8 @@ 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=n73jmtVoJ-0VHShqL8Aqoo5TiOpcjJYIMY5YZ4Qtqxs,14499
-edu_rdm_integration/collect_data/generators.py,sha256=61DdPF8d0BRmvGJSYVA7wz3HmDpbbdStU4lBoJ0sUdY,9053
+edu_rdm_integration/collect_data/collect.py,sha256=TfjDD25opR6UlV6oWbMXs3T7nQguSg5IT0k2oFasWJI,14543
+edu_rdm_integration/collect_data/generators.py,sha256=f34AAwdEcQNIokX0ypqYgjRD1XolwBVLER_HYv9ibNw,9075
 edu_rdm_integration/collect_data/helpers.py,sha256=pthYW-ugOww5TveWxONYcJby2VwWG6goJwbdTkNdVUU,3009
 edu_rdm_integration/collect_data/tests.py,sha256=vAvNRe23ep2JsBcEE0VjoOqwgFN3QmKE552iZgvbWdM,5378
 edu_rdm_integration/collect_data/base/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -79,7 +79,7 @@ edu_rdm_integration/enum_register/mixins.py,sha256=shLb8-9ySoY9kK1Wzb46I9wRKglQI
 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=Axij_T66EX7I_VjLeVaELuKharDNAVAWDsFlZpqf9EY,16879
+edu_rdm_integration/export_data/export.py,sha256=YsiukbGuUyQJ8kDh2rehnFdvNTy-qud6-xzywA_5VI0,16915
 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
@@ -130,7 +130,7 @@ edu_rdm_integration/function_templates/function_export_data_template/strings.py-
 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=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/general.py,sha256=n6_aqP_rFFMdPSH9yjfz9pz984uF2KCWlwwrLt9CmQg,13439
 edu_rdm_integration/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edu_rdm_integration/management/commands/check_upload_status.py,sha256=jGqFMLMgrirG_H2OxzxNG3Z3d1xvORIzWqzKBUtr22Y,3843
 edu_rdm_integration/management/commands/collect_latest_models_data.py,sha256=4ObBFqYMkX5v1saV9V7PivYBm0RMcDCGNlMGx77UAjs,750
@@ -156,9 +156,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-1.0.1.dist-info/LICENSE,sha256=uw43Gjjj-1vXWCItfSrNDpbejnOwZMrNerUh8oWbq8Q,3458
-edu_rdm_integration-1.0.1.dist-info/METADATA,sha256=VWtIRppCl6cTqP2UU8jhjkdmN4zPBX3KxL8pmQbBfWk,53826
-edu_rdm_integration-1.0.1.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-edu_rdm_integration-1.0.1.dist-info/namespace_packages.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-edu_rdm_integration-1.0.1.dist-info/top_level.txt,sha256=nRJV0O14UtNE-jGIYG03sohgFnZClvf57H5m6VBXe9Y,20
-edu_rdm_integration-1.0.1.dist-info/RECORD,,
+edu_rdm_integration-2.0.1.dist-info/LICENSE,sha256=uw43Gjjj-1vXWCItfSrNDpbejnOwZMrNerUh8oWbq8Q,3458
+edu_rdm_integration-2.0.1.dist-info/METADATA,sha256=fmIANX0p8dzGETRrNlv0g8vW02K_SVfkYmk04S93HIY,54577
+edu_rdm_integration-2.0.1.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+edu_rdm_integration-2.0.1.dist-info/namespace_packages.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+edu_rdm_integration-2.0.1.dist-info/top_level.txt,sha256=nRJV0O14UtNE-jGIYG03sohgFnZClvf57H5m6VBXe9Y,20
+edu_rdm_integration-2.0.1.dist-info/RECORD,,