From e6af2f15fb38c2c20a3c7e572b05b8a75d349540 Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 17 May 2019 17:22:29 +0200 Subject: [PATCH] Add new user segment all_proposals_authors --- config/locales/en/admin.yml | 1 + config/locales/es/admin.yml | 1 + lib/user_segments.rb | 9 +++++++-- spec/lib/user_segments_spec.rb | 22 ++++++++++++++++++++++ 4 files changed, 31 insertions(+), 2 deletions(-) diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index b2617ce2b..69b485ff5 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -753,6 +753,7 @@ en: segment_recipient: all_users: All users administrators: Administrators + all_proposal_authors: Proposal authors (including archived and retired) proposal_authors: Proposal authors investment_authors: Investment authors in the current budget feasible_and_undecided_investment_authors: "Authors of some investment in the current budget that does not comply with: [valuation finished unfesasible]" diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index 0acedc6ed..63d27ff5d 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -752,6 +752,7 @@ es: segment_recipient: all_users: Todos los usuarios administrators: Administradores + all_proposal_authors: Usuarios autores de propuestas (incluyendo archivadas y retiradas) proposal_authors: Usuarios autores de propuestas investment_authors: Usuarios autores de proyectos de gasto en los actuales presupuestos feasible_and_undecided_investment_authors: "Usuarios autores de algún proyecto de gasto en los actuales presupuestos que no cumpla: [evaluación finalizada inviable]" diff --git a/lib/user_segments.rb b/lib/user_segments.rb index 045f558a0..bc5419c78 100644 --- a/lib/user_segments.rb +++ b/lib/user_segments.rb @@ -1,12 +1,13 @@ class UserSegments - SEGMENTS = %w(all_users + SEGMENTS = %w[all_users administrators + all_proposal_authors proposal_authors investment_authors feasible_and_undecided_investment_authors selected_investment_authors winner_investment_authors - not_supported_on_current_budget) + not_supported_on_current_budget] def self.all_users User.active @@ -16,6 +17,10 @@ class UserSegments all_users.administrators end + def self.all_proposal_authors + author_ids(Proposal.pluck(:author_id).uniq) + end + def self.proposal_authors author_ids(Proposal.not_archived.not_retired.pluck(:author_id).uniq) end diff --git a/spec/lib/user_segments_spec.rb b/spec/lib/user_segments_spec.rb index 4d1057ddd..ed52dcfe7 100644 --- a/spec/lib/user_segments_spec.rb +++ b/spec/lib/user_segments_spec.rb @@ -27,6 +27,28 @@ describe UserSegments do end end + describe "#all_proposal_authors" do + it "returns users that have created a proposal even if is archived or retired" do + create(:proposal, author: user1) + create(:proposal, :archived, author: user2) + create(:proposal, retired_at: Time.current, author: user3) + + all_proposal_authors = described_class.all_proposal_authors + expect(all_proposal_authors).to include user1 + expect(all_proposal_authors).to include user2 + expect(all_proposal_authors).to include user3 + end + + it "does not return duplicated users" do + create(:proposal, author: user1) + create(:proposal, :archived, author: user1) + create(:proposal, retired_at: Time.current, author: user1) + + all_proposal_authors = described_class.all_proposal_authors + expect(all_proposal_authors).to contain_exactly(user1) + end + end + describe "#proposal_authors" do it "returns users that have created a proposal" do proposal = create(:proposal, author: user1)