From b7bdc88008672fd065529f1b016256a55964fe1b Mon Sep 17 00:00:00 2001 From: ENT8R Date: Thu, 3 Oct 2019 17:17:59 +0200 Subject: [PATCH] Don't expose technical terms to the user --- app/controllers/api/notes_controller.rb | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/app/controllers/api/notes_controller.rb b/app/controllers/api/notes_controller.rb index 23ea4e955..703f275aa 100644 --- a/app/controllers/api/notes_controller.rb +++ b/app/controllers/api/notes_controller.rb @@ -298,10 +298,21 @@ module Api end # Find the notes we want to return - sort_by = params[:sort_by] == "created_at" ? "created_at" : "updated_at" - order_by = params[:order_by] == "ASC" ? "ASC" : "DESC" + @notes = if params[:sort] == "created_at" + if params[:order] == "oldest" + @notes.order("created_at ASC") + else + @notes.order("created_at DESC") + end + else + if params[:order] == "oldest" + @notes.order("updated_at ASC") + else + @notes.order("updated_at DESC") + end + end - @notes = @notes.order("#{sort_by} #{order_by}").limit(result_limit).preload(:comments) + @notes = @notes.distinct.limit(result_limit).preload(:comments) # Render the result respond_to do |format| -- 2.39.5