Commit 7c2b7296 authored by Francisco Javier López's avatar Francisco Javier López Committed by Douwe Maan

Added default order to UserFinder

parent c997c95d
...@@ -25,7 +25,7 @@ class UsersFinder ...@@ -25,7 +25,7 @@ class UsersFinder
end end
def execute def execute
users = User.all users = User.all.order_id_desc
users = by_username(users) users = by_username(users)
users = by_search(users) users = by_search(users)
users = by_blocked(users) users = by_blocked(users)
......
...@@ -487,8 +487,12 @@ class User < ActiveRecord::Base ...@@ -487,8 +487,12 @@ class User < ActiveRecord::Base
end end
def two_factor_u2f_enabled? def two_factor_u2f_enabled?
if u2f_registrations.loaded?
u2f_registrations.any?
else
u2f_registrations.exists? u2f_registrations.exists?
end end
end
def namespace_uniq def namespace_uniq
# Return early if username already failed the first uniqueness validation # Return early if username already failed the first uniqueness validation
......
---
title: Added default order to UsersFinder
merge_request: 15679
author:
type: fixed
...@@ -2,6 +2,8 @@ module API ...@@ -2,6 +2,8 @@ module API
module Helpers module Helpers
module Pagination module Pagination
def paginate(relation) def paginate(relation)
relation = add_default_order(relation)
relation.page(params[:page]).per(params[:per_page]).tap do |data| relation.page(params[:page]).per(params[:per_page]).tap do |data|
add_pagination_headers(data) add_pagination_headers(data)
end end
...@@ -45,6 +47,14 @@ module API ...@@ -45,6 +47,14 @@ module API
# Ensure there is in total at least 1 page # Ensure there is in total at least 1 page
[paginated_data.total_pages, 1].max [paginated_data.total_pages, 1].max
end end
def add_default_order(relation)
if relation.is_a?(ActiveRecord::Relation) && relation.order_values.empty?
relation = relation.order(:id)
end
relation
end
end end
end end
end end
...@@ -76,6 +76,8 @@ module API ...@@ -76,6 +76,8 @@ module API
forbidden!("Not authorized to access /api/v4/users") unless authorized forbidden!("Not authorized to access /api/v4/users") unless authorized
entity = current_user&.admin? ? Entities::UserWithAdmin : Entities::UserBasic entity = current_user&.admin? ? Entities::UserWithAdmin : Entities::UserBasic
users = users.preload(:identities, :u2f_registrations) if entity == Entities::UserWithAdmin
present paginate(users), with: entity present paginate(users), with: entity
end end
......
...@@ -92,6 +92,27 @@ describe API::Helpers::Pagination do ...@@ -92,6 +92,27 @@ describe API::Helpers::Pagination do
subject.paginate(resource) subject.paginate(resource)
end end
end end
context 'if order' do
it 'is not present it adds default order(:id) if no order is present' do
resource.order_values = []
paginated_relation = subject.paginate(resource)
expect(resource.order_values).to be_empty
expect(paginated_relation.order_values).to be_present
expect(paginated_relation.order_values.first).to be_ascending
expect(paginated_relation.order_values.first.expr.name).to eq :id
end
it 'is present it does not add anything' do
paginated_relation = subject.paginate(resource.order(created_at: :desc))
expect(paginated_relation.order_values).to be_present
expect(paginated_relation.order_values.first).to be_descending
expect(paginated_relation.order_values.first.expr.name).to eq :created_at
end
end
end end
context 'when resource empty' do context 'when resource empty' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment