change actor for audit events in DELETE plans and offerings

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

Author: pivotal-marcela-campo

app/controllers/v3/service_offerings_controller.rb

@@ -94,7 +94,7 @@ def destroy
       service_event_repository.record_service_purge_event(service_offering)
     else
       ServiceOfferingDelete.new.delete(service_offering)
-      service_event_repository.record_service_event(:delete, service_offering)
+      service_event_repository.record_service_delete_event(service_offering)
     end
 
     head :no_content

app/controllers/v3/service_plans_controller.rb

@@ -87,7 +87,7 @@ def destroy
     service_event_repository = VCAP::CloudController::Repositories::ServiceEventRepository.new(user_audit_info)
 
     ServicePlanDelete.new.delete(service_plan)
-    service_event_repository.record_service_plan_event(:delete, service_plan)
+    service_event_repository.record_service_plan_delete_event(service_plan)
 
     head :no_content
   rescue ServicePlanDelete::AssociationNotEmptyError => e

app/repositories/service_event_repository.rb

@@ -20,7 +20,9 @@ def logger
         :record_service_instance_event,
         :record_user_provided_service_instance_event,
         :record_service_key_event,
+        :record_service_delete_event,
         :record_service_purge_event,
+        :record_service_plan_delete_event,
         to: :with_user_actor,
       )
 
@@ -168,6 +170,26 @@ def record_service_purge_event(service)
           create_event('audit.service.delete', user_actor, actee, metadata)
         end
 
+        def record_service_delete_event(service)
+          metadata = { request: {} }
+          actee = {
+            actee:      service.guid,
+            actee_type: 'service',
+            actee_name: service.label,
+          }
+          create_event('audit.service.delete', user_actor, actee, metadata)
+        end
+
+        def record_service_plan_delete_event(plan)
+          metadata = { request: {} }
+          actee = {
+            actee:      plan.guid,
+            actee_type: 'service_plan',
+            actee_name: plan.name,
+          }
+          create_event('audit.service_plan.delete', user_actor, actee, metadata)
+        end
+
         private
 
         attr_reader :user_audit_info

spec/request/service_offerings_spec.rb

@@ -833,13 +833,15 @@
     end
 
     describe 'audit events' do
+      let(:email) { Sham.email }
+      let(:admin_headers) { admin_headers_for(user, email: email) }
       let(:service_offering) { VCAP::CloudController::Service.make }
 
       it 'emits an audit event' do
         delete "/v3/service_offerings/#{service_offering.guid}", nil, admin_headers
 
         expect([
-          { type: 'audit.service.delete', actor: service_offering.service_broker.name },
+          { type: 'audit.service.delete', actor: email },
         ]).to be_reported_as_events
       end
     end

spec/request/service_plans_spec.rb

@@ -613,12 +613,14 @@
 
     describe 'audit events' do
       let(:service_plan) { VCAP::CloudController::ServicePlan.make }
+      let(:email) { Sham.email }
+      let(:admin_headers) { admin_headers_for(user, email: email) }
 
       it 'emits an audit event' do
         delete "/v3/service_plans/#{service_plan.guid}", nil, admin_headers
 
         expect([
-          { type: 'audit.service_plan.delete', actor: service_plan.service_broker.name },
+          { type: 'audit.service_plan.delete', actor: email },
         ]).to be_reported_as_events
       end
     end

spec/unit/repositories/service_event_repository_spec.rb

@@ -361,6 +361,28 @@ module Repositories
         end
       end
 
+      describe '#record_service_plan_delete_event' do
+        let(:plan) { VCAP::CloudController::ServicePlan.make }
+
+        it 'creates an event with empty metadata' do
+          repository.record_service_plan_delete_event(plan)
+
+          event = Event.first
+          expect(event.type).to eq('audit.service_plan.delete')
+          expect(event.actor_type).to eq('user')
+          expect(event.actor).to eq(user.guid)
+          expect(event.actor_name).to eq(email)
+          expect(event.actor_username).to eq(user_name)
+          expect(event.timestamp).to be
+          expect(event.actee).to eq(plan.guid)
+          expect(event.actee_type).to eq('service_plan')
+          expect(event.actee_name).to eq(plan.name)
+          expect(event.space_guid).to eq('')
+          expect(event.organization_guid).to eq('')
+          expect(event.metadata).to eq({ 'request' => {} })
+        end
+      end
+
       describe '#record_service_dashboard_client_event' do
         let(:broker) { VCAP::CloudController::ServiceBroker.make }
         let(:client_attrs) do
@@ -577,6 +599,26 @@ def check_event_data(event_type, metadata)
         end
       end
 
+      describe '#record_service_delete_event' do
+        let(:service) { VCAP::CloudController::Service.make }
+        it 'records an event' do
+          repository.record_service_delete_event(service)
+          event = Event.first(type: 'audit.service.delete')
+          metadata = { 'request' => {} }
+
+          expect(event.actor).to eq user.guid
+          expect(event.actor_type).to eq 'user'
+          expect(event.actor_name).to eq email
+          expect(event.actor_username).to eq user_name
+          expect(event.actee).to eq service.guid
+          expect(event.actee_type).to eq 'service'
+          expect(event.actee_name).to eq service.label
+          expect(event.space_guid).to eq ''
+          expect(event.organization_guid).to eq ''
+          expect(event.metadata).to eq(metadata)
+        end
+      end
+
       describe 'when creating the event fails' do
         before do
           allow(Event).to receive(:create).and_raise