[*] Records Display - Restrict record data serialization based the schema collection fields in the #create and #update actions

Author: arnaudbesnier

CHANGELOG.md

@@ -1,6 +1,8 @@
 # Change Log
 
 ## [Unreleased]
+### Fixed
+- Records Display - Restrict record data serialization based the schema collection fields in the #create and #update actions.
 
 ## RELEASE 2.15.7 - 2019-02-28
 ### Fixed

app/controllers/forest_liana/resources_controller.rb

@@ -83,7 +83,7 @@ def show
         getter = ForestLiana::ResourceGetter.new(@resource, params)
         getter.perform
 
-        render serializer: nil, json: render_record_jsonapi(getter)
+        render serializer: nil, json: render_record_jsonapi(getter.record)
       rescue => error
         FOREST_LOGGER.error "Record Show error: #{error}\n#{format_stacktrace(error)}"
         internal_server_error
@@ -102,8 +102,7 @@ def create
           render serializer: nil, json: JSONAPI::Serializer.serialize_errors(
             creator.errors), status: 400
         elsif creator.record.valid?
-          render serializer: nil,
-            json: serialize_model(get_record(creator.record), include: record_includes)
+          render serializer: nil, json: render_record_jsonapi(creator.record)
         else
           render serializer: nil, json: JSONAPI::Serializer.serialize_errors(
             creator.record.errors), status: 400
@@ -126,8 +125,7 @@ def update
           render serializer: nil, json: JSONAPI::Serializer.serialize_errors(
             updater.errors), status: 400
         elsif updater.record.valid?
-          render serializer: nil,
-            json: serialize_model(get_record(updater.record), include: record_includes)
+          render serializer: nil, json: render_record_jsonapi(updater.record)
         else
           render serializer: nil, json: JSONAPI::Serializer.serialize_errors(
             updater.record.errors), status: 400
@@ -188,14 +186,15 @@ def get_record record
       is_sti_model? ? record.becomes(@resource) : record
     end
 
-    def render_record_jsonapi getter
-      collection_fields = getter.collection.fields.map { |field| field[:field] }
+    def render_record_jsonapi record
+      collection = ForestLiana::SchemaHelper.find_collection_from_model(@resource)
+      collection_fields = collection.fields.map { |field| field[:field] }
       fields_to_serialize = {
         ForestLiana.name_for(@resource) => collection_fields.join(',')
       }
 
-      serialize_model(get_record(getter.record), {
-        include: includes(getter),
+      serialize_model(get_record(record), {
+        include: record_includes,
         fields: fields_to_serialize
       })
     end

app/helpers/forest_liana/schema_helper.rb

@@ -0,0 +1,8 @@
+module ForestLiana
+  module SchemaHelper
+    def self.find_collection_from_model(active_record_class)
+      collection_name = ForestLiana.name_for(active_record_class)
+      ForestLiana.apimap.find { |collection| collection.name.to_s == collection_name }
+    end
+  end
+end

app/services/forest_liana/resource_getter.rb

@@ -1,7 +1,6 @@
 module ForestLiana
   class ResourceGetter < BaseGetter
     attr_accessor :record
-    attr_reader :collection
 
     def initialize(resource, params)
       @resource = resource

spec/helpers/forest_liana/schema_helper_spec.rb

@@ -0,0 +1,13 @@
+module ForestLiana
+  describe SchemaHelper do
+    describe '#find_collection_from_model' do
+      context 'on a simple model' do
+        it 'should return the schema collection related to the model' do
+          collection = SchemaHelper.find_collection_from_model(User)
+          expect(collection.class).to eq(ForestLiana::Model::Collection)
+          expect(collection.name).to eq('User')
+        end
+      end
+    end
+  end
+end