Merge pull request #1855 from 3scale/THREESCALE-4938-api-metric-paren…

…t_id-json

[API] Return parent_id for JSON in Metric endpoints

app/representers/method_representer.rb

@@ -10,6 +10,7 @@ module MethodRepresenter
   property :system_name
   property :friendly_name
   property :description
+  property :parent_id
 
   property :created_at
   property :updated_at

app/representers/metric_representer.rb

@@ -12,6 +12,7 @@ module MetricRepresenter
   property :description
 
   property :unit
+  property :parent_id, if: ->(*) { method_metric? }
 
   property :created_at
   property :updated_at

spec/acceptance/api/method_spec.rb

@@ -44,7 +44,7 @@
 
   json(:resource) do
     let(:root) { 'method' }
-    it { should have_properties('id', 'name', 'system_name', 'friendly_name', 'description') }
+    it { should have_properties('id', 'name', 'system_name', 'friendly_name', 'description', 'parent_id').from(resource) }
     it { should_not include('unit')}
     it { should have_links('self', 'parent') }
   end

spec/acceptance/api/metric_spec.rb

@@ -40,10 +40,23 @@
     delete '/admin/api/services/:service_id/metrics/:id', action: :destroy
   end
 
+  api 'method_metric' do
+    let(:resource) { FactoryBot.build(:metric, parent: service.metrics.hits) }
+
+    get '/admin/api/services/:service_id/metrics/:id.:format', action: :show
+
+    json(:resource) do
+      let(:root) { 'metric' }
+
+      it { should have_properties('id', 'name', 'system_name', 'friendly_name', 'parent_id').from(resource) }
+    end
+  end
+
   json(:resource) do
     let(:root) { 'metric' }
 
-    it { should have_properties('id', 'name', 'system_name', 'friendly_name', 'unit') }
+    it { should have_properties('id', 'name', 'system_name', 'friendly_name', 'unit').from(resource) }
+    it { should_not have_properties('parent_id') }
     it { should have_links('service', 'self') }
     it { should_not have_links('parent') }
   end