edu-rdm-integration 3.13.0__py3-none-any.whl → 3.15.0__py3-none-any.whl

edu_rdm_integration/stages/collect_data/function_templates/function_collect_data_template/__init__.py-tpl

@@ -1,2 +1,6 @@
 # flake8: noqa
-default_app_config = '{{ function_python_path }}.apps.{{ camel_case_function_name }}Config'
+import django
+
+
+if django.VERSION < (3, 2):
+    default_app_config = '{{ function_python_path }}.apps.{{ camel_case_function_name }}Config'

edu_rdm_integration/stages/export_data/function_templates/function_export_data_template/__init__.py-tpl

@@ -1,2 +1,6 @@
 # flake8: noqa
-default_app_config = '{{ function_python_path }}.apps.{{ camel_case_function_name }}Config'
+import django
+
+
+if django.VERSION < (3, 2):
+    default_app_config = '{{ function_python_path }}.apps.{{ camel_case_function_name }}Config'

edu_rdm_integration/stages/upload_data/export_managers.py

@@ -115,11 +115,11 @@ class ExportQueueSender:
         return (
             RDMExportingDataSubStage.objects.filter(id__in=sub_stage_ids)
             .annotate(
-                attachment_id=F('exportingdatasubstageattachment__id'),
-                attachment_name=F('exportingdatasubstageattachment__attachment'),
-                attachment_size=F('exportingdatasubstageattachment__attachment_size'),
-                operation=F('exportingdatasubstageattachment__operation'),
-                entity=F('exportingdatasubstageentity__entity_id'),
+                attachment_id=F('rdmexportingdatasubstageattachment__id'),
+                attachment_name=F('rdmexportingdatasubstageattachment__attachment'),
+                attachment_size=F('rdmexportingdatasubstageattachment__attachment_size'),
+                operation=F('rdmexportingdatasubstageattachment__operation'),
+                entity=F('rdmexportingdatasubstageentity__entity_id'),
             )
             .order_by('id', 'operation')
             .values(

{edu_rdm_integration-3.13.0.dist-info → edu_rdm_integration-3.15.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: edu-rdm-integration
-Version: 3.13.0
+Version: 3.15.0
 Summary: Интеграция с Региональной витриной данных
 Author-email: BARS Group <education_dev@bars.group>
 Project-URL: Homepage, https://stash.bars-open.ru/projects/EDUBASE/repos/edu-rdm-integration/browse
@@ -16,6 +16,7 @@ Classifier: Framework :: Django :: 3.0
 Classifier: Framework :: Django :: 3.1
 Classifier: Framework :: Django :: 3.2
 Classifier: Framework :: Django :: 4.0
+Classifier: Framework :: Django :: 4.1
 Classifier: Intended Audience :: Developers
 Classifier: Environment :: Web Environment
 Requires-Python: >=3.9
@@ -369,7 +370,7 @@ INSTALLED_APPS = (
 
     ```
     # Общие настройки интеграции с РВД
-    [rmd_general]
+    [rdm_general]
     # Префикс идентификаторов записей сущностей специфический для продукта. Указывается в settings.py и не должен 
     # изменяться. Возможность изменения через конфигурационный файл оставлена для экстренных случаев.
     # EXPORT_ENTITY_ID_PREFIX = 

{edu_rdm_integration-3.13.0.dist-info → edu_rdm_integration-3.15.0.dist-info}/RECORD

@@ -84,7 +84,7 @@ edu_rdm_integration/stages/collect_data/models.py,sha256=hxB2JUF0U0d7Gr8UcPDEhON
 edu_rdm_integration/stages/collect_data/operations.py,sha256=eqE_npV6Z72UYatwncaxYhSCwoHv4H09uLtEg19dQ08,11849
 edu_rdm_integration/stages/collect_data/tests.py,sha256=qVSeJYWMCQkOVXP1sMe8XzCgdvRFXs9KdcOA_USLteQ,5550
 edu_rdm_integration/stages/collect_data/function_templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-edu_rdm_integration/stages/collect_data/function_templates/function_collect_data_template/__init__.py-tpl,sha256=wnHVZJb9qLDSBrWBNWKNd3vSwHfHl2QHB-WH_iN-OtQ,107
+edu_rdm_integration/stages/collect_data/function_templates/function_collect_data_template/__init__.py-tpl,sha256=pmUE0_cdK0_PUi0fhu25pcza04deRSfVpU63qPOFKQE,155
 edu_rdm_integration/stages/collect_data/function_templates/function_collect_data_template/apps.py-tpl,sha256=PU5vgYdhtqu440mRAtIzZ78eIc-no3CsPS3rr1kPpOU,319
 edu_rdm_integration/stages/collect_data/function_templates/function_collect_data_template/caches.py-tpl,sha256=J9b4q70tHicIIWBXYlTILFVGx_oW2_nlgPwXoptyljI,963
 edu_rdm_integration/stages/collect_data/function_templates/function_collect_data_template/consts.py-tpl,sha256=pds1t4eHzovm7Yz2o5je3UHqRE8gqfT2sL-IwpoBN_o,66
@@ -164,7 +164,7 @@ edu_rdm_integration/stages/export_data/models.py,sha256=eFu6R5SY5aTRXxMSUMn7Jxgq
 edu_rdm_integration/stages/export_data/operations.py,sha256=g8rj4TaFnkRkaBD4omckBTGwsTlYpuBydOwwxY9hEiI,13188
 edu_rdm_integration/stages/export_data/strategies.py,sha256=l_KXWbYanhhdJ1ldf_pSGO7IkUoXpOOPKhaOzTcqiJY,6519
 edu_rdm_integration/stages/export_data/function_templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-edu_rdm_integration/stages/export_data/function_templates/function_export_data_template/__init__.py-tpl,sha256=wnHVZJb9qLDSBrWBNWKNd3vSwHfHl2QHB-WH_iN-OtQ,107
+edu_rdm_integration/stages/export_data/function_templates/function_export_data_template/__init__.py-tpl,sha256=pmUE0_cdK0_PUi0fhu25pcza04deRSfVpU63qPOFKQE,155
 edu_rdm_integration/stages/export_data/function_templates/function_export_data_template/apps.py-tpl,sha256=PU5vgYdhtqu440mRAtIzZ78eIc-no3CsPS3rr1kPpOU,319
 edu_rdm_integration/stages/export_data/function_templates/function_export_data_template/caches.py-tpl,sha256=AS7ISHUSlkV-ODVDZ6-sDmkimKhTGKeAU5zXD3HA8Hw,1044
 edu_rdm_integration/stages/export_data/function_templates/function_export_data_template/consts.py-tpl,sha256=pds1t4eHzovm7Yz2o5je3UHqRE8gqfT2sL-IwpoBN_o,66
@@ -216,7 +216,7 @@ edu_rdm_integration/stages/upload_data/apps.py,sha256=aFhVPK-65b35CGKoAeAgQ0mm3S
 edu_rdm_integration/stages/upload_data/consts.py,sha256=yTygXxS5dBRCvrE7Q3D0jEGSC5apIKvVAAViDM8QcKA,223
 edu_rdm_integration/stages/upload_data/dataclasses.py,sha256=zwxlED6yEeMStfc-Y6pvdY7xF-530qbO0HBWfwneeI8,261
 edu_rdm_integration/stages/upload_data/enums.py,sha256=uGRqcflf6moPWfFa8KKbeSY2y88-AegAcRJKlQ1PA_Y,453
-edu_rdm_integration/stages/upload_data/export_managers.py,sha256=L2Qw8yCKueDhJdltuZJWbATTiBbDVrIwonWbkINd6mE,13631
+edu_rdm_integration/stages/upload_data/export_managers.py,sha256=DYHX0LwB6RkRqOEaB5EIWqbSJqjaUfR09AjRTjI2CR4,13646
 edu_rdm_integration/stages/upload_data/helpers.py,sha256=lCvM8QsERXRXP9rcpgaSQOKUkvi3bxkeHEC_zZruQy4,6183
 edu_rdm_integration/stages/upload_data/models.py,sha256=fUh_QeAsRajZYweefdDmlAaZh6Q25TSn8e8M3autrKE,5166
 edu_rdm_integration/stages/upload_data/operations.py,sha256=CVQYaucerJbOAE3JDO05FaX4Bz9hBMKBXYqJohXKZpI,6462
@@ -242,8 +242,8 @@ edu_rdm_integration/stages/upload_data/uploader_log/ui.py,sha256=mU3XA9zVKHGqzNk
 edu_rdm_integration/stages/upload_data/uploader_log/migrations/0001_initial.py,sha256=r5oOB7DBK9-mfuqPAgjXUJY5-hEcmMdILCwDTpaLnBc,753
 edu_rdm_integration/stages/upload_data/uploader_log/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edu_rdm_integration/stages/upload_data/uploader_log/templates/ui-js/object-grid-buttons.js,sha256=2xyGe0wdVokM0RhpzRzcRvJPBkBmPe3SlZry4oP4Nzs,6201
-edu_rdm_integration-3.13.0.dist-info/licenses/LICENSE,sha256=uw43Gjjj-1vXWCItfSrNDpbejnOwZMrNerUh8oWbq8Q,3458
-edu_rdm_integration-3.13.0.dist-info/METADATA,sha256=f7HDSRu472EvSWFnIruLfecC8mCWFvwJ8zfJJDpfxTk,39702
-edu_rdm_integration-3.13.0.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-edu_rdm_integration-3.13.0.dist-info/top_level.txt,sha256=nRJV0O14UtNE-jGIYG03sohgFnZClvf57H5m6VBXe9Y,20
-edu_rdm_integration-3.13.0.dist-info/RECORD,,
+edu_rdm_integration-3.15.0.dist-info/licenses/LICENSE,sha256=uw43Gjjj-1vXWCItfSrNDpbejnOwZMrNerUh8oWbq8Q,3458
+edu_rdm_integration-3.15.0.dist-info/METADATA,sha256=sggRxdYt0C1NHZOXlvApWjW3Zxgw72wlWUVh3YaSe7g,39741
+edu_rdm_integration-3.15.0.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+edu_rdm_integration-3.15.0.dist-info/top_level.txt,sha256=nRJV0O14UtNE-jGIYG03sohgFnZClvf57H5m6VBXe9Y,20
+edu_rdm_integration-3.15.0.dist-info/RECORD,,