add ability to sort destinations by network type by customer order (#…

…1682)

Co-authored-by: artemlutsenko <[email protected]>

app/admin/system/network_types.rb

@@ -9,7 +9,7 @@
                  :name,
                  :uuid
 
-  permit_params :name
+  permit_params :name, :sorting_priority
 
   filter :id
   filter :uuid_equals, label: 'UUID'
@@ -18,13 +18,15 @@
   index do
     id_column
     column :name
+    column :sorting_priority
     column :uuid
   end
 
   show do
     attributes_table do
       row :id
       row :name
+      row :sorting_priority
       row :uuid
     end
   end
@@ -33,6 +35,7 @@
     f.semantic_errors *f.object.errors.attribute_names
     f.inputs form_title do
       f.input :name
+      f.input :sorting_priority
     end
     f.actions
   end

app/models/system/network_type.rb

@@ -4,9 +4,10 @@
 #
 # Table name: sys.network_types
 #
-#  id   :integer(2)       not null, primary key
-#  name :string           not null
-#  uuid :uuid             not null
+#  id               :integer(2)       not null, primary key
+#  name             :string           not null
+#  sorting_priority :integer(2)       default(999), not null
+#  uuid             :uuid             not null
 #
 # Indexes
 #

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

@@ -85,13 +85,13 @@ def self.creatable_fields(context)
   end
 
   def self.sortable_fields(_context = nil)
-    super + %i[country.name network.name]
+    super + %i[country.name network.name network_type.sorting_priority]
   end
 
   # 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]
+    custom_sort_fields = %w[country.name network.name network_type.sorting_priority]
 
     order_options.each_pair do |field, direction|
       case field.to_s
@@ -101,6 +101,10 @@ def self.sort_records(records, order_options, context = {})
       when 'network.name'
         local_records = local_records.left_joins(:network).order("networks.name #{direction}")
         order_options.delete('network.name')
+      when 'network_type.sorting_priority'
+        type_sorting = System::NetworkType.order(sorting_priority: direction).pluck(:id)
+        local_records = local_records.left_joins(:network).in_order_of(:'networks.type_id', type_sorting)
+        order_options.delete('network_type.sorting_priority')
       else
         local_records = apply_sort(local_records, order_options.except(*custom_sort_fields), context)
       end

db/migrate/20250115133012_add_sorting_priority_to_network_types.rb

@@ -0,0 +1,9 @@
+class AddSortingPriorityToNetworkTypes < ActiveRecord::Migration[7.0]
+  def up
+    add_column :network_types, :sorting_priority, :smallint, default: 999, null: false
+  end
+
+  def down
+    remove_column :network_types, :sorting_priority
+  end
+end

db/network_types.yml

@@ -2,48 +2,64 @@
 - id: 1
   name: Unknown
   uuid: d088d41e-52f7-11ea-a7a7-525400429a0c
+  sorting_priority: 150
 - id: 2
   name: Landline
   uuid: 706ab0ee-f258-11ed-b425-00ffaa112233
+  sorting_priority: 10
 - id: 3
   name: Mobile
   uuid: 706ab648-f258-11ed-b425-00ffaa112233
+  sorting_priority: 20
 - id: 4
   name: National
   uuid: 706ab80a-f258-11ed-b425-00ffaa112233
+  sorting_priority: 130
 - id: 5
   name: Shared Cost
   uuid: 706ab9b8-f258-11ed-b425-00ffaa112233
+  sorting_priority: 40
 - id: 6
   name: Toll-Free
   uuid: 706abb48-f258-11ed-b425-00ffaa112233
+  sorting_priority: 30
 - id: 7
   name: Special Services
   uuid: 706abcce-f258-11ed-b425-00ffaa112233
+  sorting_priority: 50
 - id: 8
   name: Short Code
   uuid: 1ee3eda4-585f-11ee-9c63-2e13d2150000
+  sorting_priority: 100
 - id: 9
   name: Emergency
   uuid: 22a20534-585f-11ee-a021-2e13d2150000
+  sorting_priority: 140
 - id: 10
   name: UIFN
   uuid: baa5f68c-f27f-4649-acd2-e2b080b33906
+  sorting_priority: 80
 - id: 11
   name: Premium-rate, global telecommunication service
   uuid: 52bfa8f7-383a-4bcf-90b4-43e4b3087af6
+  sorting_priority: 70
 - id: 12
   name: Paging
   uuid: 52bfa8f7-383a-4bcf-90b4-43e4b3087af4
+  sorting_priority: 120
 - id: 13
   name: Supplementary services
   uuid: 52bfa8f7-383a-4bcf-90b4-43e4b3087af3
+  sorting_priority: 60
 - id: 14
   name: Mobile/Paging
   uuid: 52bfa8f7-383a-4bcf-90b4-43e4b3087af2
+  sorting_priority: 110
 - id: 15
   name: Satellite
   uuid: 52bfa8f7-383a-4bcf-90b4-43e4b3087af1
+  sorting_priority: 90
 - id: 16
   name: Country Code
-  uuid: 52bfa8f7-383a-4bcf-90b4-43e4b3087af0
+  uuid: 52bfa8f7-383a-4bcf-90b4-43e4b3087af0
+  sorting_priority: 160

db/structure.sql

@@ -45127,7 +45127,8 @@ ALTER SEQUENCE sys.network_prefixes_id_seq OWNED BY sys.network_prefixes.id;
 CREATE TABLE sys.network_types (
     id smallint NOT NULL,
     name character varying NOT NULL,
-    uuid uuid DEFAULT public.uuid_generate_v1() NOT NULL
+    uuid uuid DEFAULT public.uuid_generate_v1() NOT NULL,
+    sorting_priority smallint DEFAULT 999 NOT NULL
 );
 
 
@@ -50187,6 +50188,7 @@ INSERT INTO "public"."schema_migrations" (version) VALUES
 ('20241216165130'),
 ('20241218154326'),
 ('20241231160003'),
-('20250104221004');
+('20250104221004'),
+('20250115133012');