From d6c01586fe1703d69184828b332e2eace844cac8 Mon Sep 17 00:00:00 2001 From: ENT8R Date: Thu, 3 Oct 2019 14:12:27 +0200 Subject: [PATCH] Sort and order notes by different values and ascending or descending order --- app/controllers/api/notes_controller.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/controllers/api/notes_controller.rb b/app/controllers/api/notes_controller.rb index fc9167eb3..23ea4e955 100644 --- a/app/controllers/api/notes_controller.rb +++ b/app/controllers/api/notes_controller.rb @@ -294,11 +294,14 @@ module Api raise OSM::APIBadUserInput, "Date #{params[:to]} is in a wrong format" end - @notes = @notes.where(:created_at => from..to) + @notes = params[:sort] == "created_at" ? @notes.where(:created_at => from..to) : @notes.where(:updated_at => from..to) end # Find the notes we want to return - @notes = @notes.order("updated_at DESC").limit(result_limit).preload(:comments) + sort_by = params[:sort_by] == "created_at" ? "created_at" : "updated_at" + order_by = params[:order_by] == "ASC" ? "ASC" : "DESC" + + @notes = @notes.order("#{sort_by} #{order_by}").limit(result_limit).preload(:comments) # Render the result respond_to do |format| -- 2.39.5