Merge pull request #1511 from senid231/fix-admin-cdr-api-get-related-…

…resources

fix admin cdr api get related resources

config/initializers/jsonapi_resources.rb

@@ -62,6 +62,28 @@ def resource_for(type)
   end
 end
 
+ActionDispatch::Routing::Mapper::Resources.class_eval do
+  def patched_jsonapi_relationships(options = {})
+    overrides = options.delete(:overrides) || {}
+    res = JSONAPI::Resource.resource_for(resource_type_with_module_prefix(@resource_type))
+    res._relationships.each do |relationship_name, relationship|
+      related_resource = JSONAPI::Resource.resource_for(resource_type_with_module_prefix(relationship.class_name.underscore))
+      opts = options.merge(
+        overrides[relationship_name] || {
+          controller: "/#{related_resource.to_s.sub(/Resource\z/, '').underscore.pluralize}"
+        }
+      )
+      if relationship.is_a?(JSONAPI::Relationship::ToMany)
+        jsonapi_links(relationship_name, opts)
+        jsonapi_related_resources(relationship_name, opts)
+      else
+        jsonapi_link(relationship_name, opts)
+        jsonapi_related_resource(relationship_name, opts)
+      end
+    end
+  end
+end
+
 JSONAPI::Resource.singleton_class.prepend(JsonapiResourceClassPatch)
 
 JSONAPI::Resource.register_resource_override 'api/rest/admin', 'Pop', 'Api::Rest::Admin::Pop'

config/routes.rb

@@ -97,7 +97,8 @@ def dasherized_resources(name, options = {}, &block)
           namespace :cdr do
             jsonapi_resources :cdrs, only: %i[index show] do
               member { get :recording }
-              jsonapi_relationships
+              # jsonapi_relationships
+              patched_jsonapi_relationships
             end
             jsonapi_resources :auth_logs, only: %i[index show] do
             end

spec/requests/api/rest/admin/cdr/cdrs_spec.rb

@@ -114,4 +114,31 @@
       end
     end
   end
+
+  describe 'GET /api/rest/admin/cdr/cdrs/:id/vendor' do
+    subject do
+      get json_api_request_path, params: json_api_request_params, headers: json_api_request_headers
+    end
+
+    let(:json_api_request_path) { "#{super()}/#{record_id}/vendor" }
+    let(:record_id) { cdr.id.to_s }
+    let(:json_api_request_params) { nil }
+
+    let!(:cdr) do
+      create :cdr, :with_id
+    end
+
+    it 'responds correctly', :aggregate_failures do
+      subject
+      expect(response).to have_http_status(200)
+      expect(response_json).to match(
+                                 data: hash_including(
+                                   id: cdr.vendor.id.to_s,
+                                   type: 'contractors',
+                                   attributes: be_present,
+                                   relationships: be_present
+                                 )
+                               )
+    end
+  end
 end