Merge pull request #3507 from consul/proposals-user-segment

Proposals authors user segment

app/views/admin/newsletters/show.html.erb

@@ -4,7 +4,7 @@
 
 <% recipients_count = @newsletter.valid_segment_recipient? ? @newsletter.list_of_recipient_emails.count : 0 %>
 
-  <div class="small-12 column callout highlight">
+<div class="small-12 column callout highlight">
   <div class="small-12 medium-2 column">
     <strong><%= t("admin.newsletters.show.sent_at") %></strong><br>
     <% if @newsletter.draft? %>
@@ -32,16 +32,16 @@
       <%= t("admin.newsletters.show.sent_emails", count: @newsletter.activities.count) %>
     </strong>
   </div>
-  </div>
+</div>
 
-  <div class="small-12 column">
+<div class="small-12 column">
   <strong><%= t("admin.newsletters.show.body") %></strong>
   <p class="help-text" id="phase-description-help-text">
     <%= t("admin.newsletters.show.body_help_text") %>
   </p>
-  </div>
+</div>
 
-  <div class="newsletter-body-content">
+<div class="newsletter-body-content">
   <%= render file: "app/views/layouts/_mailer_header.html.erb" %>
 
   <table cellpadding="0" cellspacing="0" border="0" style="background: #fff; margin: 0 auto; max-width: 700px; width:100%;">
@@ -53,7 +53,6 @@
   </table>
 
   <%= render file: "app/views/layouts/_mailer_footer.html.erb" %>
-  </div>
 </div>
 
 <% if @newsletter.draft? && @newsletter.valid_segment_recipient? %>

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]"

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]"

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

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)