Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove duplication from invites queries #11552

Merged
merged 2 commits into from
Sep 5, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 58 additions & 0 deletions decidim-admin/app/queries/decidim/admin/invites.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
# frozen_string_literal: true

module Decidim
module Admin
# A class used to find the Invites by their status status.
class Invites < Decidim::Query
# Syntactic sugar to initialize the class and return the queried objects.
#
# invites - the initial Invites relation that needs to be filtered.
# query - query to filter invites
# status - invite status to be used as a filter
def self.for(invites, query = nil, status = nil)
new(invites, query, status).query
end

# Initializes the class.
#
# invites - the initial Invites relation that need to be filtered
# query - query to filter invites
# status - invite status to be used as a filter
def initialize(invites, query = nil, status = nil)
@invites = invites
@query = query
@status = status
end

# List the invites by the different filters.
def query
@invites = filter_by_search(@invites)
@invites = filter_by_status(@invites)
@invites
end

private

def filter_by_search(invites)
return invites if @query.blank?

invites.joins(:user).where(
User.arel_table[:name].lower.matches("%#{@query}%").or(User.arel_table[:email].lower.matches("%#{@query}%"))
)
end

def filter_by_status(invites)
case @status
when "accepted"
invites.where.not(accepted_at: nil)
when "rejected"
invites.where.not(rejected_at: nil)
when "sent"
invites.where.not(sent_at: nil).where(accepted_at: nil, rejected_at: nil)
else
invites
end
end
end
end
end
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# frozen_string_literal: true

require "spec_helper"
require "decidim/meetings/test/factories"

module Decidim::Meetings::Admin
module Decidim::Admin
describe Invites do
subject { described_class.for(Decidim::Meetings::Invite.all, search, filter) }

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def meeting
end

def invites
@invites ||= Decidim::Meetings::Admin::Invites.for(meeting.invites, @query, @status).page(params[:page]).per(15)
@invites ||= Decidim::Admin::Invites.for(meeting.invites, @query, @status).page(params[:page]).per(15)
end
end
end
Expand Down
60 changes: 0 additions & 60 deletions decidim-meetings/app/queries/decidim/meetings/admin/invites.rb

This file was deleted.

Loading