fix bug with sorting for destination resource

app/resources/api/rest/admin/routing/destination_resource.rb

@@ -99,17 +99,18 @@ def self.resource_for(type)
   # related to issue https://github.com/cerebris/jsonapi-resources/issues/1409
   def self.sort_records(records, order_options, context = {})
     local_records = records
+    custom_sort_fields = %w[country.name network.name]
 
     order_options.each_pair do |field, direction|
       case field.to_s
       when 'country.name'
-        local_records = records.left_joins(:country).order("countries.name #{direction}")
+        local_records = local_records.left_joins(:country).order("countries.name #{direction}")
         order_options.delete('country.name')
       when 'network.name'
-        local_records = records.left_joins(:network).order("networks.name #{direction}")
+        local_records = local_records.left_joins(:network).order("networks.name #{direction}")
         order_options.delete('network.name')
       else
-        local_records = apply_sort(local_records, order_options, context)
+        local_records = apply_sort(local_records, order_options.except(*custom_sort_fields), context)
       end
     end
 

spec/controllers/api/rest/admin/routing/destinations_controller_spec.rb

@@ -85,6 +85,18 @@
             end
           end
 
+          context 'when sort by prefix in ASC order and then by country name' do
+            let(:index_params) { { sort: 'prefix,country.name' } }
+
+            it 'returns ordered records' do
+              subject
+
+              expect(response_body[:errors]).to be_nil
+              expect(response_body[:data].pluck(:id)).to eq [first_destination_afghanistan.id.to_s, third_destination_ukraine.id.to_s, second_destination_ukraine.id.to_s]
+              expect(response_body[:data].pluck(:attributes).pluck(:prefix)).to eq %w[111 555 999]
+            end
+          end
+
           context 'when sort by country name in ASC order and then by prefix in DESC order' do
             let(:index_params) { { sort: 'country.name,-prefix' } }
 
@@ -96,6 +108,18 @@
               expect(response_body[:data].pluck(:attributes).pluck(:prefix)).to eq %w[111 999 555]
             end
           end
+
+          context 'when sort by prefix in DESC order and then by country name' do
+            let(:index_params) { { sort: '-prefix,country.name' } }
+
+            it 'returns ordered records' do
+              subject
+
+              expect(response_body[:errors]).to be_nil
+              expect(response_body[:data].pluck(:id)).to eq [second_destination_ukraine.id.to_s, third_destination_ukraine.id.to_s, first_destination_afghanistan.id.to_s]
+              expect(response_body[:data].pluck(:attributes).pluck(:prefix)).to eq %w[999 555 111]
+            end
+          end
         end
 
         context 'by country, network and prefix' do
@@ -117,6 +141,15 @@
             record
           end
 
+          let!(:fifth_destination_ukraine) do
+            ukraine = System::Country.find_by!(name: 'Ukraine')
+            network_abc_ua = FactoryBot.create(:network, name: 'ABCUkraineNet', network_type: net_type)
+            network_prefix = FactoryBot.create(:network_prefix, country: ukraine, network: network_abc_ua)
+            record = FactoryBot.create(:destination, rate_group: rate_group, prefix: '333')
+            record.update!(network_prefix_id: network_prefix.id)
+            record
+          end
+
           context 'when sort by country name and then by prefix in ASC order' do
             let(:index_params) { { sort: 'country.name,network.name,prefix' } }
 
@@ -126,11 +159,12 @@
               expect(response_body[:errors]).to be_nil
               expect(response_body[:data].pluck(:id)).to eq([
                                                               first_destination_afghanistan.id.to_s,
+                                                              fifth_destination_ukraine.id.to_s,
                                                               second_destination_ukraine.id.to_s,
                                                               fourth_destination_ukraine.id.to_s,
                                                               third_destination_ukraine.id.to_s
                                                             ])
-              expect(response_body[:data].pluck(:attributes).pluck(:prefix)).to eq(%w[111 999 444 777])
+              expect(response_body[:data].pluck(:attributes).pluck(:prefix)).to eq(%w[111 333 999 444 777])
             end
           end
 
@@ -143,11 +177,12 @@
               expect(response_body[:errors]).to be_nil
               expect(response_body[:data].pluck(:id)).to eq([
                                                               first_destination_afghanistan.id.to_s,
+                                                              fifth_destination_ukraine.id.to_s,
                                                               second_destination_ukraine.id.to_s,
                                                               third_destination_ukraine.id.to_s,
                                                               fourth_destination_ukraine.id.to_s
                                                             ])
-              expect(response_body[:data].pluck(:attributes).pluck(:prefix)).to eq(%w[111 999 777 444])
+              expect(response_body[:data].pluck(:attributes).pluck(:prefix)).to eq(%w[111 333 999 777 444])
             end
           end
         end