From 794ea4d0e810c5b386a373c0b892bb14928be696 Mon Sep 17 00:00:00 2001 From: Pete Matsyburka Date: Tue, 13 Jan 2026 12:07:39 +0200 Subject: [PATCH] remove expired from pending filter --- app/models/submission.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/models/submission.rb b/app/models/submission.rb index 5630af76..d57ae5f8 100644 --- a/app/models/submission.rb +++ b/app/models/submission.rb @@ -78,8 +78,9 @@ class Submission < ApplicationRecord scope :active, -> { where(archived_at: nil) } scope :archived, -> { where.not(archived_at: nil) } scope :pending, lambda { - 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) + where(expire_at: nil).or(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) } scope :completed, lambda { where.not(Submitter.where(Submitter.arel_table[:submission_id].eq(Submission.arel_table[:id])