From: Boubacar <boubacar.diallo1@macaulay.cuny.edu>
Date: Thu, 20 Feb 2020 01:52:35 +0000 (-0500)
Subject: Merge branch 'master' of github.com:openstreetmap/openstreetmap-website
X-Git-Tag: live~3313^2~1
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/2cfd5b97a83ab27f51e2d44ab832194f098d1eb7?hp=e854273c48c2d8bcdacc3c06309e1e809457745a

Merge branch 'master' of github.com:openstreetmap/openstreetmap-website
---

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|