From: Tom Hughes <tom@compton.nu>
Date: Thu, 11 Oct 2018 17:30:53 +0000 (+0100)
Subject: Use "user" as user id parameter for notes searches
X-Git-Tag: live~2845
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/db13180c70035a81f36f843fe95e2a6326d5c554

Use "user" as user id parameter for notes searches
---

diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb
index 552735b2a..2fb9f8267 100644
--- a/app/controllers/notes_controller.rb
+++ b/app/controllers/notes_controller.rb
@@ -259,9 +259,9 @@ class NotesController < ApplicationController
     if params[:display_name]
       @user = User.find_by(:display_name => params[:display_name])
       raise OSM::APIBadUserInput, "User #{params[:display_name]} not known" unless @user
-    elsif params[:id]
-      @user = User.find_by(:id => params[:id])
-      raise OSM::APIBadUserInput, "User #{params[:id]} not known" unless @user
+    elsif params[:user]
+      @user = User.find_by(:id => params[:user])
+      raise OSM::APIBadUserInput, "User #{params[:user]} not known" unless @user
     end
 
     @notes = closed_condition(Note.all)
diff --git a/test/controllers/notes_controller_test.rb b/test/controllers/notes_controller_test.rb
index c2f44801c..33261c412 100644
--- a/test/controllers/notes_controller_test.rb
+++ b/test/controllers/notes_controller_test.rb
@@ -915,21 +915,21 @@ class NotesControllerTest < ActionController::TestCase
     end
   end
 
-  def test_search_by_id_success
+  def test_search_by_user_success
     user = create(:user)
 
     create(:note) do |note|
       create(:note_comment, :note => note, :author => user)
     end
 
-    get :search, :params => { :id => user.id, :format => "xml" }
+    get :search, :params => { :user => user.id, :format => "xml" }
     assert_response :success
     assert_equal "application/xml", @response.content_type
     assert_select "osm", :count => 1 do
       assert_select "note", :count => 1
     end
 
-    get :search, :params => { :id => user.id, :format => "json" }
+    get :search, :params => { :user => user.id, :format => "json" }
     assert_response :success
     assert_equal "application/json", @response.content_type
     js = ActiveSupport::JSON.decode(@response.body)
@@ -937,7 +937,7 @@ class NotesControllerTest < ActionController::TestCase
     assert_equal "FeatureCollection", js["type"]
     assert_equal 1, js["features"].count
 
-    get :search, :params => { :id => user.id, :format => "rss" }
+    get :search, :params => { :user => user.id, :format => "rss" }
     assert_response :success
     assert_equal "application/rss+xml", @response.content_type
     assert_select "rss", :count => 1 do
@@ -946,7 +946,7 @@ class NotesControllerTest < ActionController::TestCase
       end
     end
 
-    get :search, :params => { :id => user.id, :format => "gpx" }
+    get :search, :params => { :user => user.id, :format => "gpx" }
     assert_response :success
     assert_equal "application/gpx+xml", @response.content_type
     assert_select "gpx", :count => 1 do
@@ -1034,7 +1034,7 @@ class NotesControllerTest < ActionController::TestCase
     get :search, :params => { :display_name => "non-existent" }
     assert_response :bad_request
 
-    get :search, :params => { :id => "-1" }
+    get :search, :params => { :user => "-1" }
     assert_response :bad_request
 
     get :search, :params => { :from => "wrong-date", :to => "wrong-date" }