edu-rdm-integration 3.4.2__py3-none-any.whl → 3.4.3__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- edu_rdm_integration/migrations/0013_set_attachment_size.py +23 -14
- {edu_rdm_integration-3.4.2.dist-info → edu_rdm_integration-3.4.3.dist-info}/METADATA +10 -1
- {edu_rdm_integration-3.4.2.dist-info → edu_rdm_integration-3.4.3.dist-info}/RECORD +7 -7
- {edu_rdm_integration-3.4.2.dist-info → edu_rdm_integration-3.4.3.dist-info}/LICENSE +0 -0
- {edu_rdm_integration-3.4.2.dist-info → edu_rdm_integration-3.4.3.dist-info}/WHEEL +0 -0
- {edu_rdm_integration-3.4.2.dist-info → edu_rdm_integration-3.4.3.dist-info}/namespace_packages.txt +0 -0
- {edu_rdm_integration-3.4.2.dist-info → edu_rdm_integration-3.4.3.dist-info}/top_level.txt +0 -0
@@ -7,33 +7,42 @@ from django.db import (
|
|
7
7
|
from edu_rdm_integration.enums import (
|
8
8
|
FileUploadStatusEnum,
|
9
9
|
)
|
10
|
+
from educommon.utils.seqtools import (
|
11
|
+
make_chunks,
|
12
|
+
)
|
10
13
|
|
11
14
|
|
12
15
|
# Значение размера файла по умолчанию (если файл не найден)
|
13
16
|
ATTACHMENT_SIZES = 10_485_760
|
17
|
+
CHUNK_SIZE = 500
|
14
18
|
|
15
19
|
|
16
20
|
def set_attachment_size(apps, schema_editor):
|
17
21
|
"""Установка размера файла по умолчанию."""
|
18
|
-
ExportingDataSubStageAttachment = apps.get_model(
|
19
|
-
|
22
|
+
ExportingDataSubStageAttachment = apps.get_model(
|
23
|
+
'edu_rdm_integration', 'ExportingDataSubStageAttachment'
|
24
|
+
) # noqa: N806
|
25
|
+
ExportingDataSubStageUploaderClientLog = apps.get_model(
|
26
|
+
'edu_rdm_integration', 'ExportingDataSubStageUploaderClientLog'
|
27
|
+
) # noqa: N806
|
20
28
|
|
21
29
|
attachment_ids = ExportingDataSubStageUploaderClientLog.objects.filter(
|
22
30
|
file_upload_status=FileUploadStatusEnum.IN_PROGRESS
|
23
|
-
).values_list('attachment_id', flat=True)
|
31
|
+
).values_list('attachment_id', flat=True).iterator()
|
24
32
|
|
25
33
|
sub_stage_with_deleted_attachments = []
|
26
|
-
for
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
sub_stage_attachment.
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
34
|
+
for chunked_attachment_ids in make_chunks(attachment_ids, CHUNK_SIZE):
|
35
|
+
for sub_stage_attachment in ExportingDataSubStageAttachment.objects.filter(
|
36
|
+
attachment_size__isnull=True,
|
37
|
+
id__in=chunked_attachment_ids,
|
38
|
+
):
|
39
|
+
if sub_stage_attachment.attachment.field.storage.exists(sub_stage_attachment.attachment.name):
|
40
|
+
sub_stage_attachment.attachment_size = sub_stage_attachment.attachment.size
|
41
|
+
else:
|
42
|
+
sub_stage_attachment.attachment_size = ATTACHMENT_SIZES
|
43
|
+
sub_stage_with_deleted_attachments.append(sub_stage_attachment)
|
44
|
+
|
45
|
+
ExportingDataSubStageAttachment.objects.bulk_update(sub_stage_with_deleted_attachments, ['attachment_size'])
|
37
46
|
|
38
47
|
|
39
48
|
class Migration(migrations.Migration):
|
@@ -1,6 +1,6 @@
|
|
1
1
|
Metadata-Version: 2.1
|
2
2
|
Name: edu-rdm-integration
|
3
|
-
Version: 3.4.
|
3
|
+
Version: 3.4.3
|
4
4
|
Summary: Интеграция с Региональной витриной данных
|
5
5
|
Home-page:
|
6
6
|
Download-URL:
|
@@ -302,6 +302,15 @@ Requires-Dist: uploader-client <1,>=0.2.1
|
|
302
302
|
### Удалено
|
303
303
|
|
304
304
|
|
305
|
+
## 3.4.3 - 2024-10-17
|
306
|
+
Исправлена миграция простановки размеров файлов выгрузки в модель ExportingDataSubStageAttachment
|
307
|
+
|
308
|
+
|
309
|
+
## Исправлено
|
310
|
+
- [EDUSCHL-22651](https://jira.bars.group/browse/EDUSCHL-22651)
|
311
|
+
Исправлена миграция простановки размеров файлов выгрузки в модель ExportingDataSubStageAttachment
|
312
|
+
|
313
|
+
|
305
314
|
## 3.4.2 - 2024-10-15
|
306
315
|
Добавлены отдельные параметры по управлению временем запуска UploadDataAsyncTask
|
307
316
|
|
@@ -162,7 +162,7 @@ edu_rdm_integration/migrations/0009_auto_20240522_1619.py,sha256=hz8cBq6m18XK5Pb
|
|
162
162
|
edu_rdm_integration/migrations/0010_transferredentity_export_enabled.py,sha256=LJH7QY_1GLWSHLRPB--9PPypPiQd4pAT2-oIOEF84DY,507
|
163
163
|
edu_rdm_integration/migrations/0011_exportingdatasubstageentity.py,sha256=2BfIif_hkFv1h6VEfe0Ys4J_uk6LR9YtO711ocDYPso,1263
|
164
164
|
edu_rdm_integration/migrations/0012_exportingdatasubstageattachment_attachment_size.py,sha256=y_JQO69k9pEfrJyimaRiAOBmhaJmssIyepCGd-Sy9hs,511
|
165
|
-
edu_rdm_integration/migrations/0013_set_attachment_size.py,sha256=
|
165
|
+
edu_rdm_integration/migrations/0013_set_attachment_size.py,sha256=8-AJpnIViGUh9Q2aMegUPqyw-fthcL-7Ppbm7IvlRms,2047
|
166
166
|
edu_rdm_integration/migrations/0014_uploaddatacommand.py,sha256=Hh0vKKiGgKOvY1kBAcmway4dSYUXwVArHAc9YrsjCIU,2079
|
167
167
|
edu_rdm_integration/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
168
168
|
edu_rdm_integration/registry/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
@@ -176,9 +176,9 @@ edu_rdm_integration/uploader_log/enums.py,sha256=rgSO3BL2rh2xpfm0Pt4waQW8fB1VMJL
|
|
176
176
|
edu_rdm_integration/uploader_log/managers.py,sha256=y5wTSMzF9hpOpIU_A7nIafL_LBU3QEie6LAYWoB-pBQ,3203
|
177
177
|
edu_rdm_integration/uploader_log/ui.py,sha256=YM9Buqp2wxE95Wf5gvAATBzuYzDOossK1sEmvFk07cI,2110
|
178
178
|
edu_rdm_integration/uploader_log/templates/ui-js/object-grid-buttons.js,sha256=2xyGe0wdVokM0RhpzRzcRvJPBkBmPe3SlZry4oP4Nzs,6201
|
179
|
-
edu_rdm_integration-3.4.
|
180
|
-
edu_rdm_integration-3.4.
|
181
|
-
edu_rdm_integration-3.4.
|
182
|
-
edu_rdm_integration-3.4.
|
183
|
-
edu_rdm_integration-3.4.
|
184
|
-
edu_rdm_integration-3.4.
|
179
|
+
edu_rdm_integration-3.4.3.dist-info/LICENSE,sha256=uw43Gjjj-1vXWCItfSrNDpbejnOwZMrNerUh8oWbq8Q,3458
|
180
|
+
edu_rdm_integration-3.4.3.dist-info/METADATA,sha256=KrZldin3ISdx9GGgOgSj6D9nsJ8HkBkEAMrKTAQJPxc,75074
|
181
|
+
edu_rdm_integration-3.4.3.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
|
182
|
+
edu_rdm_integration-3.4.3.dist-info/namespace_packages.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
|
183
|
+
edu_rdm_integration-3.4.3.dist-info/top_level.txt,sha256=nRJV0O14UtNE-jGIYG03sohgFnZClvf57H5m6VBXe9Y,20
|
184
|
+
edu_rdm_integration-3.4.3.dist-info/RECORD,,
|
File without changes
|
File without changes
|
{edu_rdm_integration-3.4.2.dist-info → edu_rdm_integration-3.4.3.dist-info}/namespace_packages.txt
RENAMED
File without changes
|
File without changes
|