edu-rdm-integration 0.6.2__py3-none-any.whl → 0.6.3__py3-none-any.whl

edu_rdm_integration/collect_data/generators.py

@@ -1,3 +1,4 @@
+import uuid
 from datetime import (
     date,
     datetime,
@@ -111,6 +112,8 @@ class BaseFirstCollectModelsDataCommandsGenerator:
 
         self.batch_size = batch_size
 
+        self.generation_id = uuid.uuid4()
+
         # Правую дату нужно увеличивать на одну секунду, т.к. подрезались миллисекунды
         self.get_logs_periods_sql = (
             """
@@ -169,6 +172,7 @@ class BaseFirstCollectModelsDataCommandsGenerator:
                             'period_started_at': start_datetime,
                             'period_ended_at': end_datetime,
                             'model': rdm_model.key,
+                            'generation_id': self.generation_id,
                         }
                     )
 
@@ -214,6 +218,7 @@ class BaseFirstCollectModelsDataCommandsGenerator:
                             'period_started_at': period_started_at,
                             'period_ended_at': period_ended_at,
                             'model': rdm_model.key,
+                            'generation_id': self.generation_id,
                         }
                     )
 

edu_rdm_integration/models.py

@@ -1,7 +1,12 @@
+import uuid
 from datetime import (
     datetime,
 )
 
+import django.utils.timezone
+from django.contrib.postgres.fields import (
+    JSONField,
+)
 from django.db.models import (
     CASCADE,
     PROTECT,
@@ -11,8 +16,8 @@ from django.db.models import (
     DateTimeField,
     FileField,
     ForeignKey,
-    PositiveSmallIntegerField,
     SmallIntegerField,
+    UUIDField,
 )
 from m3.db import (
     BaseObjectModel,
@@ -672,15 +677,25 @@ class AbstractCollectDataCommandProgress(ReprStrPreModelMixin, BaseObjectModel):
         verbose_name='Модель РВД',
         on_delete=PROTECT,
     )
+    created = DateTimeField(
+        verbose_name='Дата создания',
+        default=django.utils.timezone.now,
+    )
     logs_period_started_at = DateTimeField(
         'Левая граница периода обрабатываемых логов',
     )
     logs_period_ended_at = DateTimeField(
         'Правая граница периода обрабатываемых логов',
     )
-    logs_sub_period_days = PositiveSmallIntegerField(
-        'Размер подпериода',
-        default=0,
+    generation_id = UUIDField(
+        'Идентификатор генерации',
+        default=uuid.uuid4,
+    )
+    institute_ids = JSONField(
+        'id учебного заведения',
+        blank=True,
+        null=True,
+        default=list,
     )
 
     class Meta:

{edu_rdm_integration-0.6.2.dist-info → edu_rdm_integration-0.6.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: edu-rdm-integration
-Version: 0.6.2
+Version: 0.6.3
 Summary: Интеграция с Региональной витриной данных
 Home-page: 
 Download-URL: 
@@ -279,6 +279,17 @@ Requires-Dist: uploader-client <1,>=0.1.12
 ### Удалено
 
 
+## [0.6.3] - 2023-10-05
+
+Доработка модели AbstractCollectDataCommandProgress и класса BaseFirstCollectModelsDataCommandsGenerator.
+
+### Добавлено
+
+- [EDUSCHL-20350](https://jira.bars.group/browse/EDUSCHL-20350)
+  PATCH - Добавлено формирование id генерации для команд в классе BaseFirstCollectModelsDataCommandsGenerator.
+        - Добавлены поля created, generation_id и institute_ids в модель AbstractCollectDataCommandProgress.
+
+
 ## [0.6.2] - 2023-10-04
 
 ### Изменено

{edu_rdm_integration-0.6.2.dist-info → edu_rdm_integration-0.6.3.dist-info}/RECORD

@@ -5,7 +5,7 @@ edu_rdm_integration/consts.py,sha256=chOsPOOY4_JLzN-8idg-VjbLWSlp6r3maFWqnvUsapg
 edu_rdm_integration/entities.py,sha256=mI48GExfRrQZsyg8leGJDaiy8Cmf3vlkIttNq2OYJZI,9117
 edu_rdm_integration/enums.py,sha256=fnDPz6pwOYWS6vp65IAExbpDzn2q9U3_9GGyuf4B468,4876
 edu_rdm_integration/mapping.py,sha256=bwa2fJCbV4YjQcAgRrgT3hgM6dJhr_uBtQgx3L3F2Ck,473
-edu_rdm_integration/models.py,sha256=ewbDJ1OSyZkKrssPhtqS8yWe212gpoIw6a1wFr-QToQ,21846
+edu_rdm_integration/models.py,sha256=agBoepF0YScpfxo3VZWvw6uy707IteT8CQVJmpUt7M4,22207
 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/utils.py,sha256=CgFrW1mEQim3wcCX6q9o9mvIm79ASQ92HojXyuN3dc0,5558
@@ -28,7 +28,7 @@ edu_rdm_integration/adapters/tests.py,sha256=MoRY-a75Ow-7EjeQYxkXWunwqTGuBMaUyEk
 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=3sicEiX9v_EQtd5vFOyclSV-kYNV7FNxx09DdyIWIAk,12843
-edu_rdm_integration/collect_data/generators.py,sha256=wnwxP4ljVFlLJ-TvRmIlaQuY7tWAsQKV4LX4D0zt3Hw,8685
+edu_rdm_integration/collect_data/generators.py,sha256=lmXbptKxirEXw8yEYyFf3tRTjmg_zzbQn8Ox76cxAuY,8870
 edu_rdm_integration/collect_data/helpers.py,sha256=EftJ8R-tn1r7Y_P6tGZmqxJ9-g89m12p9kA8NYmwwbQ,3009
 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
@@ -98,9 +98,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.6.2.dist-info/LICENSE,sha256=uw43Gjjj-1vXWCItfSrNDpbejnOwZMrNerUh8oWbq8Q,3458
-edu_rdm_integration-0.6.2.dist-info/METADATA,sha256=bBAJO-JItkOopmsfl72WJ_M5bfJYG5gNEoAKsmRYpsw,33934
-edu_rdm_integration-0.6.2.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-edu_rdm_integration-0.6.2.dist-info/namespace_packages.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-edu_rdm_integration-0.6.2.dist-info/top_level.txt,sha256=nRJV0O14UtNE-jGIYG03sohgFnZClvf57H5m6VBXe9Y,20
-edu_rdm_integration-0.6.2.dist-info/RECORD,,
+edu_rdm_integration-0.6.3.dist-info/LICENSE,sha256=uw43Gjjj-1vXWCItfSrNDpbejnOwZMrNerUh8oWbq8Q,3458
+edu_rdm_integration-0.6.3.dist-info/METADATA,sha256=68SWwZHVWqJflkmFxkiI_8PDQAmnVpGioOf_cLk4YG0,34465
+edu_rdm_integration-0.6.3.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+edu_rdm_integration-0.6.3.dist-info/namespace_packages.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+edu_rdm_integration-0.6.3.dist-info/top_level.txt,sha256=nRJV0O14UtNE-jGIYG03sohgFnZClvf57H5m6VBXe9Y,20
+edu_rdm_integration-0.6.3.dist-info/RECORD,,