From 1fa8616dbc70a47744b678e65e8d04fe2060a019 Mon Sep 17 00:00:00 2001 From: Pete Matsyburka Date: Mon, 4 Aug 2025 14:20:42 +0300 Subject: [PATCH] fix submitters order --- app/jobs/process_submitter_completion_job.rb | 5 +++-- lib/submitters.rb | 6 +++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/jobs/process_submitter_completion_job.rb b/app/jobs/process_submitter_completion_job.rb index 647aab5f..49f79fcf 100644 --- a/app/jobs/process_submitter_completion_job.rb +++ b/app/jobs/process_submitter_completion_job.rb @@ -146,7 +146,8 @@ class ProcessSubmitterCompletionJob current_group_index = submitter_groups.find { |_, group| group.any? { |s| s['uuid'] == submitter.uuid } }&.first if submitter_groups[current_group_index + 1] && - submitters_index.values_at(*submitter_groups[current_group_index].pluck('uuid')).all?(&:completed_at?) + submitters_index.values_at(*submitter_groups[current_group_index].pluck('uuid')) + .compact.all?(&:completed_at?) submitter_groups[current_group_index + 1] end else @@ -159,7 +160,7 @@ class ProcessSubmitterCompletionJob end end - next_submitters = submitters_index.values_at(*Array.wrap(next_submitter_items).pluck('uuid')) + next_submitters = submitters_index.values_at(*Array.wrap(next_submitter_items).pluck('uuid')).compact Submitters.send_signature_requests(next_submitters) end diff --git a/lib/submitters.rb b/lib/submitters.rb index 2e04b7b3..2eef2f9b 100644 --- a/lib/submitters.rb +++ b/lib/submitters.rb @@ -177,7 +177,11 @@ module Submitters submitter_items.first(submitter_items.find_index { |e| e['uuid'] == submitter.uuid }) end - before_items.all? { |item| submission.submitters.find { |e| e.uuid == item['uuid'] }&.completed_at? } + before_items.all? do |item| + submitter = submission.submitters.find { |e| e.uuid == item['uuid'] } + + submitter.nil? || submitter.completed_at? + end end def build_document_filename(submitter, blob, filename_format)