Roque wendelin quick

See merge request !91

bt5/erp5_wendelin/SkinTemplateItem/portal_skins/erp5_wendelin/ERP5Site_getDataStreamList.py → bt5/erp5_wendelin/SkinTemplateItem/portal_skins/erp5_wendelin/DataSet_getDataStreamList.py

@@ -2,7 +2,7 @@
 This script will return all Data streams for Data set
 """
 catalog_kw = {'portal_type': 'Data Ingestion Line',
-              'aggregate_uid': data_set_uid,
+              'aggregate_uid': context.getUid(),
               'limit': limit,
               }
 data_ingestion_line_list = context.portal_catalog(**catalog_kw)

bt5/erp5_wendelin_data_lake_ingestion/SkinTemplateItem/portal_skins/erp5_wendelin_data_lake/DataSet_getDataStreamList.xml → bt5/erp5_wendelin/SkinTemplateItem/portal_skins/erp5_wendelin/DataSet_getDataStreamList.xml

@@ -50,12 +50,16 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string></string> </value>
+            <value> <string>limit=[]</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>DataSet_getDataStreamList</string> </value>
         </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string></string> </value>
+        </item>
       </dictionary>
     </pickle>
   </record>

bt5/erp5_wendelin/SkinTemplateItem/portal_skins/erp5_wendelin/DataSet_getDataStreamRowList.py

 """
 Get list of Data Streams for context Data set.
 """
-data_set_uid = context.getUid()
-return context.ERP5Site_getDataStreamList(data_set_uid, limit)
+return context.DataSet_getDataStreamList(limit)

bt5/erp5_wendelin/SkinTemplateItem/portal_skins/erp5_wendelin/ERP5Site_getDataStreamList.xml

-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>Script_magic</string> </key>
-            <value> <int>3</int> </value>
-        </item>
-        <item>
-            <key> <string>_bind_names</string> </key>
-            <value>
-              <object>
-                <klass>
-                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
-                </klass>
-                <tuple/>
-                <state>
-                  <dictionary>
-                    <item>
-                        <key> <string>_asgns</string> </key>
-                        <value>
-                          <dictionary>
-                            <item>
-                                <key> <string>name_container</string> </key>
-                                <value> <string>container</string> </value>
-                            </item>
-                            <item>
-                                <key> <string>name_context</string> </key>
-                                <value> <string>context</string> </value>
-                            </item>
-                            <item>
-                                <key> <string>name_m_self</string> </key>
-                                <value> <string>script</string> </value>
-                            </item>
-                            <item>
-                                <key> <string>name_subpath</string> </key>
-                                <value> <string>traverse_subpath</string> </value>
-                            </item>
-                          </dictionary>
-                        </value>
-                    </item>
-                  </dictionary>
-                </state>
-              </object>
-            </value>
-        </item>
-        <item>
-            <key> <string>_params</string> </key>
-            <value> <string>data_set_uid, limit=[]</string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>ERP5Site_getDataStreamList</string> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string></string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>

bt5/erp5_wendelin_data_lake_ingestion/SkinTemplateItem/portal_skins/erp5_wendelin_data_lake/DataSet_getDataStreamList.py

-"""
-  Return list of Data Streams belonging to a Date Set.
-  Data Ingestion line aggregates both Data Set and Data Stream.
-
-  Note: This code is quite computationally costly (for Data Streams having thousands of iles) as it needs to:
-  1. Query MariaDB to find ingestion lines
-  2. Read from ZODB both Data Ingestion Lines and Data Streams (which itself can be big too)
-"""
-data_ingestion_line_list = context.portal_catalog(
-                             portal_type = "Data Ingestion Line",
-                             aggregate_uid = context.getUid())
-return [x.getAggregateValue(portal_type = "Data Stream") \
-          for x in data_ingestion_line_list]

bt5/erp5_wendelin_data_lake_ingestion/SkinTemplateItem/portal_skins/erp5_wendelin_data_lake/ERP5Site_getDataStreamCount.py

@@ -13,7 +13,6 @@ except Exception as e:
   log("Unauthorized access to getDataStreamList: " + str(e))
   return { "status_code": 1, "error_message": "401 - Unauthorized access. Please check your user credentials and try again." }
 
-data_set_uid = data_set.getUid()
-data_stream_list = context.ERP5Site_getDataStreamList(data_set_uid)
+data_stream_list = data_set.DataSet_getDataStreamList()
 
 return { "status_code": 0, "result": len(data_stream_list) }

bt5/erp5_wendelin_data_lake_ingestion/SkinTemplateItem/portal_skins/erp5_wendelin_data_lake/ERP5Site_getDataStreamList.py

@@ -18,8 +18,7 @@ except Exception as e: # fails because unauthorized access
   log("Unauthorized access to getDataStreamList: " + str(e))
   return json.dumps({ "status_code": 1, "error_message": "401 - Unauthorized access. Please check your user credentials and try again." })
 
-data_set_uid = data_set.getUid()
-data_stream_list = context.ERP5Site_getDataStreamList(data_set_uid, limit)
+data_stream_list = data_set.DataSet_getDataStreamList(limit)
 
 data_stream_dict = {}
 for stream_brain in data_stream_list: