edu-rdm-integration 0.8.2__py3-none-any.whl → 0.8.4__py3-none-any.whl

edu_rdm_integration/collect_data/base/helpers.py

@@ -0,0 +1,30 @@
+from typing import (
+    Tuple,
+)
+
+from edu_rdm_integration.adapters.helpers import (
+    WebEduFunctionHelper,
+    WebEduRunnerHelper,
+)
+from edu_rdm_integration.consts import (
+    ALL_OPERATIONS,
+    UPDATED_OPERATIONS,
+)
+
+
+class BaseCollectingDataRunnerHelper(WebEduRunnerHelper):
+    """
+    Базовый класс помощников ранеров функций сбора данных для интеграции с "Региональная витрина данных".
+    """
+
+
+class BaseCollectingDataFunctionHelper(WebEduFunctionHelper):
+    """
+    Базовый класс помощников функций сбора данных для интеграции с "Региональная витрина данных".
+    """
+
+    def get_filtered_operations(self, with_deleted: bool = False) -> Tuple[int]:
+        """
+        Возвращает кортеж отфильтрованных операций.
+        """
+        return ALL_OPERATIONS if with_deleted else UPDATED_OPERATIONS

edu_rdm_integration/collect_data/calculated/base/helpers.py

@@ -2,9 +2,9 @@ from typing import (
     Type,
 )
 
