edu-rdm-integration 0.7.0__py3-none-any.whl → 0.7.2__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/collect_data/base/managers.py +8 -7
- edu_rdm_integration/collect_data/generators.py +2 -2
- edu_rdm_integration/collect_data/tests.py +2 -0
- {edu_rdm_integration-0.7.0.dist-info → edu_rdm_integration-0.7.2.dist-info}/METADATA +23 -1
- {edu_rdm_integration-0.7.0.dist-info → edu_rdm_integration-0.7.2.dist-info}/RECORD +9 -9
- {edu_rdm_integration-0.7.0.dist-info → edu_rdm_integration-0.7.2.dist-info}/LICENSE +0 -0
- {edu_rdm_integration-0.7.0.dist-info → edu_rdm_integration-0.7.2.dist-info}/WHEEL +0 -0
- {edu_rdm_integration-0.7.0.dist-info → edu_rdm_integration-0.7.2.dist-info}/namespace_packages.txt +0 -0
- {edu_rdm_integration-0.7.0.dist-info → edu_rdm_integration-0.7.2.dist-info}/top_level.txt +0 -0
@@ -148,16 +148,17 @@ class BaseCollectingDataRunnerManager(WebEduRunnerManager, metaclass=ABCMeta):
|
|
148
148
|
loggable_models.update(entity.loggable_models)
|
149
149
|
# TODO: EDUSCHL-20938 Произвести рефакторинг plugins_info.
|
150
150
|
if hasattr(entity, 'plugins_info'):
|
151
|
-
for app_name,
|
151
|
+
for app_name, app_contents in entity.plugins_info.items():
|
152
152
|
if not apps.is_installed(app_name):
|
153
153
|
continue
|
154
154
|
|
155
|
-
|
156
|
-
|
157
|
-
|
158
|
-
|
159
|
-
|
160
|
-
|
155
|
+
for app_content in app_contents:
|
156
|
+
app_label, model_name = app_content.split('.')
|
157
|
+
try:
|
158
|
+
model = apps.get_model(app_label=app_label, model_name=model_name)
|
159
|
+
loggable_models.add(model)
|
160
|
+
except (ValueError, LookupError):
|
161
|
+
continue
|
161
162
|
|
162
163
|
return loggable_models
|
163
164
|
|
@@ -158,8 +158,8 @@ class BaseFirstCollectModelsDataCommandsGenerator:
|
|
158
158
|
|
159
159
|
for rdm_model in self.regional_data_mart_models:
|
160
160
|
|
161
|
-
# Если не заполнен creating_trigger_models, то список не формируется
|
162
|
-
if not rdm_model.creating_trigger_models:
|
161
|
+
# Если не заполнен creating_trigger_models и plugins_info, то список не формируется
|
162
|
+
if not rdm_model.creating_trigger_models and not getattr(rdm_model, 'plugins_info', None):
|
163
163
|
continue
|
164
164
|
|
165
165
|
if self.splitter:
|
@@ -157,6 +157,8 @@ class BaseCollectingFunctionTestCase(TestCase):
|
|
157
157
|
fields[key] = value.strftime('%Y-%m-%d %H:%M:%S.%f%z')
|
158
158
|
elif isinstance(value, datetime.date):
|
159
159
|
fields[key] = value.strftime('%Y-%m-%d')
|
160
|
+
elif isinstance(value, datetime.time):
|
161
|
+
fields[key] = value.strftime('%H:%M:%S')
|
160
162
|
elif isinstance(value, bool):
|
161
163
|
fields[key] = 't' if value else 'f'
|
162
164
|
elif isinstance(value, (int, float, uuid.UUID, decimal.Decimal)):
|
@@ -1,6 +1,6 @@
|
|
1
1
|
Metadata-Version: 2.1
|
2
2
|
Name: edu-rdm-integration
|
3
|
-
Version: 0.7.
|
3
|
+
Version: 0.7.2
|
4
4
|
Summary: Интеграция с Региональной витриной данных
|
5
5
|
Home-page:
|
6
6
|
Download-URL:
|
@@ -289,6 +289,28 @@ Requires-Dist: uploader-client <1,>=0.2.1
|
|
289
289
|
|
290
290
|
### Удалено
|
291
291
|
|
292
|
+
## [0.7.2] - 2023-12-05
|
293
|
+
|
294
|
+
В метод _clean_data класса BaseCollectingFunctionTestCase добавлена возможность обрабатывать поля относящиеся к
|
295
|
+
временному типу.
|
296
|
+
Добавление обработки plugins_info при генерации списка данных формирования команд.
|
297
|
+
|
298
|
+
### Добавлено
|
299
|
+
|
300
|
+
- [EDUSCHL-19507](https://jira.bars.group/browse/EDUSCHL-19507)
|
301
|
+
PATCH В метод _clean_data класса BaseCollectingFunctionTestCase добавлена возможность обрабатывать поля относящиеся к
|
302
|
+
временному типу.
|
303
|
+
- [EDUSCHL-19507](https://jira.bars.group/browse/EDUSCHL-19507)
|
304
|
+
PATCH Добавление обработки plugins_info при генерации списка данных формирования команд.
|
305
|
+
|
306
|
+
## [0.7.1] - 2023-12-02
|
307
|
+
|
308
|
+
Доработано получение множества моделей на основе данных plugins_info при работе метода _get_loggable_models.
|
309
|
+
|
310
|
+
### Изменено
|
311
|
+
|
312
|
+
- [EDUSCHL-19576](https://jira.bars.group/browse/EDUSCHL-20954)
|
313
|
+
PATCH Доработано получение множества моделей на основе данных plugins_info при работе метода _get_loggable_models.
|
292
314
|
|
293
315
|
## [0.7.0] - 2023-12-02
|
294
316
|
|
@@ -28,13 +28,13 @@ edu_rdm_integration/adapters/tests.py,sha256=MoRY-a75Ow-7EjeQYxkXWunwqTGuBMaUyEk
|
|
28
28
|
edu_rdm_integration/adapters/validators.py,sha256=LJWnCY8PtXDOj-fm3fBWjQYsHsSLfyKf_D97pqPv73s,496
|
29
29
|
edu_rdm_integration/collect_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
30
30
|
edu_rdm_integration/collect_data/collect.py,sha256=LjMjBwf4nQ5KGkbMun6wx-sF6TZfibRqWGdwDTrUwVY,14068
|
31
|
-
edu_rdm_integration/collect_data/generators.py,sha256=
|
31
|
+
edu_rdm_integration/collect_data/generators.py,sha256=61DdPF8d0BRmvGJSYVA7wz3HmDpbbdStU4lBoJ0sUdY,9053
|
32
32
|
edu_rdm_integration/collect_data/helpers.py,sha256=pthYW-ugOww5TveWxONYcJby2VwWG6goJwbdTkNdVUU,3009
|
33
|
-
edu_rdm_integration/collect_data/tests.py,sha256=
|
33
|
+
edu_rdm_integration/collect_data/tests.py,sha256=I_xLu1qwEhC3nikH3D8gJNJPwJrjYV7duJYu3IjP-oo,5271
|
34
34
|
edu_rdm_integration/collect_data/base/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
35
35
|
edu_rdm_integration/collect_data/base/caches.py,sha256=3BaJxYBk9fi0aiAVzym-Jz8aNP1eSOqh4Y8OVw1HnSg,763
|
36
36
|
edu_rdm_integration/collect_data/base/functions.py,sha256=HT23EyiD-H50p4NLx2_LtioktTHHFVLRmAgWdbuHErw,2379
|
37
|
-
edu_rdm_integration/collect_data/base/managers.py,sha256=
|
37
|
+
edu_rdm_integration/collect_data/base/managers.py,sha256=izbIHAwLAPHSP4a_Gte3AVNkcbczq06ouB6onKx4mBk,8205
|
38
38
|
edu_rdm_integration/collect_data/base/mixins.py,sha256=Rp3ECccl3vOWZH2QHR_ArAbibQMq92IMGPoP5XAfgVc,3180
|
39
39
|
edu_rdm_integration/collect_data/base/runners.py,sha256=OjhdTmMab6dCoIZp2zmXZTK4H5Haz__QHddwGxjOuB0,2829
|
40
40
|
edu_rdm_integration/collect_data/calculated/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
@@ -135,9 +135,9 @@ edu_rdm_integration/migrations/0001_initial.py,sha256=toNuYoHZePe5wJ6AKEW9oPOdt2
|
|
135
135
|
edu_rdm_integration/migrations/0002_init_data_uploadstatus.py,sha256=kht966YNuDbC3qTGrcWswJPsVuAtNO59Ck15G2eS2bU,944
|
136
136
|
edu_rdm_integration/migrations/0003_create_index_file_upload_status.py,sha256=TiLnqQ8bxkVI7sRa5-D3JQ6jopFYDoH1ytSxmU6USUo,735
|
137
137
|
edu_rdm_integration/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
138
|
-
edu_rdm_integration-0.7.
|
139
|
-
edu_rdm_integration-0.7.
|
140
|
-
edu_rdm_integration-0.7.
|
141
|
-
edu_rdm_integration-0.7.
|
142
|
-
edu_rdm_integration-0.7.
|
143
|
-
edu_rdm_integration-0.7.
|
138
|
+
edu_rdm_integration-0.7.2.dist-info/LICENSE,sha256=uw43Gjjj-1vXWCItfSrNDpbejnOwZMrNerUh8oWbq8Q,3458
|
139
|
+
edu_rdm_integration-0.7.2.dist-info/METADATA,sha256=Jj94orw2kybIow-ejyt_m-Ugn50xUlelkQXJIFLg5nM,44463
|
140
|
+
edu_rdm_integration-0.7.2.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
|
141
|
+
edu_rdm_integration-0.7.2.dist-info/namespace_packages.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
|
142
|
+
edu_rdm_integration-0.7.2.dist-info/top_level.txt,sha256=nRJV0O14UtNE-jGIYG03sohgFnZClvf57H5m6VBXe9Y,20
|
143
|
+
edu_rdm_integration-0.7.2.dist-info/RECORD,,
|
File without changes
|
File without changes
|
{edu_rdm_integration-0.7.0.dist-info → edu_rdm_integration-0.7.2.dist-info}/namespace_packages.txt
RENAMED
File without changes
|
File without changes
|