#788: fix batch request issue

Author: vgrem

Diff for: examples/sharepoint/listitems/create_batch.py

@@ -5,11 +5,16 @@
 from office365.sharepoint.client_context import ClientContext
 from tests import create_unique_name, test_client_credentials, test_team_site_url
 
+
+def print_progress(items_count):
+    print("{0} list items has been created".format(items_count))
+
+
 ctx = ClientContext(test_team_site_url).with_credentials(test_client_credentials)
 tasks_list = ctx.web.lists.get_by_title("Company Tasks")
 
-num_of_items = 10
+num_of_items = 1024
 item_props = {"Title": create_unique_name("Task")}
 task_items = [tasks_list.add_item(item_props) for idx in range(0, num_of_items)]
-ctx.execute_batch()
+ctx.execute_batch(success_callback=print_progress)
 print("{0} task items created".format(len(task_items)))

Diff for: examples/sharepoint/taxonomy/get_term_store_info.py

@@ -0,0 +1,6 @@
+from office365.sharepoint.client_context import ClientContext
+from tests import test_client_credentials, test_team_site_url
+
+ctx = ClientContext(test_team_site_url).with_credentials(test_client_credentials)
+term_store = ctx.taxonomy.term_store.get().execute_query()
+print(term_store)

Diff for: office365/runtime/odata/query_options.py

@@ -59,6 +59,9 @@ def build(client_object, properties_to_include=None):
                 ClientObjectCollection,
             )
 
+            if name in query_options.select:
+                continue
+
             if isinstance(client_object, ClientObjectCollection):
                 prop = client_object.create_typed_object().get_property(name)
             else:

Diff for: office365/sharepoint/client_context.py

@@ -201,7 +201,7 @@ def execute_batch(self, items_per_batch=100, success_callback=None):
         """
         Construct and submit to a server a batch request
         :param int items_per_batch: Maximum to be selected for bulk operation
-        :param (int)-> None success_callback: A callback
+        :param (int)-> None success_callback: A success callback
         """
         batch_request = ODataBatchV3Request(JsonLightFormat())
         batch_request.beforeExecute += self._authenticate_request

Diff for: office365/sharepoint/tenant/administration/tenant.py

@@ -330,22 +330,46 @@ def get_ransomware_activities(self):
         self.context.add_query(qry)
         return return_type
 
-    def get_sp_list_item_count(self, listName):
+    def get_sp_list_item_count(self, list_name):
         # type: (str) -> ClientResult[int]
         """ """
         return_type = ClientResult(self.context)
-        payload = {"listName": listName}
+        payload = {"listName": list_name}
         qry = ServiceOperationQuery(
             self, "GetSPListItemCount", None, payload, None, return_type
         )
         self.context.add_query(qry)
         return return_type
 
+    def get_sp_list_root_folder_properties(self, list_name):
+        # type: (str) -> ClientResult[dict]
+        """ """
+        return_type = ClientResult(self.context)
+        payload = {"listName": list_name}
+        qry = ServiceOperationQuery(
+            self, "GetSPListRootFolderProperties", None, payload, None, return_type
+        )
+        self.context.add_query(qry)
+        return return_type
+
+    def get_spo_all_web_templates(self, culture_name=None, compatibility_level=None):
+        # type: (str, int) -> SPOTenantWebTemplateCollection
+        """ """
+        return_type = SPOTenantWebTemplateCollection(self.context)
+        payload = {
+            "cultureName": culture_name,
+            "compatibilityLevel": compatibility_level,
+        }
+        qry = ServiceOperationQuery(
+            self, "GetSPOAllWebTemplates", None, payload, None, return_type
+        )
+        self.context.add_query(qry)
+        return return_type
+
     def check_tenant_intune_license(self):
-        """
-        Checks whether a tenant has the Intune license.
-        """
-        return_type = ClientResult(self.context)  # type: ClientResult[bool]
+        # type: () -> ClientResult[bool]
+        """Checks whether a tenant has the Intune license."""
+        return_type = ClientResult(self.context)
         qry = ServiceOperationQuery(
             self, "CheckTenantIntuneLicense", None, None, None, return_type
         )

Diff for: tests/sharepoint/test_tenant.py

@@ -188,3 +188,7 @@ def test_25_get_power_apps_environments(self):
     # def test_26_get_ransomware_activities(self):
     #    result = self.tenant.get_ransomware_activities().execute_query()
     #    self.assertIsNotNone(result.value)
+
+    def test_27_get_get_spo_all_web_templates(self):
+        result = self.tenant.get_spo_all_web_templates().execute_query()
+        self.assertIsNotNone(result)