didadmin/docuseal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

adjust filters

Browse Source
This commit is contained in:
Pete Matsyburka
2026-07-03 09:54:48 +03:00
parent ac7cc77017
commit 4e56a16a58
2 changed files with 14 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/models/submission.rb
+2 -2
View File
@@ -96,8 +96,8 @@ class Submission < ApplicationRecord
} }
scope :completed, -> { where.not(completed_at: nil) } scope :completed, -> { where.not(completed_at: nil) }
scope :declined, lambda { scope :declined, lambda {
where(Submitter.where(Submitter.arel_table[:submission_id].eq(Submission.arel_table[:id]) 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) .where.not(declined_at: nil).limit(1).arel.exists)
} }
scope :expired, -> { where(expire_at: ..Time.current).where(completed_at: nil) } scope :expired, -> { where(expire_at: ..Time.current).where(completed_at: nil) }
lib/submissions/filter.rb
+12 -22
View File
@@ -40,7 +40,6 @@ module Submissions
submissions.where(created_by_user_id: user&.id || -1) submissions.where(created_by_user_id: user&.id || -1)
end end
# rubocop:disable Metrics/MethodLength
def filter_by_status(submissions, filters) def filter_by_status(submissions, filters)
case filters[:status] case filters[:status]
when 'pending' when 'pending'
@@ -52,33 +51,24 @@ module Submissions
when 'expired' when 'expired'
submissions.expired submissions.expired
when 'sent' when 'sent'
submissions.joins(:submitters) submissions.where(Submitter.where(Submitter.arel_table[:submission_id].eq(Submission.arel_table[:id]))
.where(submitters: { opened_at: nil, completed_at: nil, declined_at: nil }) .where(opened_at: nil, completed_at: nil, declined_at: nil)
.where.not(submitters: { sent_at: nil }) .where.not(sent_at: nil)
.group(:id) .limit(1).arel.exists)
when 'opened' when 'opened'
submissions.joins(:submitters) submissions.where(Submitter.where(Submitter.arel_table[:submission_id].eq(Submission.arel_table[:id]))
.where(submitters: { completed_at: nil, declined_at: nil }) .where(completed_at: nil, declined_at: nil)
.where.not(submitters: { opened_at: nil }) .where.not(opened_at: nil)
.group(:id) .limit(1).arel.exists)
when 'partially_completed' when 'partially_completed'
submissions.joins(:submitters) submissions.where(completed_at: nil)
.group(:id) .where(Submitter.where(Submitter.arel_table[:submission_id].eq(Submission.arel_table[:id]))
.having(Arel::Nodes::NamedFunction.new( .where.not(completed_at: nil)
'COUNT', [Arel::Nodes::NamedFunction.new('NULLIF', .limit(1).arel.exists)
[Submitter.arel_table[:completed_at].eq(nil),
Arel::Nodes.build_quoted(false)])]
).gt(0))
.having(Arel::Nodes::NamedFunction.new(
'COUNT', [Arel::Nodes::NamedFunction.new('NULLIF',
[Submitter.arel_table[:completed_at].not_eq(nil),
Arel::Nodes.build_quoted(false)])]
).gt(0))
else else
submissions submissions
end end
end end
# rubocop:enable Metrics/MethodLength
def filter_by_created_at(submissions, filters) def filter_by_created_at(submissions, filters)
submissions = submissions.where(created_at: filters[:created_at_from]..) if filters[:created_at_from].present? submissions = submissions.where(created_at: filters[:created_at_from]..) if filters[:created_at_from].present?