From 3c5d274575f19cb6bf92a362a80f06bf84f8e0c2 Mon Sep 17 00:00:00 2001
From: Billy Zhou <bz@zammad.com>
Date: Tue, 16 Apr 2019 11:14:19 +0200
Subject: [PATCH] Fixed #2539 - search pagination broken in users_controller.rb

---
 app/controllers/users_controller.rb |  6 ------
 spec/requests/user_spec.rb          | 11 +++++++++++
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 1c155ab53..a4e9f4951 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -405,12 +405,6 @@ class UsersController < ApplicationController
     # do query
     user_all = User.search(query_params)
 
-    # do pagination if needed
-    if params[:page] && params[:per_page]
-      offset = (params[:page].to_i - 1) * params[:per_page].to_i
-      user_all = user_all[offset, params[:per_page].to_i] || []
-    end
-
     if response_expand?
       list = []
       user_all.each do |user|
diff --git a/spec/requests/user_spec.rb b/spec/requests/user_spec.rb
index ea632ce80..fbe08a8ef 100644
--- a/spec/requests/user_spec.rb
+++ b/spec/requests/user_spec.rb
@@ -444,6 +444,17 @@ RSpec.describe 'User', type: :request, searchindex: true do
       expect(json_response[0]['role_ids']).to be_falsey
       expect(json_response[0]['roles']).to be_falsey
 
+      # Regression test for issue #2539 - search pagination broken in users_controller.rb
+      # Get the total number of users N, then search with one result per page, so there should N pages with one result each
+      get '/api/v1/users/search', params: { query: '*' }, as: :json
+      total_user_number = json_response.count
+      (1..total_user_number).each do |i|
+        get '/api/v1/users/search', params: { query: '*', per_page: 1, page: i }, as: :json
+        expect(response).to have_http_status(200)
+        expect(json_response).to be_a_kind_of(Array)
+        expect(json_response.count).to eq(1), "Page #{i}/#{total_user_number} of the user search pagination test have the wrong result!"
+      end
+
       role = Role.find_by(name: 'Agent')
       get "/api/v1/users/search?query=#{CGI.escape("Customer#{firstname}")}&role_ids=#{role.id}&label=true", params: {}, as: :json
       expect(response).to have_http_status(200)