chore: fix eager load with includes

ForestAdmin · Jun 30, 2021 · ebd88c5 · ebd88c5
1 parent 5478fa0
commit ebd88c5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/app/helpers/forest_liana/query_helper.rb b/app/helpers/forest_liana/query_helper.rb
@@ -2,7 +2,7 @@ module ForestLiana
   module QueryHelper
     def self.get_one_associations(resource)
       SchemaUtils.one_associations(resource)
-        .select { |association| SchemaUtils.model_included?(SchemaUtils.association_ref(association)) }
+        .select { |association| !SchemaUtils.polymorphic?(association) && SchemaUtils.model_included?(association.klass) }
     end
 
     def self.get_one_association_names_symbol(resource)

diff --git a/app/serializers/forest_liana/serializer_factory.rb b/app/serializers/forest_liana/serializer_factory.rb
@@ -265,8 +265,7 @@ def mixpanel_integration?
 
         SchemaUtils.associations(active_record_class).each do |a|
           begin
-            included = SchemaUtils.model_included?(SchemaUtils.association_ref(a))
-            if included
+            if SchemaUtils.model_included?(SchemaUtils.association_ref(a))
               serializer.send(serializer_association(a), a.name) {
                 if [:has_one, :belongs_to].include?(a.macro)
                   begin

diff --git a/app/services/forest_liana/belongs_to_updater.rb b/app/services/forest_liana/belongs_to_updater.rb
@@ -13,10 +13,7 @@ def initialize(resource, association, params)
     def perform
       begin
         @record = @resource.find(@params[:id])
-        new_value = nil
-        if @data && @data[:id]
-          new_value = SchemaUtils.association_ref(@association).find(@data[:id])
-        end
+        new_value = SchemaUtils.association_ref(@association).find(@data[:id]) if @data && @data[:id]
         @record.send("#{@association.name}=", new_value)
 
         @record.save