edu-rdm-integration 3.3.8__py3-none-any.whl → 3.4.2__py3-none-any.whl

edu_rdm_integration/app_settings.py

@@ -48,3 +48,9 @@ RDM_UPLOAD_STATUS_TASK_LOCK_EXPIRE_SECONDS = 60 * 60 * 2
 RDM_UPLOAD_QUEUE_MAX_SIZE = 500_000_000
 # Таймаут для сохранения параметров в общем кеш
 RDM_REDIS_CACHE_TIMEOUT_SECONDS = 60 * 60 * 2
+
+# Настройка запуска периодической задачи отправки csv-файлов в витрину:
+RDM_UPLOAD_DATA_TASK_MINUTE = '0'
+RDM_UPLOAD_DATA_TASK_HOUR = '*/2'
+RDM_UPLOAD_DATA_TASK_DAY_OF_WEEK = '*'
+RDM_UPLOAD_DATA_TASK_LOCK_EXPIRE_SECONDS = 60 * 60 * 2

edu_rdm_integration/collect_data/tests.py

@@ -32,6 +32,9 @@ from educommon.audit_log.models import (
 from educommon.integration_entities.enums import (
     EntityLogOperation,
 )
+from educommon.utils.phone_number.phone_number import (
+    PhoneNumber,
+)
 from function_tools.models import (
     Entity,
     EntityType,
@@ -166,6 +169,8 @@ class BaseCollectingFunctionTestCase(TestCase):
                 fields[key] = value.name
             elif isinstance(value, list):
                 fields[key] = f'{{{",".join(map(str, value))}}}'
+            elif isinstance(value, PhoneNumber):
+                fields[key] = value.cleaned
             else:
                 fields[key] = value
 

edu_rdm_integration/enum_register/mixins.py

@@ -1,7 +1,9 @@
 from typing import (
     Any,
     Dict,
+    NamedTuple,
     Optional,
+    Type,
     Tuple,
 )
 
@@ -23,6 +25,9 @@ from edu_rdm_integration.models import (
     RegionalDataMartEntityEnum,
     RegionalDataMartModelEnum,
 )
+from edu_rdm_integration.typing import (
+    MODEL_TYPE_VAR,
+)
 from edu_rdm_integration.utils import (
     camel_to_underscore,
 )
@@ -108,3 +113,17 @@ class ModelEnumRegisterMixin(BaseEnumRegisterMixin):
         register_params['loggable_models'] = cls.loggable_models
 
         return register_params
+
+
+class FromNamedTupleMixin:
+    """Миксин получения экземпляра модели из получаемого кэша значений."""
+
+    @classmethod
+    def from_namedtuple(cls: Type[MODEL_TYPE_VAR], namedtuple: NamedTuple) -> MODEL_TYPE_VAR:
+        """Создает экземпляр класса из NamedTuple."""
+        return cls(
+            **{
+                field: getattr(namedtuple, field)
+                for field in [f.column for f in cls._meta.get_fields()]
+            }
+        )

edu_rdm_integration/mapping.py

@@ -14,3 +14,6 @@ MODEL_FIELDS_LOG_FILTER: Dict[EntityLogOperation, Dict[str, Tuple]] = {
     EntityLogOperation.UPDATE: {},
     EntityLogOperation.DELETE: {}
 }
+
+# Маппинг операций логов моделей и сущностей по умолчанию
+DEFAULT_ENTITY_LOG_OPERATION_MAP = {op: op for op in EntityLogOperation.values}

edu_rdm_integration/tasks.py

@@ -350,12 +350,12 @@ class UploadDataAsyncTask(UniquePeriodicAsyncTask):
     queue = TASK_QUEUE_NAME
     routing_key = TASK_QUEUE_NAME
     description = 'Отправка данных в витрину "Региональная витрина данных"'
-    lock_expire_seconds = settings.RDM_UPLOAD_STATUS_TASK_LOCK_EXPIRE_SECONDS
+    lock_expire_seconds = settings.RDM_UPLOAD_DATA_TASK_LOCK_EXPIRE_SECONDS
     task_type = AsyncTaskType.SYSTEM
     run_every = crontab(
-        minute=settings.RDM_UPLOAD_STATUS_TASK_MINUTE,
-        hour=settings.RDM_UPLOAD_STATUS_TASK_HOUR,
-        day_of_week=settings.RDM_UPLOAD_STATUS_TASK_DAY_OF_WEEK,
+        minute=settings.RDM_UPLOAD_DATA_TASK_MINUTE,
+        hour=settings.RDM_UPLOAD_DATA_TASK_HOUR,
+        day_of_week=settings.RDM_UPLOAD_DATA_TASK_DAY_OF_WEEK,
     )
 
     def process(self, *args, **kwargs):

edu_rdm_integration/typing.py

@@ -0,0 +1,28 @@
+from typing import (
+    Sequence,
+    TypeVar,
+    Union,
+)
+
+from django.db.models import (
+    Expression,
+    Model,
+)
+
+
+# Тип, обозначающий любую модель. При указании в качестве type annotation
+# можно указать, что аргументом может быть любая модель или тип модели (через
+# Type[MODEL_TYPE_VAR]), а сама функция возвращает инстанс этой
+# конкретной модели
+MODEL_TYPE_VAR = TypeVar('MODEL_TYPE_VAR', bound=Model)
+
+# Аннотация типов для id записи в БД
+RECORD_IDS = Union[
+    tuple[int, ...],
+    tuple[str, ...],
+    list[int],
+    list[str],
+    Sequence[int],
+    Sequence[str],
+    Expression,
+]

edu_rdm_integration/utils.py

@@ -1,5 +1,6 @@
 import os
 from datetime import (
+    date,
     datetime,
     time,
     timedelta,
@@ -11,12 +12,30 @@ from typing import (
     List,
     Optional,
     Set,
+    Type,
+    TypeVar,
     Union,
 )
 
 from django.conf import (
     settings,
 )
+from django.db.models import (
+    DateField,
+    DateTimeField,
+    Expression,
+    F,
+)
+from django.db.models.expressions import (
+    Func,
+)
+from django.db.models.functions import (
+    Cast,
+    Now,
+)
+from educommon.integration_entities.enums import (
+    EntityLogOperation,
+)
 
 from edu_rdm_integration.apps import (
     EduRDMIntegrationConfig,
@@ -285,3 +304,59 @@ def get_data_command_progress_attachment_path(
         str(instance.type),
         filename
     )
+
+
+class MakeInterval(Func):
+    """Функция обработки даты/времени."""
+
+    template = 'make_interval(%(expressions)s)'
+
+    def __init__(
+        self, *,
+        years: Union[int, F] = 0,
+        months: Union[int, F] = 0,
+        weeks: Union[int, F] = 0,
+        days: Union[int, F] = 0,
+        hours: Union[int, F] = 0,
+        minutes: Union[int, F] = 0,
+        seconds: Union[float, F] = 0.0,
+        output_field=None,
+    ) -> None:
+        self.years = years
+        self.months = months
+        self.weeks = weeks
+        self.days = days
+        self.hours = hours
+        self.minutes = minutes
+        self.seconds = seconds
+
+        super().__init__(
+            self.years,
+            self.months,
+            self.weeks,
+            self.days,
+            self.hours,
+            self.minutes,
+            self.seconds,
+            output_field=output_field or DateTimeField(),
+        )
+
+
+def make_passed_datetime_from_today(
+    *,
+    years: int = 0,
+    months: int = 0,
+    days: int = 0,
+) -> Union[datetime, Expression, F]:
+    """Возвращает выражение на лет/месяцев/дней меньше относительно сегодня."""
+    now_expr = Now()
+
+    return now_expr - MakeInterval(years=years, months=months, days=days)
+
+
+TODAY_EXPR: Union[date, Expression, F] = Cast(make_passed_datetime_from_today(), output_field=DateField())
+
+THREE_YEARS_AGO_DATE_EXPR: Union[date, Expression, F] = Cast(
+    make_passed_datetime_from_today(years=3),
+    output_field=DateField()
+)

{edu_rdm_integration-3.3.8.dist-info → edu_rdm_integration-3.4.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: edu-rdm-integration
-Version: 3.3.8
+Version: 3.4.2
 Summary: Интеграция с Региональной витриной данных
 Home-page: 
 Download-URL: 
@@ -28,7 +28,7 @@ Requires-Dist: wheel <0.42,>=0.37.1
 Requires-Dist: transliterate <2
 Requires-Dist: Django <3.3,>=2.2
 Requires-Dist: celery <5.3,>=4.4.7
-Requires-Dist: educommon <4,>=3.10.0
+Requires-Dist: educommon <4,>=3.11.0
 Requires-Dist: function-tools <1,>=0.9.0
 Requires-Dist: m3-db-utils <1,>=0.3.10
 Requires-Dist: m3-django-compat <2,>=1.10.2
@@ -302,6 +302,37 @@ Requires-Dist: uploader-client <1,>=0.2.1
 ### Удалено
 
 
+## 3.4.2 - 2024-10-15
+Добавлены отдельные параметры по управлению временем запуска UploadDataAsyncTask
+
+## Добавлено
+- [EDUSCHL-22166](https://jira.bars.group/browse/EDUSCHL-22166)
+  Добавлены отдельные параметры по управлению временем запуска UploadDataAsyncTask
+
+
+## 3.4.1 - 2024-09-26
+Добавлена документация по сбору/выгрузке сущностей для ЭДС, ЭК
+
+## Добавлено
+- [EDUKNDG-14518](https://jira.bars.group/browse/EDUKNDG-14518)
+  Добавлена документация по сбору/выгрузке сущностей для ЭДС, ЭК
+
+
+## 3.4.0 - 2024-09-25
+В базовый класс тестирования функций сбора добавлена поддержка формата PhoneNumber для формирования
+экземпляра модели AuditLog.
+Повышена версия зависимости educommon >= 3.11.0.
+Вынесены утилиты и базовый класс для логирования и сбора по модели в рамках сущности
+
+## Добавлено
+- [EDUSCHL-22378](https://jira.bars.group/browse/EDUSCHL-22378)
+  Реализация поля моделей Django содержащего номер телефона
+
+### Изменено
+- [EDUKNDG-14516](https://jira.bars.group/browse/EDUKNDG-14516)
+   PATCH Вынесены утилиты и базовый класс для логирования и сбора по модели в рамках сущности
+
+
 ## 3.3.8 - 2024-10-14
 Задача UploadDataAsyncTask изменена с PeriodicAsyncTask на UploadDataAsyncTask
 - [EDUSCHL-22519]https://jira.bars.group/browse/EDUSCHL-22519

{edu_rdm_integration-3.3.8.dist-info → edu_rdm_integration-3.4.2.dist-info}/RECORD

@@ -1,19 +1,20 @@
 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=bR8zGz2fJPSia5LO4KDUENIlxdqHmKkTAg92-q0qhew,2398
+edu_rdm_integration/app_settings.py,sha256=iqoGMJXFvINd4YwDfXCKjZEsGJCCNxpIRWfvwLrvpPA,2689
 edu_rdm_integration/apps.py,sha256=BoXiTr8B04ZtDxHNXc1Jy2xzRoaq8CMBQ9cfmBK73j4,3571
 edu_rdm_integration/base.py,sha256=_G0qPTAXe6bXfgDHNiZMSsYt3sMuUhLKnHuQCWSFttU,1341
 edu_rdm_integration/consts.py,sha256=Qt52SOCQ-3wOet-_6inJih_W9nToORKXbkxb3jVSjEo,1079
 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=_zQb3vuMrWClpUErshYTI1aVgdKjXf819pHfBjaIty4,14592
-edu_rdm_integration/mapping.py,sha256=bwa2fJCbV4YjQcAgRrgT3hgM6dJhr_uBtQgx3L3F2Ck,473
+edu_rdm_integration/mapping.py,sha256=PGy6oH3Jzg4uuSIjlI0A-gWWpJPozqZHN4wGzp-ldFY,660
 edu_rdm_integration/models.py,sha256=YP_vot6PbQ3jWv3NNW1wa0gScjOsT2lgdrj7z5V6NHw,33053
 edu_rdm_integration/redis_cache.py,sha256=GZhtM1d0cVr5TEqxh15K7dS371Msit6wRemIiYb2rzk,1548
 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=-YVApvlXdke5IYEBppU7M5_3bBYgIUqzxtZF976qIxM,16052
-edu_rdm_integration/utils.py,sha256=NIOxlH4JiTOOxYgqcwtfqT5UAtNG24GLq_tsnBUtp8E,10370
+edu_rdm_integration/tasks.py,sha256=9LzUCuCmSR2dDi35SI2VeOdxTpKf33SkFCffov3WO7Y,16044
+edu_rdm_integration/typing.py,sha256=6GOZfRDqOjN-o5NR86-f2o4uXQm_8AUCRRdQTITtrcs,785
+edu_rdm_integration/utils.py,sha256=QMiohtOaId3Zab91IZPazGzhce5pa5e-ilRgXpISkHk,12249
 edu_rdm_integration/adapters/__init__.py,sha256=cU0swn4Ny5ZQz5buWRcWsT1mpWuUFJaUlHf2l7TtEBo,83
 edu_rdm_integration/adapters/apps.py,sha256=TyJTkSPs2qAHJ11fqbwLGk3Ea7ujtqWwbxqmvYNQxG8,363
 edu_rdm_integration/adapters/caches.py,sha256=OxSqeXySUN42LxEeHBLtC1ZBt-7aicbRbmP1EJYTvV4,1505
@@ -41,7 +42,7 @@ edu_rdm_integration/collect_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRk
 edu_rdm_integration/collect_data/collect.py,sha256=HIKO8Kvw9NY9Nt5M5w9XfcZ9E5IVue_4mT7ESYJ6n4I,11909
 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
+edu_rdm_integration/collect_data/tests.py,sha256=hlf2eXUQonYeLY2enm-ND712NrsGcYa03FxjCUOj7EE,5535
 edu_rdm_integration/collect_data/base/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edu_rdm_integration/collect_data/base/caches.py,sha256=XPMVZSgR8vRhCHmHsnUKy86rEIPUQXHz0wJabovPyfU,2170
 edu_rdm_integration/collect_data/base/functions.py,sha256=E1vYmC8F8NM5cBB5SGQEpluHrMynpjf3Ek3s0HsbxwY,2998
@@ -82,7 +83,7 @@ edu_rdm_integration/collect_data/non_calculated/base/strings.py,sha256=-k9dex8A7
 edu_rdm_integration/collect_data/non_calculated/base/tests.py,sha256=MoRY-a75Ow-7EjeQYxkXWunwqTGuBMaUyEkEV2oy05I,59
 edu_rdm_integration/collect_data/non_calculated/base/validators.py,sha256=0YvnfrfK1iFcZVSB-M-Xv82tIjYxEU_BwLofAEuGVW4,973
 edu_rdm_integration/enum_register/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-edu_rdm_integration/enum_register/mixins.py,sha256=nmHue9-9bqKZn9_MFiL0E-5wBUBIZPZwk3DWVir5pKk,4021
+edu_rdm_integration/enum_register/mixins.py,sha256=YYCvSQEf6RMaMnGS2vA2v-P1ojkXA5MgAuBOcFgLIRE,4642
 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=rmJ_18wHCE54j0VABxfo7Zu01EPFYSjYrj5L79hVW2Y,333
@@ -175,9 +176,9 @@ edu_rdm_integration/uploader_log/enums.py,sha256=rgSO3BL2rh2xpfm0Pt4waQW8fB1VMJL
 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/uploader_log/templates/ui-js/object-grid-buttons.js,sha256=2xyGe0wdVokM0RhpzRzcRvJPBkBmPe3SlZry4oP4Nzs,6201
-edu_rdm_integration-3.3.8.dist-info/LICENSE,sha256=uw43Gjjj-1vXWCItfSrNDpbejnOwZMrNerUh8oWbq8Q,3458
-edu_rdm_integration-3.3.8.dist-info/METADATA,sha256=LV7V-Iqbz2EZVVQAsflLPWVD08Ta7rCw4y0bZzNkPq4,73000
-edu_rdm_integration-3.3.8.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-edu_rdm_integration-3.3.8.dist-info/namespace_packages.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-edu_rdm_integration-3.3.8.dist-info/top_level.txt,sha256=nRJV0O14UtNE-jGIYG03sohgFnZClvf57H5m6VBXe9Y,20
-edu_rdm_integration-3.3.8.dist-info/RECORD,,
+edu_rdm_integration-3.4.2.dist-info/LICENSE,sha256=uw43Gjjj-1vXWCItfSrNDpbejnOwZMrNerUh8oWbq8Q,3458
+edu_rdm_integration-3.4.2.dist-info/METADATA,sha256=MyujvyOvHWMyJpk9lZTwTeWORxzV_fMisjEO_DEDvIA,74646
+edu_rdm_integration-3.4.2.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+edu_rdm_integration-3.4.2.dist-info/namespace_packages.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+edu_rdm_integration-3.4.2.dist-info/top_level.txt,sha256=nRJV0O14UtNE-jGIYG03sohgFnZClvf57H5m6VBXe9Y,20
+edu_rdm_integration-3.4.2.dist-info/RECORD,,