CDPT-2256 List inactive earlybird members (#1123)

app/controllers/early_bird_members_controller.rb

@@ -2,9 +2,10 @@ class EarlyBirdMembersController < ApplicationController
   before_action :authenticate_user!
 
   def index
-    @early_bird_members = EarlyBirdMember.active_list
-                                         .all
-                                         .order(Arel.sql("lower(name)"))
+    @show_inactive = (params[:show_inactive] == "true")
+    list = @show_inactive ? EarlyBirdMember.inactive_list : EarlyBirdMember.active_list
+    @early_bird_members = list.order(Arel.sql("lower(name)"))
+
     update_page_title("Early bird members")
   end
 

app/helpers/application_helper.rb

@@ -34,4 +34,12 @@ def action_officer_toggle_link(show_inactive)
       link_to "View inactive action officers", action_officers_path(show_inactive: true), { class: "button-secondary" }
     end
   end
+
+  def early_bird_member_toggle_link(show_inactive)
+    if show_inactive
+      link_to "View active early bird members", early_bird_members_path, { class: "button-secondary" }
+    else
+      link_to "View inactive early bird members", early_bird_members_path(show_inactive: true), { class: "button-secondary" }
+    end
+  end
 end

app/models/action_officer.rb

@@ -38,6 +38,9 @@ class ActionOfficer < ApplicationRecord
   belongs_to :deputy_director
   belongs_to :press_desk
 
+  scope :inactive_list, -> { where(deleted: true) }
+  scope :active_list, -> { where(deleted: false) }
+
   before_validation Validators::Whitespace.new
 
   def self.by_name(name)
@@ -51,6 +54,4 @@ def name_with_div
       "#{name} (#{deputy_director.division.name})"
     end
   end
-  scope :inactive_list, -> { where("action_officers.deleted = ?", true) }
-  scope :active_list, -> { where("action_officers.deleted = ? OR action_officers.deleted = ? AND action_officers.updated_at > ?", false, true, 2.days.ago) }
 end

app/models/early_bird_member.rb

@@ -17,6 +17,9 @@ class EarlyBirdMember < ApplicationRecord
   validates :name, presence: true
   validates :email, presence: true, uniqueness: true, on: :create # rubocop:disable Rails/UniqueValidationWithoutIndex
   validates :email, format: { with: Devise.email_regexp }
-  scope :active_list, -> { where("early_bird_members.deleted = ? OR early_bird_members.deleted = ? AND early_bird_members.updated_at > ?", false, true, 2.days.ago) }
+
+  scope :active_list, -> { where(deleted: false) }
+  scope :inactive_list, -> { where(deleted: true) }
+
   before_validation Validators::Whitespace.new
 end

app/views/early_bird_members/index.html.slim

@@ -4,8 +4,9 @@ h1.govuk-heading-l Early bird members
   div
     ul#admin-button-bar
       li= link_to ('Send early bird info'), {controller: 'early_bird_send_emails', action: 'send_emails'}, {class: 'button' }
-      li= link_to ('Add early bird member'), new_early_bird_member_path, {class: 'button-secondary'}
       li= link_to ('Early bird preview'), {controller: 'early_bird_dashboard', action: 'preview'}, {class: 'button-secondary'}
+      li= link_to ('Add early bird member'), new_early_bird_member_path, {class: 'button-secondary'}
+      li= early_bird_member_toggle_link(@show_inactive)
   table.table aria-label="early bird members"
     thead
       tr

spec/controllers/action_officers_controller_spec.rb

@@ -41,9 +41,5 @@ def expected_order_of_action_officers
     "Carrie Carroll",
     "Kent Holloway",
     "Lisa May",
-    "Jae Young",
-    "Sylvia Ware",
-    "Evangeline Cowan",
-    "Xavier Freeman",
   ]
 end

spec/factories/early_bird_members.rb

@@ -13,7 +13,7 @@
 FactoryBot.define do
   factory :early_bird_member do
     name { "Early Bird Member 1" }
-    email { "member.one@earlybird.com" }
+    sequence(:email) { |n| "member.one.#{n}@earlybird.com" }
     deleted { false }
   end
 end

spec/models/action_officer_spec.rb

@@ -50,20 +50,20 @@
     end
   end
 
-  describe "Get index" do
-    let!(:ao_today_deleted) { create(:action_officer, updated_at: Time.zone.now, deleted: false) }
-    let!(:ao_today_active) { create(:action_officer, updated_at: Time.zone.now, deleted: true) }
-    let!(:ao_yesterday_deleted) { create(:action_officer, updated_at: 1.day.ago, deleted: false) }
-    let!(:ao_yesterday_active) { create(:action_officer, updated_at: 1.day.ago, deleted: true) }
-    let!(:ao_three_days_ago_active) { create(:action_officer, updated_at: 3.days.ago, deleted: false) }
+  describe "scopes" do
+    let!(:ao_today_deleted) { create(:action_officer, updated_at: Time.zone.now, deleted: true) }
+    let!(:ao_today_active) { create(:action_officer, updated_at: Time.zone.now, deleted: false) }
+    let!(:ao_yesterday_deleted) { create(:action_officer, updated_at: 1.day.ago, deleted: true) }
+    let!(:ao_yesterday_active) { create(:action_officer, updated_at: 1.day.ago, deleted: false) }
     let!(:ao_three_days_ago_deleted) { create(:action_officer, updated_at: 3.days.ago, deleted: true) }
+    let!(:ao_three_days_ago_active) { create(:action_officer, updated_at: 3.days.ago, deleted: false) }
 
-    it "lists all active Action Officers and those made inactive withing the last two days" do
-      expect(described_class.active_list).to contain_exactly(ao_today_deleted, ao_today_active, ao_yesterday_deleted, ao_yesterday_active, ao_three_days_ago_active)
+    it "lists all active Action Officers" do
+      expect(described_class.active_list).to contain_exactly(ao_today_active, ao_yesterday_active, ao_three_days_ago_active)
     end
 
     it "lists all inactive Action Officers" do
-      expect(described_class.inactive_list).to contain_exactly(ao_today_active, ao_yesterday_active, ao_three_days_ago_deleted)
+      expect(described_class.inactive_list).to contain_exactly(ao_today_deleted, ao_yesterday_deleted, ao_three_days_ago_deleted)
     end
   end
 end

spec/models/early_bird_member_spec.rb

@@ -30,4 +30,21 @@
       expect(duplicate).to be_invalid
     end
   end
+
+  describe "scopes" do
+    let!(:eb_today_deleted) { create(:early_bird_member, updated_at: Time.zone.now, deleted: true) }
+    let!(:eb_today_active) { create(:early_bird_member, updated_at: Time.zone.now, deleted: false) }
+    let!(:eb_yesterday_deleted) { create(:early_bird_member, updated_at: 1.day.ago, deleted: true) }
+    let!(:eb_yesterday_active) { create(:early_bird_member, updated_at: 1.day.ago, deleted: false) }
+    let!(:eb_three_days_ago_deleted) { create(:early_bird_member, updated_at: 3.days.ago, deleted: true) }
+    let!(:eb_three_days_ago_active) { create(:early_bird_member, updated_at: 3.days.ago, deleted: false) }
+
+    it "lists all active Early Bird Members" do
+      expect(described_class.active_list).to contain_exactly(eb_today_active, eb_yesterday_active, eb_three_days_ago_active)
+    end
+
+    it "lists all inactive Early Bird Members" do
+      expect(described_class.inactive_list).to contain_exactly(eb_today_deleted, eb_yesterday_deleted, eb_three_days_ago_deleted)
+    end
+  end
 end