-from edu_rdm_integration.adapters.helpers import (
-    WebEduFunctionHelper,
-    WebEduRunnerHelper,
+from edu_rdm_integration.collect_data.base.helpers import (
+    BaseCollectingDataFunctionHelper,
+    BaseCollectingDataRunnerHelper,
 )
 from edu_rdm_integration.collect_data.calculated.base.caches import (
     BaseCollectingCalculatedExportedDataFunctionCacheStorage,
@@ -12,7 +12,7 @@ from edu_rdm_integration.collect_data.calculated.base.caches import (
 )
 
 
-class BaseCollectingCalculatedExportedDataRunnerHelper(WebEduRunnerHelper):
+class BaseCollectingCalculatedExportedDataRunnerHelper(BaseCollectingDataRunnerHelper):
     """
     Базовый класс помощников ранеров функций сбора расчетных данных для интеграции с "Региональная витрина данных".
     """
@@ -24,7 +24,7 @@ class BaseCollectingCalculatedExportedDataRunnerHelper(WebEduRunnerHelper):
         return BaseCollectingCalculatedExportedDataRunnerCacheStorage
 
 
-class BaseCollectingCalculatedExportedDataFunctionHelper(WebEduFunctionHelper):
+class BaseCollectingCalculatedExportedDataFunctionHelper(BaseCollectingDataFunctionHelper):
     """
     Базовый класс помощников функций сбора расчетных данных для интеграции с "Региональная витрина данных".
     """

edu_rdm_integration/collect_data/non_calculated/base/helpers.py

@@ -2,9 +2,9 @@ from typing import (
     Type,
 )
 
-from edu_rdm_integration.adapters.helpers import (
-    WebEduFunctionHelper,
-    WebEduRunnerHelper,
+from edu_rdm_integration.collect_data.base.helpers import (
+    BaseCollectingDataFunctionHelper,
+    BaseCollectingDataRunnerHelper,
 )
 from edu_rdm_integration.collect_data.non_calculated.base.caches import (
     BaseCollectingExportedDataFunctionCacheStorage,
@@ -12,7 +12,7 @@ from edu_rdm_integration.collect_data.non_calculated.base.caches import (
 )
 
 
-class BaseCollectingExportedDataRunnerHelper(WebEduRunnerHelper):
+class BaseCollectingExportedDataRunnerHelper(BaseCollectingDataRunnerHelper):
     """
     Базовый класс помощников ранеров функций сбора данных для интеграции с "Региональная витрина данных".
     """
@@ -24,7 +24,7 @@ class BaseCollectingExportedDataRunnerHelper(WebEduRunnerHelper):
         return BaseCollectingExportedDataRunnerCacheStorage
 
 
-class BaseCollectingExportedDataFunctionHelper(WebEduFunctionHelper):
+class BaseCollectingExportedDataFunctionHelper(BaseCollectingDataFunctionHelper):
     """
     Базовый класс помощников функций сбора данных для интеграции с "Региональная витрина данных".
     """

edu_rdm_integration/consts.py

@@ -1,3 +1,8 @@
+from educommon.integration_entities.enums import (
+    EntityLogOperation,
+)
+
+
 REGIONAL_DATA_MART_INTEGRATION_COLLECTING_DATA = 'regional_data_mart_integration_collecting_data'
 REGIONAL_DATA_MART_INTEGRATION_EXPORTING_DATA = 'regional_data_mart_integration_exporting_data'
 
@@ -25,3 +30,8 @@ ACADEMIC_YEAR = {
 }
 
 TASK_QUEUE_NAME = 'RDM'
+
+
+# Кортеж операций для обновления данных
+UPDATED_OPERATIONS = (EntityLogOperation.CREATE, EntityLogOperation.UPDATE)
+ALL_OPERATIONS = UPDATED_OPERATIONS + (EntityLogOperation.DELETE, )

edu_rdm_integration/models.py

@@ -834,8 +834,17 @@ class UploaderClientLog(Entry):
         """Статус-код запроса к витрине."""
         try:
             http_status = self.response.split(' ')[0].strip('[]')
-        except IndexError:
+
+            if not http_status:
+                return None
+
+            if 200 <= int(http_status) < 300:
+                http_status = "Успех"
+            elif int(http_status) >= 400:
+                http_status = "Ошибка"
+        except (IndexError, AttributeError):
             http_status = None
+
         return http_status
 
     @property

edu_rdm_integration/uploader_log/actions.py

@@ -25,7 +25,6 @@ from educommon.objectpack.actions import (
     ExtObjectRowsAction,
 )
 from educommon.objectpack.filters import (
-    BoolChoicesFilter,
     ColumnFilterEngine,
     DateFilterByAnnotatedField,
 )
@@ -34,6 +33,7 @@ from educommon.utils.object_grid import (
     boolean_column_renderer,
 )
 from educommon.utils.ui import (
+    ChoicesFilter,
     append_template_globals,
 )
 
@@ -41,6 +41,7 @@ from edu_rdm_integration.models import (
     UploaderClientLog,
 )
 from edu_rdm_integration.uploader_log.ui import (
+    UploaderLogListWindow,
     UploaderLogInfoWindow,
 )
 
@@ -53,6 +54,7 @@ class UploaderLogPack(ObjectPack):
     title = 'Журнал логов РВД'
     model = UploaderClientLog
 
+    list_window = UploaderLogListWindow
     edit_window = UploaderLogInfoWindow
 
     _is_primary_for_model = False
@@ -81,7 +83,7 @@ class UploaderLogPack(ObjectPack):
         {
             'header': 'URL',
             'data_index': 'request_url',
-            'searchable': True,
+            'searchable': False,
             'sortable': False,
             'width': 21,
         },
@@ -142,7 +144,11 @@ class UploaderLogPack(ObjectPack):
             'header': 'Режим эмуляции',
             'data_index': 'is_emulation',
             'sortable': False,
-            'filter': BoolChoicesFilter('is_emulation'),
+            'filter': ChoicesFilter(
+                choices=((True, 'Да'), (False, 'Нет')),
+                parser='boolean',
+                lookup='is_emulation',
+            ),
             'column_renderer': boolean_column_renderer(),
             'width': 5,
         }
@@ -151,7 +157,6 @@ class UploaderLogPack(ObjectPack):
     def __init__(self):
         """Инициализация."""
         super(UploaderLogPack, self).__init__()
-
         self.edit_window_action.perm_code = 'view'
         self.replace_action('rows_action', ExtObjectRowsAction())
 
@@ -164,7 +169,7 @@ class UploaderLogPack(ObjectPack):
     def get_row(self, row_id: Optional[int]) -> 'UploaderClientLog':
         """Возвращает объект по идентификатору."""
         if row_id:
-            record = self.model.base_objects.get(id=row_id)
+            record = self.model.objects.get(id=row_id)
         else:
             record = super().get_row(row_id)
 

edu_rdm_integration/uploader_log/ui.py

@@ -3,6 +3,7 @@ from m3_ext.ui.fields import (
 )
 from objectpack.ui import (
     BaseEditWindow,
+    BaseListWindow,
 )
 
 from educommon.utils.ui import (
@@ -16,7 +17,6 @@ class UploaderLogInfoWindow(BaseEditWindow):
     def _init_components(self):
         """Инициализация компонентов окна."""
         super(UploaderLogInfoWindow, self)._init_components()
-
         self.field__request = ExtTextArea(
             label='Запрос',
             name='request',
@@ -62,3 +62,13 @@ class UploaderLogInfoWindow(BaseEditWindow):
 
         switch_window_in_read_only_mode(self)
         self.make_read_only()
+
+
+class UploaderLogListWindow(BaseListWindow):
+    """Окно для списка  логов Загрузчика данных в витрину."""
+
+    def _init_components(self):
+        super()._init_components()
+
+        self.grid.allow_paging = True
+        self.grid.paging_bar.page_size = 35

{edu_rdm_integration-0.8.2.dist-info → edu_rdm_integration-0.8.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: edu-rdm-integration
-Version: 0.8.2
+Version: 0.8.4
 Summary: Интеграция с Региональной витриной данных
 Home-page: 
 Download-URL: 
@@ -289,6 +289,24 @@ Requires-Dist: uploader-client <1,>=0.2.1
 
 ### Удалено
 
+## [0.8.4] - 2023-12-13
+
+Создание базовых хэлперов BaseCollectingDataFunctionHelper, BaseCollectingDataRunnerHelper.
+Создание нового метода get_filtered_operations в BaseCollectingDataFunctionHelper.
+
+### Добавлено
+
+- [EDUSCHL-21029](https://jira.bars.group/browse/EDUSCHL-21029)
+  MINOR Создание базовых хэлперов.
+
+## [0.8.3] - 2023-12-13
+
+Исправление ошибок и несоответствий в журнале логов
+### Изменено
+
+- [EDUCLLG-8103](https://jira.bars.group/browse/EDUCLLG-8103)
+  MINOR Исправление ошибок и несоответствий в журнале логов .
+
 ## [0.8.2] - 2023-12-11
 
 Поднятие версии m3-db-utils,изменение UploaderClientLogManager

{edu_rdm_integration-0.8.2.dist-info → edu_rdm_integration-0.8.4.dist-info}/RECORD

@@ -1,11 +1,11 @@
 edu_rdm_integration/__init__.py,sha256=fVCvQ7QGI_iCyAeE8dMapyY8gOM617ye5GQqAVGPlZI,72
 edu_rdm_integration/app_settings.py,sha256=kideEO9SvYU8RXPB-8hTVosL4bAspPHNHtyz-R0F7v4,1822
 edu_rdm_integration/apps.py,sha256=5OgNdmuqe26fbu4wYb69haQJe-XFO_rDbnU1vPqJU-U,3571
-edu_rdm_integration/consts.py,sha256=chOsPOOY4_JLzN-8idg-VjbLWSlp6r3maFWqnvUsapg,806
+edu_rdm_integration/consts.py,sha256=FFwcMHNsfjP_s9LfkccLAHjJMEMp7ppPmrRlJcgV88k,1104
 edu_rdm_integration/entities.py,sha256=mAjsYlcIbemo4xT5CSCr4payZubiBHB7Rb3Ow1CVsy0,14552
 edu_rdm_integration/enums.py,sha256=6Gv_hpYrC6v75ZtBA_xBrHqvza9NbJKhMa1TdTHkzys,4048
 edu_rdm_integration/mapping.py,sha256=bwa2fJCbV4YjQcAgRrgT3hgM6dJhr_uBtQgx3L3F2Ck,473
-edu_rdm_integration/models.py,sha256=tC3mghWG9Z14nMHpDV1ywcaV2RMydsLPHJcrgdKBkas,27232
+edu_rdm_integration/models.py,sha256=nc9dpCFWGrDHqX_ErB8JtajG6__9YjddzYBed3S7ZX8,27489
 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/utils.py,sha256=vjme0N6tEXnHt6SaqjavZshjwc-mVv4X3Pz37a5YgTw,7092
@@ -34,6 +34,7 @@ edu_rdm_integration/collect_data/tests.py,sha256=I_xLu1qwEhC3nikH3D8gJNJPwJrjYV7
 edu_rdm_integration/collect_data/base/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edu_rdm_integration/collect_data/base/caches.py,sha256=3BaJxYBk9fi0aiAVzym-Jz8aNP1eSOqh4Y8OVw1HnSg,763
 edu_rdm_integration/collect_data/base/functions.py,sha256=HT23EyiD-H50p4NLx2_LtioktTHHFVLRmAgWdbuHErw,2379
+edu_rdm_integration/collect_data/base/helpers.py,sha256=ONbPEELI_9ImpqCLrdIL3kb9aIQ2xQcF6XMa2C5KlDw,1017
 edu_rdm_integration/collect_data/base/managers.py,sha256=izbIHAwLAPHSP4a_Gte3AVNkcbczq06ouB6onKx4mBk,8205
 edu_rdm_integration/collect_data/base/mixins.py,sha256=Rp3ECccl3vOWZH2QHR_ArAbibQMq92IMGPoP5XAfgVc,3180
 edu_rdm_integration/collect_data/base/runners.py,sha256=OjhdTmMab6dCoIZp2zmXZTK4H5Haz__QHddwGxjOuB0,2829
@@ -45,7 +46,7 @@ edu_rdm_integration/collect_data/calculated/base/consts.py,sha256=DsgPOF_2iCzZTP
 edu_rdm_integration/collect_data/calculated/base/enums.py,sha256=BSmwrkzYwEQhz9NbZCJsldY532PqgZJzxzsVk6ue0bM,93
 edu_rdm_integration/collect_data/calculated/base/errors.py,sha256=bDVjmB43pZJ2C8sNnqF177qMB4l_XskDpVTFqTmxjj8,326
 edu_rdm_integration/collect_data/calculated/base/functions.py,sha256=x9kM8DQGkdzgybMhbu0CQBpdJNiSJyKLAJMNcO1FueI,1670
-edu_rdm_integration/collect_data/calculated/base/helpers.py,sha256=CgsoBujMsd1z17PhilAXo5wk08dyZTAQfzd3vtpdxYA,1490
+edu_rdm_integration/collect_data/calculated/base/helpers.py,sha256=CLfqei9apxRNCgoemwVhzh2h5RvLzQXtRO4V7P6BLa8,1547
 edu_rdm_integration/collect_data/calculated/base/managers.py,sha256=lE25p_nxXYDyksGIjz8g2DHZKb0MJpBZ3FjzNKy1k54,838
 edu_rdm_integration/collect_data/calculated/base/presenters.py,sha256=enTNDOCoIEeoQK4r2CaSzU6jVgFt5Cd1HOYgdk1Wj5c,438
 edu_rdm_integration/collect_data/calculated/base/results.py,sha256=5anIB_kRrSJm2I9fN5O3AYrNJugjgqFRd-wpdAc0o0I,708
@@ -61,7 +62,7 @@ edu_rdm_integration/collect_data/non_calculated/base/consts.py,sha256=pds1t4eHzo
 edu_rdm_integration/collect_data/non_calculated/base/enums.py,sha256=BSmwrkzYwEQhz9NbZCJsldY532PqgZJzxzsVk6ue0bM,93
 edu_rdm_integration/collect_data/non_calculated/base/errors.py,sha256=dGawEQ2ItTxlFt9ynhYhpqx40Qmrlg2rOskH0DsNVnQ,297
 edu_rdm_integration/collect_data/non_calculated/base/functions.py,sha256=9Ua2793iwegv2cwkA4rhmxBmXL0BFRzuct9puSkdjBU,1563
-edu_rdm_integration/collect_data/non_calculated/base/helpers.py,sha256=5tKnzBJUG7Z6ufYMTCz1Mdm8tythY7CqmC24PNkFXKE,1376
+edu_rdm_integration/collect_data/non_calculated/base/helpers.py,sha256=38hwAmKEWngUpmjOvCn9fUDAQ9TMISGtVnZA3zZSaRw,1433
 edu_rdm_integration/collect_data/non_calculated/base/managers.py,sha256=dBMh0yrdG5qL2NFAKPytejNOjnicBt2ZrN8coeGZmKI,783
 edu_rdm_integration/collect_data/non_calculated/base/presenters.py,sha256=TYjWlajWv3R2mwPoI1fbCDMZFTeLxQrL_ZgsTHei5_0,409
 edu_rdm_integration/collect_data/non_calculated/base/results.py,sha256=GWhPSmAM1Ikt5p6Q01yw86iEQ0fJR_hA03IQa7O6aUI,674
@@ -140,14 +141,14 @@ edu_rdm_integration/migrations/0006_request_status_data.py,sha256=g5JZtP0q0fOrbK
 edu_rdm_integration/migrations/0007_delete_upload_status.py,sha256=GAQKX6N1vDDWiCTXLGg--0gzLQr7VveAPFYzC9QpUpU,457
 edu_rdm_integration/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edu_rdm_integration/uploader_log/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-edu_rdm_integration/uploader_log/actions.py,sha256=CIFfmft5m7Nnl_9Drw7FdCVWr9htKJcbcimb4Dcl3EQ,6568
+edu_rdm_integration/uploader_log/actions.py,sha256=SGYYYNL4MdST1FYCZBCYAxj3_-PsJ8IcXBYwxpZqucg,6755
 edu_rdm_integration/uploader_log/apps.py,sha256=tYJj4-sDlq8fLOSvw18L_yys7SILpTKWNmE2Qug6GnE,265
 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=i3q4dNYiKPcZMP3QgbKFD0aTysBntXE-Hu_B6nSjrYU,1789
-edu_rdm_integration-0.8.2.dist-info/LICENSE,sha256=uw43Gjjj-1vXWCItfSrNDpbejnOwZMrNerUh8oWbq8Q,3458
-edu_rdm_integration-0.8.2.dist-info/METADATA,sha256=-_Kx5oGvNuTRkh5hMYULM1rlu_kecx7gn0gSSZzu9f0,46433
-edu_rdm_integration-0.8.2.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-edu_rdm_integration-0.8.2.dist-info/namespace_packages.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-edu_rdm_integration-0.8.2.dist-info/top_level.txt,sha256=nRJV0O14UtNE-jGIYG03sohgFnZClvf57H5m6VBXe9Y,20
-edu_rdm_integration-0.8.2.dist-info/RECORD,,
+edu_rdm_integration/uploader_log/ui.py,sha256=YM9Buqp2wxE95Wf5gvAATBzuYzDOossK1sEmvFk07cI,2110
+edu_rdm_integration-0.8.4.dist-info/LICENSE,sha256=uw43Gjjj-1vXWCItfSrNDpbejnOwZMrNerUh8oWbq8Q,3458
+edu_rdm_integration-0.8.4.dist-info/METADATA,sha256=38i9e_ptucbQ04R8Agb7kUL3tfgV5FRGfHZsmxba3pw,47139
+edu_rdm_integration-0.8.4.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+edu_rdm_integration-0.8.4.dist-info/namespace_packages.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+edu_rdm_integration-0.8.4.dist-info/top_level.txt,sha256=nRJV0O14UtNE-jGIYG03sohgFnZClvf57H5m6VBXe9Y,20
+edu_rdm_integration-0.8.4.dist-info/RECORD,,