move update_sort

app/controllers/instructeurs/procedures_controller.rb

@@ -144,23 +144,7 @@ module Instructeurs
     end
 
     def update_sort
-      current_sort = procedure_presentation.sort
+      procedure_presentation.update_sort(params[:table], params[:column])
-      table = params[:table]
-      column = params[:column]
-
-      if table == current_sort['table'] && column == current_sort['column']
-        order = current_sort['order'] == 'asc' ? 'desc' : 'asc'
-      else
-        order = 'asc'
-      end
-
-      sort = {
-        'table' => table,
-        'column' => column,
-        'order' => order
-      }
-
-      procedure_presentation.update(sort: sort)
 
       redirect_back(fallback_location: instructeur_procedure_url(procedure))
     end

app/models/procedure_presentation.rb

@@ -232,6 +232,21 @@ class ProcedurePresentation < ApplicationRecord
       update!(sort: Procedure.default_sort)
     end
   end
+
+  def update_sort(table, column)
+    order = if sort.values_at('table', 'column') == [table, column]
+      sort['order'] == 'asc' ? 'desc' : 'asc'
+    else
+      'asc'
+    end
+
+    update!(sort: {
+      'table' => table,
+      'column' => column,
+      'order' => order
+    })
+  end
+
   private
 
   def field_id(field)