V3: client can **see data** for a **service** usage event

We present the `service_guid` and `service_label` columns from the
`service_usage_event` table as `service_offering.guid` and
`service_offering.name` to reflect the new naming conventions across V3.

Unlike the story, we do not display the organization name, it is not in
the model (neither the app usage event model nor the service usage event
model), and Greg has
[agreed](https://cloudfoundry.slack.com/archives/CCRLX88DD/p1590701929419700)
to not display it (V2 does not display the org name, either).

[finishes #172985880]

Co-authored-by: Reid Mitchell <rmitchell@pivotal.io>
Co-authored-by: Brian Cunnie <bcunnie@pivotal.io>

Author: reidmit

app/presenters/v3/usage_event_presenter.rb

@@ -21,6 +21,8 @@ def usage_event
     def build_data
       if usage_event.type == 'app'
         build_app_data
+      else
+        build_service_data
       end
     end
 
@@ -63,5 +65,35 @@ def build_app_data
         }
       }
     end
+
+    def build_service_data
+      {
+        state: usage_event.state,
+        space: {
+          guid: usage_event.space_guid,
+          name: usage_event.space_name,
+        },
+        organization: {
+          guid: usage_event.org_guid,
+        },
+        service_instance: {
+          guid: usage_event.service_instance_guid,
+          name: usage_event.service_instance_name,
+          type: usage_event.service_instance_type,
+        },
+        service_plan: {
+          guid: usage_event.service_plan_guid,
+          name: usage_event.service_plan_name,
+        },
+        service_offering: {
+          guid: usage_event.service_guid,
+          name: usage_event.service_label,
+        },
+        service_broker: {
+          guid: usage_event.service_broker_guid,
+          name: usage_event.service_broker_name,
+        }
+      }
+    end
   end
 end

docs/v3/source/includes/api_resources/_usage_events.erb

@@ -22,8 +22,7 @@
       "name": "name-1664"
     },
     "organization": {
-      "guid": "guid-036444f4-f2f5-4ea8-a353-e73330ca0f0a",
-      "name": "name-1665"
+      "guid": "guid-036444f4-f2f5-4ea8-a353-e73330ca0f0a"
     },
     "buildpack": {
       "guid": "guid-34916716-31d7-40c1-9afd-f312996c9654",
@@ -50,6 +49,32 @@
   "created_at": "2020-05-28T12:34:56Z",
   "updated_at": "2020-05-28T12:34:56Z",
   "type": "service",
-  "data": null
+  "data":  {
+    "state": "CREATED",
+    "space": {
+      "guid": "guid-5e28f12f-9d80-473e-b826-537b148eb338",
+      "name": "name-1664"
+    },
+    "organization": {
+      "guid": "guid-036444f4-f2f5-4ea8-a353-e73330ca0f0a"
+    },
+    "service_instance": {
+      "guid": "guid-f93250f7-7ef5-4b02-8d33-353919ce8358",
+      "name": "name-1982",
+      "type": "managed_service_instance"
+    },
+    "service_plan": {
+      "guid": "guid-e9d2d5a0-69a6-46ef-bac5-43f3ed177614",
+      "name": "name-1983"
+    },
+    "service_offering": {
+      "guid": "guid-34916716-31d7-40c1-9afd-f312996c9654",
+      "name": "label-64"
+    },
+    "service_broker": {
+      "guid": "guid-7cc11646-bf38-4f4e-b6e0-9581916a74d9",
+      "name": "name-2929"
+    }
+  }
 }
 <% end %>

spec/request/usage_events_spec.rb

@@ -95,7 +95,33 @@
           'created_at' => iso8601,
           'updated_at' => iso8601,
           'type' => 'service',
-          'data' => nil
+          'data' => {
+            'state' => usage_event.state,
+            'space' => {
+              'guid' => usage_event.space_guid,
+              'name' => usage_event.space_name,
+            },
+            'organization' => {
+              'guid' => usage_event.org_guid,
+            },
+            'service_instance' => {
+              'guid' => usage_event.service_instance_guid,
+              'name' => usage_event.service_instance_name,
+              'type' => usage_event.service_instance_type,
+            },
+            'service_plan' => {
+              'guid' => usage_event.service_plan_guid,
+              'name' => usage_event.service_plan_name,
+            },
+            'service_offering' => {
+              'guid' => usage_event.service_guid,
+              'name' => usage_event.service_label,
+            },
+            'service_broker' => {
+              'guid' => usage_event.service_broker_guid,
+              'name' => usage_event.service_broker_name,
+            }
+          }
         }
       end
 

spec/unit/presenters/v3/usage_event_presenter_spec.rb

@@ -45,7 +45,19 @@
         expect(result[:created_at]).to eq(usage_event.created_at)
         expect(result[:updated_at]).to eq(usage_event.updated_at)
         expect(result[:type]).to eq('service')
-        expect(result[:data]).to be_nil
+        expect(result[:data][:state]).to eq usage_event.state
+        expect(result[:data][:space][:guid]).to eq usage_event.space_guid
+        expect(result[:data][:space][:name]).to eq usage_event.space_name
+        expect(result[:data][:organization][:guid]).to eq usage_event.org_guid
+        expect(result[:data][:service_instance][:guid]).to eq usage_event.service_instance_guid
+        expect(result[:data][:service_instance][:name]).to eq usage_event.service_instance_name
+        expect(result[:data][:service_instance][:type]).to eq usage_event.service_instance_type
+        expect(result[:data][:service_plan][:guid]).to eq usage_event.service_plan_guid
+        expect(result[:data][:service_plan][:name]).to eq usage_event.service_plan_name
+        expect(result[:data][:service_offering][:guid]).to eq usage_event.service_guid
+        expect(result[:data][:service_offering][:name]).to eq usage_event.service_label
+        expect(result[:data][:service_broker][:guid]).to eq usage_event.service_broker_guid
+        expect(result[:data][:service_broker][:name]).to eq usage_event.service_broker_name
       end
     end
   end