separate move_envelope methods

Author: RomanBachaloSigmaSoftware

app/controllers/e_sign/eeg045_delete_restore_envelope_controller.rb

@@ -19,7 +19,7 @@ def delete_envelope
 
     delete_restore_envelope_service = ESign::Eg045DeleteRestoreEnvelopeService.new
 
-    delete_restore_envelope_service.move_envelope args
+    delete_restore_envelope_service.delete_envelope args
 
     session[:envelope_id] = args[:envelope_id]
     additional_page_data = @example['AdditionalPage'].find { |p| p['Name'] == 'envelope_is_deleted' }
@@ -54,7 +54,7 @@ def restore_envelope
       return render 'ds_common/example_done'
     end
 
-    delete_restore_envelope_service.move_envelope args
+    delete_restore_envelope_service.move_envelope_to_folder args
 
     session[:envelope_id] = args[:envelope_id]
     @title = @example['ExampleName']

app/services/e_sign/eg045_delete_restore_envelope_service.rb

@@ -3,22 +3,33 @@
 class ESign::Eg045DeleteRestoreEnvelopeService
   include ApiCreator
 
-  def move_envelope(args)
+  def delete_envelope(args)
     #ds-snippet-start:eSign45Step2
     folders_api = create_folders_api(args)
     #ds-snippet-end:eSign45Step2
 
     #ds-snippet-start:eSign45Step3
     folders_request = DocuSign_eSign::FoldersRequest.new
     folders_request.envelope_ids = [args[:envelope_id]]
-    folders_request.from_folder_id = args[:from_folder_id] unless args[:from_folder_id].nil?
     #ds-snippet-end:eSign45Step3
 
     #ds-snippet-start:eSign45Step4
     folders_api.move_envelopes(args[:account_id], args[:folder_id], folders_request)
     #ds-snippet-end:eSign45Step4
   end
 
+  def move_envelope_to_folder(args)
+    folders_api = create_folders_api(args)
+
+    #ds-snippet-start:eSign45Step6
+    folders_request = DocuSign_eSign::FoldersRequest.new
+    folders_request.envelope_ids = [args[:envelope_id]]
+    folders_request.from_folder_id = args[:from_folder_id]
+
+    folders_api.move_envelopes(args[:account_id], args[:folder_id], folders_request)
+    #ds-snippet-end:eSign45Step6
+  end
+
   def get_folders(args)
     folders_api = create_folders_api(args)