DriveItem.move method & example updates

Author: vgrem

examples/onedrive/files/move_file.py

@@ -5,14 +5,16 @@
 https://learn.microsoft.com/en-us/graph/api/driveitem-move?view=graph-rest-1.0
 """
 from office365.graph_client import GraphClient
+from office365.onedrive.driveitems.conflict_behavior import ConflictBehavior
 from tests import test_client_id, test_password, test_tenant, test_username
 
 client = GraphClient.with_username_and_password(
     test_tenant, test_client_id, test_username, test_password
 )
-source_path = "archive/Sample.rtf"
+
+local_path = "../../data/Financial Sample.xlsx"
+source_file = client.me.drive.root.upload_file(local_path).execute_query()
 target_path = "archive/2018"
-source_file_item = client.me.drive.root.get_by_path(source_path)
-target_folder_item = client.me.drive.root.get_by_path(target_path)
-result = source_file_item.move(parent=target_folder_item).execute_query()
-print(result.value)
+target_folder = client.me.drive.root.get_by_path(target_path)
+target_file = source_file.move(parent=target_folder, conflict_behavior=ConflictBehavior.Replace).execute_query()
+print(target_file.web_url)

office365/onedrive/driveitems/driveItem.py

@@ -520,31 +520,43 @@ def _drive_item_loaded():
             _create_and_add_query(parent)
         return return_type
 
-    def move(self, name=None, parent=None):
+    def move(self, name=None, parent=None, conflict_behavior=ConflictBehavior.Fail):
+        # type: (str, ItemReference|"DriveItem", str) -> "DriveItem"
         """To move a DriveItem to a new parent item, your app requests to update the parentReference of the DriveItem
         to move.
 
-        return_type = ClientResult(self.context, str())
+        :param str name: The new name for the move. If this isn't provided, the same name will be used as the
+             original.
+        :param ItemReference or DriveItem or None parent: Reference to the
+             parent item the move will be created in.
+        :param str conflict_behavior: query parameter to customize the behavior when a conflict occurs.
+        """
 
-        def _create_and_add_query(parent_reference):
+        return_type = DriveItem(self.context)
+        self.children.add_child(return_type)
+
+        def _move(parent_reference):
+            # type: (ItemReference) -> None
             payload = {"name": name, "parentReference": parent_reference}
 
             def _construct_request(request):
                 # type: (RequestOptions) -> None
                 request.method = HttpMethod.Patch
+                request.url += "?@microsoft.graph.conflictBehavior={0}".format(
+                    conflict_behavior
+                )
 
-            self.context.before_execute(_construct_request)
             qry = ServiceOperationQuery(self, "", None, payload, None, return_type)
-            self.context.add_query(qry)
+            self.context.add_query(qry).before_execute(_construct_request)
 
         if isinstance(parent, DriveItem):
 
             def _drive_item_loaded():
-                _create_and_add_query(ItemReference(_id=parent.id))
+                _move(ItemReference(_id=parent.id))
 
             parent.ensure_property("parentReference", _drive_item_loaded)
         else:
-            _create_and_add_query(parent)
+            _move(parent)
         return return_type
 
     def rename(self, new_name):