From 2d42ecdb6f6bc55bf035d298a85a79249d6c78b2 Mon Sep 17 00:00:00 2001 From: Wyatt Kirby Date: Mon, 1 Jul 2024 23:02:56 -0400 Subject: [PATCH] Update to normalize audit ordering when in loaded branch for auditor interactions --- lib/audited/auditor.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/audited/auditor.rb b/lib/audited/auditor.rb index e5e5ec6a..52549634 100644 --- a/lib/audited/auditor.rb +++ b/lib/audited/auditor.rb @@ -170,7 +170,7 @@ def revision(version) # Find the oldest revision recorded prior to the date/time provided. def revision_at(date_or_time) - targeted_audits = audits.loaded? ? audits.filter { |audit| audit.created_at <= date_or_time } : audits.up_until(date_or_time) + targeted_audits = audits.loaded? ? audits.filter { |audit| audit.created_at <= date_or_time }.sort_by(&:version) : audits.up_until(date_or_time) revision_with Audited.audit_class.reconstruct_attributes(targeted_audits) unless targeted_audits.empty? end @@ -332,7 +332,7 @@ def audits_to(version = nil) end end - audits.loaded? ? audits.filter { |audit| audit.version <= version } : audits.to_version(version) + audits.loaded? ? audits.filter { |audit| audit.version <= version }.sort_by(&:version) : audits.to_version(version) end def audit_create @@ -391,7 +391,7 @@ def comment_required_state? def combine_audits_if_needed max_audits = audited_options[:max_audits] if max_audits && (extra_count = audits.count - max_audits) > 0 - audits_to_combine = audits.loaded? ? audits.take(extra_count + 1) : audits.limit(extra_count + 1) + audits_to_combine = audits.loaded? ? audits.sort_by(&:version).take(extra_count + 1) : audits.limit(extra_count + 1) combine_audits(audits_to_combine) end end