From 65372c52aabe0a494bd2c581ab78c281da6dd84a Mon Sep 17 00:00:00 2001 From: Pete Matsyburka Date: Fri, 30 Jan 2026 17:23:20 +0200 Subject: [PATCH] fix order --- app/jobs/process_submitter_completion_job.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/jobs/process_submitter_completion_job.rb b/app/jobs/process_submitter_completion_job.rb index 0976b3bf..135c0c38 100644 --- a/app/jobs/process_submitter_completion_job.rb +++ b/app/jobs/process_submitter_completion_job.rb @@ -164,11 +164,13 @@ class ProcessSubmitterCompletionJob next_submitter_items = if submission.template_submitters.any? { |s| s['order'] } submitter_groups = - submission.template_submitters.group_by.with_index { |s, index| s['order'] || index } + submission.template_submitters + .group_by.with_index { |s, index| s['order'] || index } + .sort_by(&:first).pluck(1) - current_group_index = submitter_groups.find { |_, group| group.any? { |s| s['uuid'] == submitter.uuid } }&.first + current_group_index = submitter_groups.index { |group| group.any? { |s| s['uuid'] == submitter.uuid } } - if submitter_groups[current_group_index + 1] && + if current_group_index && submitter_groups[current_group_index + 1] && submitters_index.values_at(*submitter_groups[current_group_index].pluck('uuid')) .compact.all?(&:completed_at?) submitter_groups[current_group_index + 1]