[*] Has Many Relationships - Fix sorting on hasMany fields in related data (#341)

* [*] Has Many Relationships - Fix sorting on hasMany fields in related data.

* Fixed tests

* Fix sorting

* Updated CHANGELOG.md

* Improve performance

* Update CHANGELOG.md

Co-Authored-By: Arnaud Besnier <[email protected]>

* Fix CHANGELOG

* Fix the rebase

* Remove trailing spaces

Co-authored-by: Arnaud Besnier <[email protected]>

Author: DrRaider

CHANGELOG.md

@@ -1,6 +1,9 @@
 # Change Log
 
 ## [Unreleased]
+### Added
+- Has Many Relationships - Enable sorting on belongsTo relationship columns in related data.
+
 ### Fixed
 - Technical - Fix CI build.
 

app/services/forest_liana/has_many_getter.rb

@@ -19,18 +19,13 @@ def initialize(resource, association, params)
     end
 
     def perform
-      @records = search_query
-      @records = sort_query
+      @records = @search_query_builder.perform(@records)
     end
 
     def count
       @records_count = @records.count
     end
 
-    def search_query
-      @search_query_builder.perform(@records)
-    end
-
     def query_for_batch
       @records
     end
@@ -64,10 +59,6 @@ def field_names_requested
         .map { |name| name.to_sym }
     end
 
-    def association_table_name
-      model_association.try(:table_name)
-    end
-
     def model_association
       @resource.reflect_on_association(@params[:association_name].to_sym).klass
     end
@@ -101,23 +92,5 @@ def limit
     def pagination?
       @params[:page] && @params[:page][:number]
     end
-
-    def sort_query
-      if @params[:sort]
-        field = @params[:sort]
-        order = detect_sort_order(field)
-        field.slice!(0) if order == :desc
-
-        @records = @records
-          .order("#{association_table_name}.#{field} #{order.upcase}")
-      else
-        @records
-      end
-    end
-
-    def detect_sort_order(field)
-      return (if field[0] == '-' then :desc else :asc end)
-    end
-
   end
 end

app/services/forest_liana/resources_getter.rb

@@ -21,7 +21,6 @@ def initialize(resource, params)
 
     def perform
       @records = @records.eager_load(@includes)
-      @records_sorted = sort_query
     end
 
     def count
@@ -35,7 +34,7 @@ def query_for_batch
     end
 
     def records
-      @records_sorted.offset(offset).limit(limit).to_a
+      @records.offset(offset).limit(limit).to_a
     end
 
     def compute_includes
@@ -114,36 +113,6 @@ def search_query
       @search_query_builder.perform(@records)
     end
 
-    def sort_query
-      column = nil
-      order = 'DESC'
-
-      if @params[:sort]
-        @params[:sort].split(',').each do |field|
-          order_detected = detect_sort_order(@params[:sort])
-          order = order_detected.upcase
-          field.slice!(0) if order_detected == :desc
-
-          field = detect_reference(field)
-          if field.index('.').nil?
-            column = ForestLiana::AdapterHelper.format_column_name(@resource.table_name, field)
-          else
-            column = field
-          end
-        end
-      elsif @resource.column_names.include?('created_at')
-        column = ForestLiana::AdapterHelper.format_column_name(@resource.table_name, 'created_at')
-      elsif @resource.column_names.include?('id')
-        column = ForestLiana::AdapterHelper.format_column_name(@resource.table_name, 'id')
-      end
-
-      if column
-        @records = @records.order(Arel.sql("#{column} #{order}"))
-      else
-        @records
-      end
-    end
-
     def prepare_query
       @records = get_resource
 
@@ -172,28 +141,6 @@ def prepare_query
       @records = search_query
     end
 
-    def detect_sort_order(field)
-      return (if field[0] == '-' then :desc else :asc end)
-    end
-
-    def detect_reference(param)
-      ref, field = param.split('.')
-
-      if ref && field
-        association = @resource.reflect_on_all_associations
-          .find {|a| a.name == ref.to_sym }
-
-        if association
-          ForestLiana::AdapterHelper
-            .format_column_name(association.table_name, field)
-        else
-          param
-        end
-      else
-        param
-      end
-    end
-
     def association?(field)
       @resource.reflect_on_association(field.to_sym).present?
     end

app/services/forest_liana/search_query_builder.rb

@@ -34,7 +34,7 @@ def perform(resource)
           end
         end
       end
-
+      @records = sort_query
       @records
     end
 
@@ -146,6 +146,63 @@ def search_param
       @records
     end
 
+    def association_table_name(name)
+      QueryHelper.get_tables_associated_to_relations_name(@records).detect { |key, values|
+        break key if Array(values).include?(name)
+      }
+
+    end
+
+    def sort_query
+      column = nil
+      order = 'DESC'
+
+      if @params[:sort]
+        @params[:sort].split(',').each do |field|
+          order_detected = detect_sort_order(@params[:sort])
+          order = order_detected.upcase
+          field.slice!(0) if order_detected == :desc
+
+          field = detect_reference(field)
+          if field.index('.').nil?
+            column = ForestLiana::AdapterHelper.format_column_name(@resource.table_name, field)
+          else
+            column = field
+          end
+        end
+      elsif @resource.column_names.include?('created_at')
+        column = ForestLiana::AdapterHelper.format_column_name(@resource.table_name, 'created_at')
+      elsif @resource.column_names.include?('id')
+        column = ForestLiana::AdapterHelper.format_column_name(@resource.table_name, 'id')
+      end
+
+      if column
+        @records = @records.order(Arel.sql("#{column} #{order}"))
+      else
+        @records
+      end
+    end
+
+    def detect_reference(param)
+      ref, field = param.split('.')
+
+      if ref && field
+        association = @resource.reflect_on_all_associations
+          .find {|a| a.name == ref.to_sym }
+
+        referenced_table = association ? association_table_name(association.name) : ref
+
+        ForestLiana::AdapterHelper
+          .format_column_name(referenced_table, field)
+      else
+        param
+      end
+    end
+
+    def detect_sort_order(field)
+      return (if field[0] == '-' then :desc else :asc end)
+    end
+
     def association_search_condition table_name, column_name
       column_name = format_column_name(table_name, column_name)
       "LOWER(#{column_name}) LIKE :search_value_for_string"

test/services/forest_liana/has_many_getter_test.rb

@@ -31,7 +31,7 @@ class HasManyGetterTest < ActiveSupport::TestCase
 
       assert records.count == 3
       assert count = 3
-      assert records.first.id == 1
+      assert records.first.id == 7
     end
 
     test 'HasMany Getter with sort parameter' do