Merge pull request #176 from docusign/feature/delete-restore-envelope

Separate move_envelope into different methods

Author: balaji1103

app/eSignature/examples/eg045_delete_restore_envelope.py

@@ -5,26 +5,38 @@
 
 class Eg045DeleteRestoreEnvelopeController:
     @staticmethod
-    def move_envelope(args):
+    def delete_envelope(args):
         #ds-snippet-start:eSign45Step2
         api_client = create_api_client(base_path=args["base_path"], access_token=args["access_token"])
         folders_api = FoldersApi(api_client)
         #ds-snippet-end:eSign45Step2
 
         #ds-snippet-start:eSign45Step3
         folders_request = FoldersRequest(
-            envelope_ids=[args["envelope_id"]],
-            
-            # add from_folder_id parameter if its value is provided
-            **({"from_folder_id": args["from_folder_id"]} if args.get("from_folder_id") else {})
+            envelope_ids=[args["envelope_id"]]
         )
         #ds-snippet-end:eSign45Step3
 
         #ds-snippet-start:eSign45Step4
-        results = folders_api.move_envelopes(account_id=args["account_id"], folder_id=args["folder_id"], folders_request=folders_request)
+        results = folders_api.move_envelopes(account_id=args["account_id"], folder_id=args["delete_folder_id"], folders_request=folders_request)
         #ds-snippet-end:eSign45Step4
         return results
 
+    @staticmethod
+    def move_envelope_to_folder(args):
+        api_client = create_api_client(base_path=args["base_path"], access_token=args["access_token"])
+        folders_api = FoldersApi(api_client)
+
+        #ds-snippet-start:eSign45Step6
+        folders_request = FoldersRequest(
+            envelope_ids=[args["envelope_id"]],
+            from_folder_id=args["from_folder_id"]
+        )
+
+        results = folders_api.move_envelopes(account_id=args["account_id"], folder_id=args["folder_id"], folders_request=folders_request)
+        #ds-snippet-end:eSign45Step6
+        return results
+
     @staticmethod
     def get_folders(args):
         api_client = create_api_client(base_path=args["base_path"], access_token=args["access_token"])

app/eSignature/views/eg045_delete_restore_envelope.py

@@ -36,11 +36,11 @@ def delete_envelope():
         "base_path": session["ds_base_path"],
         "access_token": session["ds_access_token"],
         "envelope_id": pattern.sub("", request.form.get("envelope_id")),
-        "folder_id": delete_folder_id
+        "delete_folder_id": delete_folder_id
     }
     try:
         # 2. Call the worker method
-        Eg045DeleteRestoreEnvelopeController.move_envelope(args)
+        Eg045DeleteRestoreEnvelopeController.delete_envelope(args)
     except ApiException as err:
         return process_error(err)
 
@@ -98,7 +98,7 @@ def restore_envelope():
                 redirect_url=restore_endpoint
             )
 
-        Eg045DeleteRestoreEnvelopeController.move_envelope(args)
+        Eg045DeleteRestoreEnvelopeController.move_envelope_to_folder(args)
     except ApiException as err:
         return process_error(err)