edu-rdm-integration 2.2.0__py3-none-any.whl → 3.0.0__py3-none-any.whl

edu_rdm_integration/collect_and_export_data/models.py

@@ -39,7 +39,7 @@ class EduRdmCollectDataCommandProgress(AbstractCollectDataCommandProgress):
         choices=CommandType.get_choices(),
     )
 
-    class Meta:
+    class Meta(AbstractCollectDataCommandProgress.Meta):
         db_table = 'edu_rdm_collecting_data_command_progress'
 
 
@@ -63,5 +63,5 @@ class EduRdmExportDataCommandProgress(AbstractExportDataCommandProgress):
         choices=CommandType.get_choices(),
     )
 
-    class Meta:
+    class Meta(AbstractExportDataCommandProgress.Meta):
         db_table = 'edu_rdm_exporting_data_command_progress'

edu_rdm_integration/export_data/base/functions.py

@@ -155,16 +155,18 @@ class BaseExportDataFunction(
         Формирование списка строковых значений полей.
         """
         ordered_fields = self.first_entity.entity.get_ordered_fields()
-        primary_key_fields = self.first_entity.entity.get_primary_key_fields()
-        foreign_key_fields = self.first_entity.entity.get_foreign_key_fields()
-        hashable_fields = self.first_entity.entity.get_hashable_fields()
-        ignore_prefix_fields = self.first_entity.entity.get_ignore_prefix_key_fields()
+        primary_key_fields = set(self.first_entity.entity.get_primary_key_fields())
+        foreign_key_fields = set(self.first_entity.entity.get_foreign_key_fields())
+        required_fields = set(self.first_entity.entity.get_required_fields())
+        hashable_fields = set(self.first_entity.entity.get_hashable_fields())
+        ignore_prefix_fields = set(self.first_entity.entity.get_ignore_prefix_key_fields())
 
         field_values = self.helper.prepare_record(
             entity_instance=entity_instance,
             ordered_fields=ordered_fields,
             primary_key_fields=primary_key_fields,
             foreign_key_fields=foreign_key_fields,
+            required_fields=required_fields,
             hashable_fields=hashable_fields,
             ignore_prefix_fields=ignore_prefix_fields,
         )

edu_rdm_integration/export_data/base/helpers.py

@@ -2,11 +2,11 @@ from datetime import (
     date,
     datetime,
 )
-from itertools import (
-    chain,
-)
 from typing import (
+    Any,
     List,
+    Set,
+    Tuple,
     Type,
 )
 
@@ -55,36 +55,58 @@ class BaseExportDataFunctionHelper(WebEduFunctionHelper):
 
     cryptographer = HashData(hash_algorithm=HASH_ALGORITHM)
 
+    @classmethod
+    def _prepare_str_field(cls, field_value: str, *, required: bool) -> str:
+        # Очистка строковых полей от управляющих символов
+        return str_without_control_chars(field_value)
+
+    @classmethod
+    def _prepare_datetime_field(cls, field_value: datetime, *, required: bool) -> str:
+        # Дату/время передаём в формате: YYYY-MM-DD hh:mm:ss
+        return field_value.strftime(EXPORT_DATETIME_FORMAT)
+
+    @classmethod
+    def _prepare_date_field(cls, field_value: date, *, required: bool) -> str:
+        return field_value.strftime(DATE_FORMAT)
+
+    @classmethod
+    def _prepare_common_field(cls, field_value: Any, *, required: bool) -> str:
+        return str(field_value if field_value is not None else '')
+
+    @classmethod
+    def _surround_with_quotes(cls, field_value: str, *, required: bool) -> str:
+        return f'"{field_value}"'
+
     @classmethod
     def prepare_record(
         cls,
         entity_instance,
-        ordered_fields,
-        primary_key_fields,
-        foreign_key_fields,
-        hashable_fields,
-        ignore_prefix_fields,
+        ordered_fields: Tuple[str, ...],
+        primary_key_fields: Set[str],
+        foreign_key_fields: Set[str],
+        required_fields: Set[str],
+        hashable_fields: Set[str],
+        ignore_prefix_fields: Set[str],
     ) -> List[str]:
         """
         Формирование списка строковых значений полей.
         """
         field_values = []
-        key_fields = set(chain(primary_key_fields, foreign_key_fields))
-        add_prefix_fields = key_fields - set(ignore_prefix_fields)
+        key_fields = primary_key_fields.union(foreign_key_fields)
+        add_prefix_fields = key_fields.difference(ignore_prefix_fields)
 
         for field in ordered_fields:
+            required = field in required_fields
             field_value = getattr(entity_instance, field)
 
             if isinstance(field_value, str):
-                # Очистка строковых полей от управляющих символов
-                field_value = str_without_control_chars(field_value)
+                field_value = cls._prepare_str_field(field_value, required=required)
             elif isinstance(field_value, datetime):
-                # Дату/время передаём в формате: YYYY-MM-DD hh:mm:ss
-                field_value = field_value.strftime(EXPORT_DATETIME_FORMAT)
+                field_value = cls._prepare_datetime_field(field_value, required=required)
             elif isinstance(field_value, date):
-                field_value = field_value.strftime(DATE_FORMAT)
+                field_value = cls._prepare_date_field(field_value, required=required)
             else:
-                field_value = str(field_value if field_value is not None else '')
+                field_value = cls._prepare_common_field(field_value, required=required)
 
             if field_value and field in add_prefix_fields:
                 field_value = f'{settings.RDM_EXPORT_ENTITY_ID_PREFIX}-{field_value}'
@@ -95,9 +117,11 @@ class BaseExportDataFunctionHelper(WebEduFunctionHelper):
             # Экранирование двойных кавычек
             field_value = field_value.replace('"', '""')
 
+            field_value = cls._surround_with_quotes(field_value, required=required)
+
             field_values.append(field_value)
 
-        return [f'"{v}"' for v in field_values]
+        return field_values
 
     def _prepare_cache_class(self) -> Type[BaseExportDataFunctionCacheStorage]:
         """

{edu_rdm_integration-2.2.0.dist-info → edu_rdm_integration-3.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: edu-rdm-integration
-Version: 2.2.0
+Version: 3.0.0
 Summary: Интеграция с Региональной витриной данных
 Home-page: 
 Download-URL: 
@@ -293,6 +293,24 @@ Requires-Dist: uploader-client <1,>=0.2.1
 
 ### Удалено
 
+## 3.0.0 - 2024-04-02
+Расширены возможности кастомизации поведения метода `BaseExportDataFunctionHelper.prepare_record`.
+
+### Добавлено
+
+- [EDUCLLG-8325](https://jira.bars.group/browse/EDUCLLG-8325)
+  MAJOR Добавлена возможность отдельно указывать, как формировать строковое
+    представление полей в зависимости от их типа и обязательности. **Требуется добавить
+    параметр `required_fields` в метод `prepare_record` helper-а функции**.
+
+## [2.2.1] - 2024-03-28
+ Исправление наследования Meta в моделях EduRdmCollectDataCommandProgress и EduRdmExportDataCommandProgress
+
+### Исправлено
+
+- [EDUSCHL-21569](https://jira.bars.group/browse/EDUSCHL-21569)
+  MINOR Перенести оставшиеся общие асинхронные задачи из ЭШ в пакет edu_rdm_integration
+
 ## [2.2.0] - 2024-03-20
 
 Из ЭШ перенесена периодическая задача по сбору и выгрузке данных в РВД.

{edu_rdm_integration-2.2.0.dist-info → edu_rdm_integration-3.0.0.dist-info}/RECORD

@@ -32,7 +32,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_and_export_data/__init__.py,sha256=4glPgPCzAyLreBGUnUrcRPCge45XucJz5bK8VjlQBaE,82
 edu_rdm_integration/collect_and_export_data/apps.py,sha256=fAcctcjxWP4Gd0Qr3YrQkMESrzga4IORWetBTy8wvHo,160
-edu_rdm_integration/collect_and_export_data/models.py,sha256=5IfLYgnJsQTi59z3NeGiOtSjGW0i89BlgmDzrryz5HY,1957
+edu_rdm_integration/collect_and_export_data/models.py,sha256=TGm-hM-1aDhVcFPy0PTC3yNczoZGF4ZmIdr0Y9s8CfU,2038
 edu_rdm_integration/collect_and_export_data/utils.py,sha256=uw85W_uPr7zGa9rA4Bp1nDUrOMnlz0nZ92AZAgNsRlE,3073
 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
@@ -94,8 +94,8 @@ edu_rdm_integration/export_data/base/caches.py,sha256=dj8LGB7TMtX3cSfp-1UB3dnzcT
 edu_rdm_integration/export_data/base/consts.py,sha256=jLuy2y7YQ921OrEuzDld3F0k6YxgCnr5yorWBQJiLLw,519
 edu_rdm_integration/export_data/base/enums.py,sha256=BSmwrkzYwEQhz9NbZCJsldY532PqgZJzxzsVk6ue0bM,93
 edu_rdm_integration/export_data/base/errors.py,sha256=SaxXgKWNGG8RZQ8soFlzbX8d2_j58gWVmikzNZG1s74,291
-edu_rdm_integration/export_data/base/functions.py,sha256=QWs6JxHChCg1M7anAJ5wJIE6bzjafMWIfvkJSao_Uyc,12642
-edu_rdm_integration/export_data/base/helpers.py,sha256=-fpPTMrSHV3odfMjN5pRGzL7Q3BWsik0Vvl2DyCgHC4,3480
+edu_rdm_integration/export_data/base/functions.py,sha256=5LGMrAMkGu1pb03gZ8PDpx5hjuoY4B9s5yXX6qs-EiM,12785
+edu_rdm_integration/export_data/base/helpers.py,sha256=MbzVIqwH_5vVRpX1KOsf3VwbzzSA395e_GLUCJv9urw,4476
 edu_rdm_integration/export_data/base/managers.py,sha256=AJBBOmQbW-cnVEa3d2DCpyoNbnRxXmgpAcUCBu1rDiI,6075
 edu_rdm_integration/export_data/base/presenters.py,sha256=JXh8nwyezaC-2h_TYfPPYUZRitFr9Y9Ifp-j7CaUCL0,403
 edu_rdm_integration/export_data/base/requests.py,sha256=-4Kn4hSl6IuKrpd8uIYTe4gO4Dz11HLfjJXLvmf9jTk,2576
@@ -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-2.2.0.dist-info/LICENSE,sha256=uw43Gjjj-1vXWCItfSrNDpbejnOwZMrNerUh8oWbq8Q,3458
-edu_rdm_integration-2.2.0.dist-info/METADATA,sha256=_aK2kxFaO9Pl5hBdB5Reic5cJZ3fBnIXxrgx9fbK0GM,57869
-edu_rdm_integration-2.2.0.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-edu_rdm_integration-2.2.0.dist-info/namespace_packages.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-edu_rdm_integration-2.2.0.dist-info/top_level.txt,sha256=nRJV0O14UtNE-jGIYG03sohgFnZClvf57H5m6VBXe9Y,20
-edu_rdm_integration-2.2.0.dist-info/RECORD,,
+edu_rdm_integration-3.0.0.dist-info/LICENSE,sha256=uw43Gjjj-1vXWCItfSrNDpbejnOwZMrNerUh8oWbq8Q,3458
+edu_rdm_integration-3.0.0.dist-info/METADATA,sha256=_8nLJtril424bXoqc4ZJkDNchqTF30-ISQXruCBIBVA,58912
+edu_rdm_integration-3.0.0.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+edu_rdm_integration-3.0.0.dist-info/namespace_packages.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+edu_rdm_integration-3.0.0.dist-info/top_level.txt,sha256=nRJV0O14UtNE-jGIYG03sohgFnZClvf57H5m6VBXe9Y,20
+edu_rdm_integration-3.0.0.dist-info/RECORD,,