parse ranges and return some data about the filtering

app/controllers/concerns/data_table.rb

@@ -3,40 +3,52 @@ module DataTable
   extend ActiveSupport::Concern
 
   def apply_filter(user, params)
-    p AjaxRequest.new(params)
+    params = sanitize_params(params)
-    selection_to_json(user, user.transactions)
+    selection_to_json(user, params[:draw], user.transactions)
   end
 
   private
 
-  class AjaxRequest
+  def sanitize_params(params)
-
+    # Parsing according to https://datatables.net/manual/server-side
-    def initialize(params)
+    clean = {
-      # Parsing according to https://datatables.net/manual/server-side
+      draw: params.require(:draw).to_i,
-      @draw = params.require(:draw).to_i
+      start: params.require(:start).to_i,
-      @start = params.require(:start).to_i
+      length: params.require(:length).to_i,
-      @length = params.require(:length).to_i
+      columns: Hash.new
-      @columns = Hash.new
+    }
-      params.require(:columns).each do |i, column|
+    params.require(:columns).each do |i, column|
-        @columns[column.require(:data).to_sym] = {
+      type, value = column.require(:search)[:value].split(':')
-          name: column[:name],
+      h = clean[:columns][column.require(:data).to_sym] = {
-          searchable: column[:searchable] == 'true',
+        name: column[:name],
-          orderable: column[:orderable] == 'true',
+        searchable: column[:searchable] == 'true',
-          search_value: column.require(:search)[:value]
+        orderable: column[:orderable] == 'true',
-        }
+        type: type
+      }
+      if type == 'number-range'
+        h[:lower], h[:upper] = value.split('~').map &:to_i
+      elsif type == 'date-range'
+        h[:lower], h[:upper] = value.split('~').map &:to_datetime
+      else
+        h[:value] = value
       end
     end
-
+    return clean
   end
 
-  def selection_to_json(user, selection)
+  def selection_to_json(user, draw, selection)
-    { data: selection.map { |transaction| {
+    selection = selection.to_a
+    {
+      draw: draw,
+      recordsTotal: user.transactions.count,
+      recordsFiltered: selection.count,
+      data: selection.map { |transaction| {
         time: transaction.created_at,
         amount: transaction.signed_amount_for(user),
         peer: transaction.peer_of(user).try(:name),
         issuer: transaction.issuer.name,
         message: transaction.message,
-      } }
+      }}
     }
   end
 end