Merge devel

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 #show action.
 
 ## RELEASE 3.0.0-beta.12 - 2019-02-28
 ### Fixed
@@ -61,6 +63,10 @@
 ### Changed
 - Schema - Developers can deactivate the automatic schema sending on server start (using `FOREST_DISABLE_AUTO_SCHEMA_APPLY` environment variable, deprecating `FOREST_DEACTIVATE_AUTOMATIC_APIMAP`).
 
+## RELEASE 2.15.7 - 2019-02-28
+### Fixed
+- Records Display - Restrict record data serialization based the schema collection fields in the #show action.
+
 ## RELEASE 2.15.6 - 2019-02-28
 ### Fixed
 - Records Display - Ensure that the data is properly sent even if an attribute serialization happens for an unknown reason.

app/controllers/forest_liana/resources_controller.rb

@@ -83,8 +83,7 @@ def show
         getter = ForestLiana::ResourceGetter.new(@resource, params)
         getter.perform
 
-        render serializer: nil, json:
-          serialize_model(get_record(getter.record), include: includes(getter))
+        render serializer: nil, json: render_record_jsonapi(getter)
       rescue => error
         FOREST_LOGGER.error "Record Show error: #{error}\n#{format_stacktrace(error)}"
         internal_server_error
@@ -189,6 +188,18 @@ 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] }
+      fields_to_serialize = {
+        ForestLiana.name_for(@resource) => collection_fields.join(',')
+      }
+
+      serialize_model(get_record(getter.record), {
+        include: includes(getter),
+        fields: fields_to_serialize
+      })
+    end
+
     def render_jsonapi getter
       records = getter.records.map { |record| get_record(record) }
       fields_to_serialize = fields_per_model(params[:fields], @resource)

app/services/forest_liana/resource_getter.rb

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

app/services/forest_liana/resources_getter.rb

@@ -70,7 +70,11 @@ def includes_for_serialization
     private
 
     def get_fields_to_serialize
-      @params[:fields][@collection_name].split(',').map { |name| name.to_sym }
+      if @params[:fields] && @params[:fields][@collection_name]
+        @params[:fields][@collection_name].split(',').map { |name| name.to_sym }
+      else
+        []
+      end
     end
 
     def get_segment