diff --git a/app/models/submission.rb b/app/models/submission.rb index 5eae114b..2f0fd576 100644 --- a/app/models/submission.rb +++ b/app/models/submission.rb @@ -101,7 +101,11 @@ class Submission < ApplicationRecord where(Submitter.where(Submitter.arel_table[:submission_id].eq(Submission.arel_table[:id]) .and(Submitter.arel_table[:declined_at].not_eq(nil))).select(1).arel.exists) } - scope :expired, -> { pending.where(expire_at: ..Time.current) } + scope :expired, lambda { + where(expire_at: ..Time.current) + .where(Submitter.where(Submitter.arel_table[:submission_id].eq(Submission.arel_table[:id]) + .and(Submitter.arel_table[:completed_at].eq(nil))).select(1).arel.exists) + } enum :source, { invite: 'invite',