From: Tom Hughes <tom@compton.nu>
Date: Wed, 19 Feb 2020 19:11:32 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2381'
X-Git-Tag: live~2254
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/ff7ddb6b86bf918a9418af7382836b41594d45e4?hp=196e0d8fe0bc34351db7f88f11399c7630f376a7

Merge remote-tracking branch 'upstream/pull/2381'
---

diff --git a/app/controllers/api/notes_controller.rb b/app/controllers/api/notes_controller.rb
index fc9167eb3..a73240e5f 100644
--- a/app/controllers/api/notes_controller.rb
+++ b/app/controllers/api/notes_controller.rb
@@ -294,11 +294,30 @@ module Api
           raise OSM::APIBadUserInput, "Date #{params[:to]} is in a wrong format"
         end
 
-        @notes = @notes.where(:created_at => from..to)
+        @notes = if params[:sort] == "updated_at"
+                   @notes.where(:updated_at => from..to)
+                 else
+                   @notes.where(:created_at => from..to)
+                 end
       end
 
+      # Choose the sort order
+      @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
+
       # Find the notes we want to return
-      @notes = @notes.order("updated_at DESC").limit(result_limit).preload(:comments)
+      @notes = @notes.distinct.limit(result_limit).preload(:comments)
 
       # Render the result
       respond_to do |format|