forest_admin_datasource_active_record 1.0.0.pre.beta.54 → 1.0.0.pre.beta.55

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 872ac653d0f9a281cab0421a9f01343ab3ee751ab12dd89d07aaabc870ecd91e
-  data.tar.gz: dc666fc765acabfa4ce22fccd2e3240f4c4ba308884d2b77754b6ffd33adf85d
+  metadata.gz: 24b6a78fb3119d0686735b3d7d550148fad3d6a8c6a0251867230f13cc0c043f
+  data.tar.gz: 2912d1b2435e29fd19a3284debaa7ba97bdcd1bd223af8629645b9630a915656
 SHA512:
-  metadata.gz: 613b29a6e6f7119ecc1d33f2955b5bf3fdf69999a4d6a2d7066c1a423b4bff4af630dc8dd4aefdf2fdc88a4f2393da8dcb5edc379ab54f89ba00e00ab158c512
-  data.tar.gz: fc7ca9cc8868bdf8aca89735d1c22c550bdb45b962054958dd1cc8c01a2cd0ec8022c67dd27c1e7ea3c5c05f51442cbd7d8f22ff6e417eefd5352c667296dcb2
+  metadata.gz: ec1c79b449b3855576a9a318b50094fff0cb126a8a421718175b68bb76bf83939badc2a3c68625f3c723a53e0051d7f8d36621bfd5f618b6f7307e49a7553aba
+  data.tar.gz: d059a3bb21bc5b66a5bfceeb13f6e3b12abe5690a5cb9f6dfe26c80c5acdcbd4d53cf97476e69ac260a1762851a2d23a04d0dcfbeb8fe70a2d754c228f891e37

data/lib/forest_admin_datasource_active_record/utils/query.rb

@@ -50,39 +50,41 @@ module ForestAdminDatasourceActiveRecord
 
       def apply_condition_tree(condition_tree, aggregator = nil)
         if condition_tree.is_a? Nodes::ConditionTreeBranch
-          aggregator = condition_tree.aggregator.downcase
+          aggregator = condition_tree.aggregator.downcase.to_sym
           condition_tree.conditions.each do |condition|
-            query = apply_condition_tree(condition, aggregator)
-            @query = @query.send(aggregator, query)
+            @query = apply_condition_tree(condition, aggregator)
+            @query = @query.send(aggregator, @query)
           end
 
           @query
         else
-          compute_main_operator(condition_tree, aggregator || 'and')
+          @query = compute_main_operator(condition_tree, aggregator || :and)
         end
       end
 
       def compute_main_operator(condition_tree, aggregator)
         field = format_field(condition_tree.field)
         value = condition_tree.value
+        aggregator = aggregator.to_sym
 
         case condition_tree.operator
         when Operators::PRESENT
-          @query = @query.send(aggregator, @query.where.not({ field => nil }))
+          @query = query_aggregator(aggregator, @collection.model.where.not({ field => nil }))
         when Operators::EQUAL, Operators::IN
-          @query = @query.send(aggregator, @query.where({ field => value }))
+          @query = query_aggregator(aggregator, @collection.model.where({ field => value }))
         when Operators::NOT_EQUAL, Operators::NOT_IN
-          @query = @query.send(aggregator, @query.where.not({ field => value }))
+          @query = query_aggregator(aggregator, @collection.model.where.not({ field => value }))
         when Operators::GREATER_THAN
-          @query = @query.send(aggregator, @query.where(@arel_table[field.to_sym].gt(value)))
+          @query = query_aggregator(aggregator, @collection.model.where(@arel_table[field.to_sym].gt(value)))
         when Operators::LESS_THAN
-          @query = @query.send(aggregator, @query.where(@arel_table[field.to_sym].lt(value)))
+          @query = query_aggregator(aggregator, @collection.model.where(@arel_table[field.to_sym].lt(value)))
         when Operators::NOT_CONTAINS
-          @query = @query.send(aggregator, @query.where.not(@arel_table[field.to_sym].matches("%#{value}%")))
+          @query = query_aggregator(aggregator,
+                                    @collection.model.where.not(@arel_table[field.to_sym].matches("%#{value}%")))
         when Operators::LIKE
-          @query = @query.send(aggregator, @query.where(@arel_table[field.to_sym].matches(value)))
+          @query = query_aggregator(aggregator, @collection.model.where(@arel_table[field.to_sym].matches(value)))
         when Operators::INCLUDES_ALL
-          @query = @query.send(aggregator, @query.where(@arel_table[field.to_sym].matches_all(value)))
+          @query = query_aggregator(aggregator, @collection.model.where(@arel_table[field.to_sym].matches_all(value)))
         end
 
         @query
@@ -93,7 +95,7 @@ module ForestAdminDatasourceActiveRecord
           @select += @projection.columns.map { |field| "#{@collection.model.table_name}.#{field}" }
           @projection.relations.each_key do |relation|
             relation_schema = @collection.schema[:fields][relation]
-            @select << if relation_schema.type == 'OneToOne'
+            @select << if relation_schema.type == 'OneToOne' || relation_schema.type == 'PolymorphicOneToOne'
                          "#{@collection.model.table_name}.#{relation_schema.origin_key_target}"
                        else
                          "#{@collection.model.table_name}.#{relation_schema.foreign_key}"
@@ -107,33 +109,41 @@ module ForestAdminDatasourceActiveRecord
       def apply_select
         unless @projection.nil?
           @query = @query.select(@select.join(', '))
-          @query = @query.joins(@projection.relations.keys.map(&:to_sym))
+          @query = @query.includes(@projection.relations.keys.map(&:to_sym))
         end
 
         @query
       end
 
-      def add_join_relation(relation, relation_name)
-        if relation.type == 'ManyToMany'
-          # TODO: to implement
-        else
-          @query = @query.joins(relation_name.to_sym)
-        end
+      def add_join_relation(relation_name)
+        @query = @query.includes(relation_name.to_sym)
 
         @query
       end
 
       def format_field(field)
+        @select << "#{@collection.model.table_name}.#{field}"
+
         if field.include?(':')
           relation_name, field = field.split(':')
           relation = @collection.schema[:fields][relation_name]
           table_name = @collection.datasource.get_collection(relation.foreign_collection).model.table_name
-          add_join_relation(relation, relation_name)
+          add_join_relation(relation_name)
+          @select << "#{table_name}.#{field}"
+
           return "#{table_name}.#{field}"
         end
 
         field
       end
+
+      def query_aggregator(aggregator, query)
+        if !@query.respond_to?(:where_clause) || @query.where_clause.empty?
+          query
+        else
+          @query.send(aggregator, query)
+        end
+      end
     end
   end
 end

data/lib/forest_admin_datasource_active_record/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminDatasourceActiveRecord
-  VERSION = "1.0.0-beta.54"
+  VERSION = "1.0.0-beta.55"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_admin_datasource_active_record
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.beta.54
+  version: 1.0.0.pre.beta.55
 platform: ruby
 authors:
 - Matthieu
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-06-10 00:00:00.000000000 Z
+date: 2024-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord