v3(services): Unbind - broker operation is passed in every LO request (cloudfoundry#1930)

* v3(services): Unbind - broker operation is passed in every LO request

[#174187897](https://www.pivotaltracker.com/story/show/174187897)

* Fix formatting

Author: FelisiaM

app/actions/service_route_binding_delete.rb

@@ -44,7 +44,10 @@ def poll(binding)
         details = client.fetch_and_handle_service_binding_last_operation(binding)
         case details[:last_operation][:state]
         when 'in progress'
-          update_last_operation(binding, description: details[:last_operation][:description])
+          update_last_operation(
+            binding,
+            description: details[:last_operation][:description],
+            operation: binding.last_operation.broker_provided_operation)
           return ContinuePolling.call(details[:retry_after])
         when 'succeeded'
           perform_delete_actions(binding)

spec/request/service_route_bindings_spec.rb

@@ -1053,6 +1053,23 @@
               expect(Delayed::Job.count).to eq(1)
             end
 
+            it 'keeps track of the broker operation' do
+              execute_all_jobs(expected_successes: 1, expected_failures: 0)
+              expect(Delayed::Job.count).to eq(1)
+
+              Timecop.travel(Time.now + 1.minute)
+              execute_all_jobs(expected_successes: 1, expected_failures: 0)
+
+              expect(
+                a_request(:get, broker_binding_last_operation_url).
+                  with(query: {
+                    operation: operation,
+                    service_id: service_instance.service_plan.service.unique_id,
+                    plan_id: service_instance.service_plan.unique_id,
+                  })
+              ).to have_been_made.twice
+            end
+
             context 'last operation response is 200 OK and indicates success' do
               let(:state) { 'succeeded' }
               let(:last_operation_status_code) { 200 }

spec/unit/actions/service_route_binding_delete_spec.rb

@@ -240,8 +240,12 @@ module V3
           }
         end
         let(:broker_client) { instance_double(VCAP::Services::ServiceBrokers::V2::Client) }
+        let(:broker_provided_operation) { Sham.guid }
 
         before do
+          route_binding.last_operation.broker_provided_operation = broker_provided_operation
+          route_binding.save
+
           allow(VCAP::Services::ServiceBrokers::V2::Client).to receive(:new).and_return(broker_client)
           allow(broker_client).to receive(:fetch_and_handle_service_binding_last_operation).and_return(last_operation_response)
         end
@@ -275,6 +279,7 @@ module V3
             route_binding.reload
             expect(route_binding.last_operation.state).to eq('in progress')
             expect(route_binding.last_operation.description).to eq(description)
+            expect(route_binding.last_operation.broker_provided_operation).to eq(broker_provided_operation)
           end
 
           it 'does not remove the binding or log an audit event' do

spec/unit/jobs/v3/delete_route_binding_job_spec.rb

@@ -37,7 +37,7 @@ module V3
       it_behaves_like 'delayed job', described_class
 
       describe '#perform' do
-        let(:delete_response) { { finished: false } }
+        let(:delete_response) { { finished: false, operation: 'test-operation' } }
         let(:poll_response) { { finished: false } }
         let(:action) do
           instance_double(V3::ServiceRouteBindingDelete, {