From: Anton Khorev Date: Mon, 10 Mar 2025 14:49:17 +0000 (+0300) Subject: Order issue reports by id X-Git-Tag: live~18^2 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/cb4060bb2e2f94e4939608303e422366a97d0300?ds=inline Order issue reports by id --- diff --git a/app/controllers/issues/reporters_controller.rb b/app/controllers/issues/reporters_controller.rb index b6513f443..9e195df78 100644 --- a/app/controllers/issues/reporters_controller.rb +++ b/app/controllers/issues/reporters_controller.rb @@ -11,7 +11,7 @@ module Issues def index @issue = Issue.visible_to(current_user).find(params[:issue_id]) - user_ids = @issue.reports.order(:created_at => :desc).pluck(:user_id).uniq + user_ids = @issue.reports.reorder(:created_at => :desc).pluck(:user_id).uniq @unique_reporters = { @issue.id => { :count => user_ids.size, diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 640317ce7..56c0bbdf0 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -47,7 +47,7 @@ class IssuesController < ApplicationController @unique_reporters_limit = 3 @unique_reporters = @issues.each_with_object({}) do |issue, reporters| - user_ids = issue.reports.order(:created_at => :desc).pluck(:user_id).uniq + user_ids = issue.reports.reorder(:created_at => :desc).pluck(:user_id).uniq reporters[issue.id] = { :count => user_ids.size, :users => User.in_order_of(:id, user_ids.first(@unique_reporters_limit)) diff --git a/app/models/issue.rb b/app/models/issue.rb index a3f82ee40..970426715 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -36,7 +36,7 @@ class Issue < ApplicationRecord belongs_to :user_resolved, :class_name => "User", :foreign_key => :resolved_by, :optional => true belongs_to :user_updated, :class_name => "User", :foreign_key => :updated_by, :optional => true - has_many :reports, :dependent => :destroy + has_many :reports, -> { order(:id) }, :dependent => :destroy has_many :comments, :class_name => "IssueComment", :dependent => :destroy validates :reportable_id, :uniqueness => { :scope => [:reportable_type] }