diff --git a/app/views/partners/_partner_groups_table.html.erb b/app/views/partners/_partner_groups_table.html.erb
index 94778851c3..458e606e17 100644
--- a/app/views/partners/_partner_groups_table.html.erb
+++ b/app/views/partners/_partner_groups_table.html.erb
@@ -45,8 +45,10 @@
<% if pg.send_reminders %>
- Reminder emails are sent on the <%= pg.reminder_day.ordinalize %> of every month.
-
+ <% if pg.reminder_schedule.present? %>
+ Reminder emails are sent <%= pg.show_description(pg.reminder_schedule) %>.
+
+ <% end %>
Deadlines are the <%= pg.deadline_day.ordinalize %> of every month.
<% else %>
No
diff --git a/app/views/shared/_deadline_day_fields.html.erb b/app/views/shared/_deadline_day_fields.html.erb
index cf9387075f..6760f8efc5 100644
--- a/app/views/shared/_deadline_day_fields.html.erb
+++ b/app/views/shared/_deadline_day_fields.html.erb
@@ -1,27 +1,54 @@
<%= tag.div(class: 'deadline-day-pickers',
data: {
- min: Deadlinable::MIN_DAY_OF_MONTH,
- max: Deadlinable::MAX_DAY_OF_MONTH,
current_day: Date.current.mday,
current_month: Date::MONTHNAMES[Date.current.month],
next_month: Date::MONTHNAMES[Date.current.next_month.month]
}) do %>
-
- <%= f.input :reminder_day, wrapper: :input_group, wrapper_html: { class: 'mb-0' },
- label: 'Reminder day (Day of month an e-mail reminder is sent to partners to submit requests)' do %>
+
+ <%= f.label :by_month_or_week, 'Send reminders on a specific day of the month (e.g. "the 5th") or a day of the week (eg "the first Tuesday")?' %>
+
+ <%= f.radio_button :by_month_or_week, 'day_of_month', label: 'Day of Month', id: 'toggle-to-date' %>
+ <%= f.label :by_month_or_week, 'Day of Month' %>
+
+ <%= f.radio_button :by_month_or_week, 'day_of_week', label: 'Day of the Week', id: 'toggle-to-week-day' %>
+ <%= f.label :by_month_or_week, 'Day of the Week' %>
+
+
+ <%= f.input :day_of_month, as: :integer, wrapper: :input_group,
+ label: 'Reminder date' do %>
- <%= f.number_field :reminder_day,
- class: "deadline-day-pickers__reminder-day form-control",
- placeholder: "Reminder day" %>
- <% end %>
-
-
+ <%= f.number_field :day_of_month,
+ min: Deadlinable::MIN_DAY_OF_MONTH,
+ max: Deadlinable::MAX_DAY_OF_MONTH,
+ class: "deadline-day-pickers__reminder-day form-control",
+ placeholder: "Reminder day" %>
+ <% end %>
+
+ <%= f.input :every_nth_day, wrapper: :input_group, wrapper_html: { class: 'mb-3'},
+ label: 'Reminder day of the week' do %>
+ <%= f.input :every_nth_day, collection: Deadlinable::EVERY_NTH_COLLECTION,
+ class: "deadline-day-pickers__reminder-day form-control",
+ label: false %>
+
+ <%= f.input :day_of_week, collection: Deadlinable::DAY_OF_WEEK_COLLECTION,
+ class: "deadline-day-pickers__reminder-day form-control",
+ label: false,
+ show_blank: true,
+ default: 1,
+ :input_html => {:style=> 'width: 200px'} %>
+
+ <% end %>
- <%= f.input :deadline_day, wrapper: :input_group, wrapper_html: { class: 'mb-0' },
+ <%= f.input :deadline_day, wrapper: :input_group, wrapper_html: { class: 'mb-0', min: 0, max: 28 },
label: 'Deadline day (Final day of month to submit requests)' do %>
<%= f.number_field :deadline_day,
+ min: Deadlinable::MIN_DAY_OF_MONTH,
+ max: Deadlinable::MAX_DAY_OF_MONTH,
class: "deadline-day-pickers__deadline-day form-control",
placeholder: "Deadline day" %>
<% end %>
diff --git a/db/migrate/20240715155823_add_reminder_schedule_to_organizations.rb b/db/migrate/20240715155823_add_reminder_schedule_to_organizations.rb
new file mode 100644
index 0000000000..4da938f248
--- /dev/null
+++ b/db/migrate/20240715155823_add_reminder_schedule_to_organizations.rb
@@ -0,0 +1,6 @@
+class AddReminderScheduleToOrganizations < ActiveRecord::Migration[7.1]
+ def change
+ add_column :organizations, :reminder_schedule, :string
+ add_column :partner_groups, :reminder_schedule, :string
+ end
+end
diff --git a/db/migrate/20240715162837_seed_reminder_schedule_data.rb b/db/migrate/20240715162837_seed_reminder_schedule_data.rb
new file mode 100644
index 0000000000..5fdc96bbe7
--- /dev/null
+++ b/db/migrate/20240715162837_seed_reminder_schedule_data.rb
@@ -0,0 +1,17 @@
+class SeedReminderScheduleData < ActiveRecord::Migration[7.1]
+ def change
+ for o in Organization.all
+ if o.reminder_day.present?
+ reminder_schedule = o.convert_to_reminder_schedule(o.reminder_day)
+ o.update(reminder_schedule: reminder_schedule)
+ end
+ end
+
+ for pg in PartnerGroup.all
+ if pg.reminder_day.present?
+ reminder_schedule = pg.convert_to_reminder_schedule(pg.reminder_day)
+ pg.update(reminder_schedule: reminder_schedule)
+ end
+ end
+ end
+end
diff --git a/db/migrate/20240715163348_remove_reminder_day_from_organizations.rb b/db/migrate/20240715163348_remove_reminder_day_from_organizations.rb
new file mode 100644
index 0000000000..df697e0c90
--- /dev/null
+++ b/db/migrate/20240715163348_remove_reminder_day_from_organizations.rb
@@ -0,0 +1,6 @@
+class RemoveReminderDayFromOrganizations < ActiveRecord::Migration[7.1]
+ def change
+ safety_assured { remove_column :organizations, :reminder_day, :integer }
+ safety_assured { remove_column :partner_groups, :reminder_day, :integer }
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 91483f028f..0ec4df8583 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -476,7 +476,6 @@
t.string "zipcode"
t.float "latitude"
t.float "longitude"
- t.integer "reminder_day"
t.integer "deadline_day"
t.text "invitation_text"
t.integer "default_storage_location"
@@ -493,6 +492,7 @@
t.boolean "hide_value_columns_on_receipt", default: false
t.boolean "hide_package_column_on_receipt", default: false
t.boolean "signature_for_distribution_pdf", default: false
+ t.string "reminder_schedule"
t.index ["latitude", "longitude"], name: "index_organizations_on_latitude_and_longitude"
t.index ["short_name"], name: "index_organizations_on_short_name"
end
@@ -510,12 +510,11 @@
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.boolean "send_reminders", default: false, null: false
- t.integer "reminder_day"
t.integer "deadline_day"
+ t.string "reminder_schedule"
t.index ["name", "organization_id"], name: "index_partner_groups_on_name_and_organization_id", unique: true
t.index ["organization_id"], name: "index_partner_groups_on_organization_id"
t.check_constraint "deadline_day <= 28", name: "deadline_day_of_month_check"
- t.check_constraint "reminder_day <= 28", name: "reminder_day_of_month_check"
end
create_table "partner_profiles", force: :cascade do |t|
diff --git a/spec/factories/organizations.rb b/spec/factories/organizations.rb
index 30ef97daa7..447117ef5f 100644
--- a/spec/factories/organizations.rb
+++ b/spec/factories/organizations.rb
@@ -20,7 +20,7 @@
# name :string
# one_step_partner_invite :boolean default(FALSE), not null
# partner_form_fields :text default([]), is an Array
-# reminder_day :integer
+# reminder_schedule :string
# repackage_essentials :boolean default(FALSE), not null
# short_name :string
# signature_for_distribution_pdf :boolean default(FALSE)
@@ -41,6 +41,9 @@
skip_items { false }
end
+ recurrence_schedule = IceCube::Schedule.new
+ recurrence_schedule.add_recurrence_rule IceCube::Rule.monthly(1).day_of_month(10)
+ recurrence_schedule_ical = recurrence_schedule.to_ical
sequence(:name) { |n| "Essentials Bank #{n}" } # 037000863427
sequence(:short_name) { |n| "db_#{n}" } # 037000863427
sequence(:email) { |n| "email#{n}@example.com" } # 037000863427
@@ -49,13 +52,13 @@
city { 'Front Royal' }
state { 'VA' }
zipcode { '22630' }
- reminder_day { 10 }
+ reminder_schedule { recurrence_schedule_ical }
deadline_day { 20 }
logo { Rack::Test::UploadedFile.new(Rails.root.join("spec/fixtures/files/logo.jpg"), "image/jpeg") }
trait :without_deadlines do
- reminder_day { nil }
+ reminder_schedule { nil }
deadline_day { nil }
end
diff --git a/spec/factories/partner_groups.rb b/spec/factories/partner_groups.rb
index b3723feda1..99a74042fa 100644
--- a/spec/factories/partner_groups.rb
+++ b/spec/factories/partner_groups.rb
@@ -2,25 +2,29 @@
#
# Table name: partner_groups
#
-# id :bigint not null, primary key
-# deadline_day :integer
-# name :string
-# reminder_day :integer
-# send_reminders :boolean default(FALSE), not null
-# created_at :datetime not null
-# updated_at :datetime not null
-# organization_id :bigint
+# id :bigint not null, primary key
+# deadline_day :integer
+# name :string
+# reminder_schedule :string
+# send_reminders :boolean default(FALSE), not null
+# created_at :datetime not null
+# updated_at :datetime not null
+# organization_id :bigint
#
FactoryBot.define do
+ recurrence_schedule = IceCube::Schedule.new
+ recurrence_schedule.add_recurrence_rule IceCube::Rule.monthly(1).day_of_month(10)
+ recurrence_schedule_ical = recurrence_schedule.to_ical
+
factory :partner_group do
sequence(:name) { |n| "Group #{n}" }
organization { Organization.try(:first) || create(:organization) }
- reminder_day { 14 }
+ reminder_schedule { recurrence_schedule_ical }
deadline_day { 28 }
trait :without_deadlines do
- reminder_day { nil }
+ reminder_schedule { nil }
deadline_day { nil }
end
end
diff --git a/spec/mailers/reminder_deadline_mailer_spec.rb b/spec/mailers/reminder_deadline_mailer_spec.rb
index fde33fa564..a18cb9717a 100644
--- a/spec/mailers/reminder_deadline_mailer_spec.rb
+++ b/spec/mailers/reminder_deadline_mailer_spec.rb
@@ -4,9 +4,8 @@
describe 'notify deadline' do
let(:today) { Date.new(2022, 1, 10) }
let(:partner) { create(:partner, organization: organization) }
-
before(:each) do
- organization.update!(reminder_day: today.day, deadline_day: 1)
+ organization.update!(deadline_day: 1)
end
subject { described_class.notify_deadline(partner) }
diff --git a/spec/models/concerns/deadlinable_spec.rb b/spec/models/concerns/deadlinable_spec.rb
index 4034b5bc5f..4d56993c2f 100644
--- a/spec/models/concerns/deadlinable_spec.rb
+++ b/spec/models/concerns/deadlinable_spec.rb
@@ -8,7 +8,7 @@ def self.name
include ActiveModel::Model
include Deadlinable
- attr_accessor :deadline_day, :reminder_day
+ attr_accessor :deadline_day, :reminder_schedule
def deadline_day?
!!deadline_day
@@ -17,6 +17,12 @@ def deadline_day?
end
subject(:dummy) { dummy_class.new }
+ let(:current_day) { Time.current }
+ let(:schedule) { IceCube::Schedule.new(current_day) }
+
+ before do
+ dummy.deadline_day = 7
+ end
describe "validations" do
it do
@@ -27,20 +33,41 @@ def deadline_day?
.allow_nil
end
- it do
- is_expected.to validate_numericality_of(:reminder_day)
- .only_integer
- .is_greater_than_or_equal_to(1)
- .is_less_than_or_equal_to(28)
- .allow_nil
+ it "validates the by_month_or_week field inclusion" do
+ is_expected.to validate_inclusion_of(:by_month_or_week).in_array(%w[day_of_month day_of_week])
+ end
+
+ it "validates the day of week field inclusion" do
+ dummy.day_of_week = "0"
+ expect(dummy).to be_valid
+ dummy.day_of_week = "A"
+ expect(dummy).not_to be_valid
+ end
+
+ it "validates the by_month_or_week field inclusion" do
+ dummy.every_nth_day = "1"
+ expect(dummy).to be_valid
+ dummy.every_nth_day = "B"
+ expect(dummy).not_to be_valid
+ end
+
+ it "validates that the reminder schedule's date fall within the range" do
+ dummy.by_month_or_week = "day_of_month"
+ dummy.day_of_month = 29
+
+ expect(dummy).not_to be_valid
+ expect(dummy.errors.added?(:day_of_month, "Reminder day must be between 1 and 28")).to be_truthy
+
+ dummy.day_of_month = -1
+ expect(dummy).not_to be_valid
end
it "validates that reminder day is not the same as deadline day" do
- dummy.deadline_day = 7
- dummy.reminder_day = 7
+ dummy.by_month_or_week = "day_of_month"
+ dummy.day_of_month = dummy.deadline_day
expect(dummy).not_to be_valid
- expect(dummy.errors.added?(:reminder_day, "must be other than 7")).to be_truthy
+ expect(dummy.errors.added?(:day_of_month, "Reminder must not be the same as deadline date")).to be_truthy
end
end
end
diff --git a/spec/models/organization_spec.rb b/spec/models/organization_spec.rb
index 89438098d9..289ab8ebc9 100644
--- a/spec/models/organization_spec.rb
+++ b/spec/models/organization_spec.rb
@@ -20,7 +20,7 @@
# name :string
# one_step_partner_invite :boolean default(FALSE), not null
# partner_form_fields :text default([]), is an Array
-# reminder_day :integer
+# reminder_schedule :string
# repackage_essentials :boolean default(FALSE), not null
# short_name :string
# signature_for_distribution_pdf :boolean default(FALSE)
@@ -447,13 +447,12 @@
end
end
- describe 'reminder_day' do
- it "can only contain numbers 1-28" do
- expect(build(:organization, reminder_day: 28)).to be_valid
- expect(build(:organization, reminder_day: 1)).to be_valid
- expect(build(:organization, reminder_day: 0)).to_not be_valid
- expect(build(:organization, reminder_day: -5)).to_not be_valid
- expect(build(:organization, reminder_day: 29)).to_not be_valid
+ describe 'reminder_schedule' do
+ it "cannot exceed 28 if by_month_or_week is day_of_month" do
+ expect(build(:organization, by_month_or_week: 'day_of_month', day_of_month: 28)).to be_valid
+ expect(build(:organization, by_month_or_week: 'day_of_month', day_of_month: 29)).to_not be_valid
+ expect(build(:organization, by_month_or_week: 'day_of_month', day_of_month: 0)).to_not be_valid
+ expect(build(:organization, by_month_or_week: 'day_of_month', day_of_month: -5)).to_not be_valid
end
end
describe 'deadline_day' do
diff --git a/spec/models/partner_group_spec.rb b/spec/models/partner_group_spec.rb
index 10030476ce..493e3b5520 100644
--- a/spec/models/partner_group_spec.rb
+++ b/spec/models/partner_group_spec.rb
@@ -2,14 +2,14 @@
#
# Table name: partner_groups
#
-# id :bigint not null, primary key
-# deadline_day :integer
-# name :string
-# reminder_day :integer
-# send_reminders :boolean default(FALSE), not null
-# created_at :datetime not null
-# updated_at :datetime not null
-# organization_id :bigint
+# id :bigint not null, primary key
+# deadline_day :integer
+# name :string
+# reminder_schedule :string
+# send_reminders :boolean default(FALSE), not null
+# created_at :datetime not null
+# updated_at :datetime not null
+# organization_id :bigint
#
RSpec.describe PartnerGroup, type: :model do
describe 'associations' do
@@ -28,15 +28,16 @@
end
end
- describe 'deadline_day <= 28' do
+ describe 'deadline_day > 28' do
it 'raises error if unmet' do
expect { partner_group.update_column(:deadline_day, 29) }.to raise_error(ActiveRecord::StatementInvalid)
end
end
- describe 'reminder_day <= 28' do
+ describe 'reminder_schedule day > 28 and <=0' do
it 'raises error if unmet' do
- expect { partner_group.update_column(:reminder_day, 29) }.to raise_error(ActiveRecord::StatementInvalid)
+ expect { partner_group.update!(by_month_or_week: 'day_of_month', day_of_month: 29) }.to raise_error(ActiveRecord::RecordInvalid)
+ expect { partner_group.update!(by_month_or_week: 'day_of_month', day_of_month: -5) }.to raise_error(ActiveRecord::RecordInvalid)
end
end
end
@@ -54,8 +55,8 @@
expect(build(:partner, name: "Foo", organization: build(:organization))).to be_valid
end
- describe "deadline_day && reminder_day must be defined if send_reminders=true" do
- let(:partner_group) { build(:partner_group, send_reminders: true, deadline_day: nil, reminder_day: nil) }
+ describe "deadline_day && reminder_schedule must be defined if send_reminders=true" do
+ let(:partner_group) { build(:partner_group, send_reminders: true, deadline_day: nil, reminder_schedule: nil) }
it "should not be valid" do
expect(partner_group).not_to be_valid
diff --git a/spec/services/partners/fetch_partners_to_remind_now_service_spec.rb b/spec/services/partners/fetch_partners_to_remind_now_service_spec.rb
index b4ca3d8eff..9ff880698f 100644
--- a/spec/services/partners/fetch_partners_to_remind_now_service_spec.rb
+++ b/spec/services/partners/fetch_partners_to_remind_now_service_spec.rb
@@ -7,18 +7,30 @@
context "when there is a partner" do
let!(:partner) { create(:partner) }
-
context "that has an organization with a global reminder & deadline" do
context "that is for today" do
before do
- partner.organization.update(reminder_day: current_day)
- partner.organization.update(deadline_day: current_day + 2)
+ partner.organization.update(by_month_or_week: "day_of_month", day_of_month: current_day, deadline_day: current_day + 2)
end
it "should include that partner" do
+ schedule = IceCube::Schedule.from_ical partner.organization.reminder_schedule
+ expect(schedule.occurs_on?(Time.current)).to be_truthy
expect(subject).to include(partner)
end
+ context "as matched by day of the week" do
+ before do
+ partner.organization.update(by_month_or_week: "day_of_week",
+ day_of_week: 2, every_nth_day: 2, deadline_day: current_day + 2)
+ end
+ it "should include that partner" do
+ schedule = IceCube::Schedule.from_ical partner.organization.reminder_schedule
+ expect(schedule.occurs_on?(Time.current)).to be_truthy
+ expect(subject).to include(partner)
+ end
+ end
+
context "but the partner is deactivated" do
before do
partner.deactivated!
@@ -42,8 +54,8 @@
context "that is not for today" do
before do
- partner.organization.update(reminder_day: current_day - 1)
- partner.organization.update(deadline_day: current_day + 2)
+ partner.organization.update(by_month_or_week: "day_of_month",
+ day_of_month: current_day - 1, deadline_day: current_day + 2)
end
it "should NOT include that partner" do
@@ -53,11 +65,12 @@
context "AND a partner group that does have them defined" do
before do
- partner_group = create(:partner_group, reminder_day: current_day, deadline_day: current_day + 2)
+ partner_group = create(:partner_group, by_month_or_week: "day_of_month",
+ day_of_month: current_day, deadline_day: current_day + 2)
partner_group.partners << partner
- partner.organization.update(reminder_day: current_day - 1)
- partner.organization.update(deadline_day: current_day + 2)
+ partner.organization.update(by_month_or_week: "day_of_month",
+ day_of_month: current_day - 1, deadline_day: current_day + 2)
end
it "should remind based on the partner group instead of the organization level reminder" do
@@ -78,13 +91,14 @@
context "that does NOT have a organization with a global reminder & deadline" do
before do
- partner.organization.update(reminder_day: nil, deadline_day: nil)
+ partner.organization.update(reminder_schedule: nil, deadline_day: nil)
end
context "and is a part of a partner group that does have them defined" do
context "that is for today" do
before do
- partner_group = create(:partner_group, reminder_day: current_day, deadline_day: current_day + 2)
+ partner_group = create(:partner_group, by_month_or_week: "day_of_month",
+ day_of_month: current_day, deadline_day: current_day + 2)
partner_group.partners << partner
end
@@ -105,7 +119,8 @@
context "that is not for today" do
before do
- partner_group = create(:partner_group, reminder_day: current_day - 1, deadline_day: current_day + 2)
+ partner_group = create(:partner_group, by_month_or_week: "day_of_month",
+ day_of_month: current_day - 1, deadline_day: current_day + 2)
partner_group.partners << partner
end
diff --git a/spec/system/admin/organizations_system_spec.rb b/spec/system/admin/organizations_system_spec.rb
index aa94b8a792..0e8b8d170f 100644
--- a/spec/system/admin/organizations_system_spec.rb
+++ b/spec/system/admin/organizations_system_spec.rb
@@ -116,6 +116,9 @@
fill_in "organization_user_name", with: admin_user_params[:name]
fill_in "organization_user_email", with: admin_user_params[:email]
+ choose 'toggle-to-date'
+ fill_in "organization_day_of_month", with: 1
+
click_on "Save"
end
@@ -124,7 +127,6 @@
within("tr.#{org_params[:short_name]}") do
first(:link, "View").click
end
-
expect(page).to have_content(org_params[:name])
expect(page).to have_content("Remount")
expect(page).to have_content("Front Royal")
diff --git a/spec/system/partner_system_spec.rb b/spec/system/partner_system_spec.rb
index b54b9fc42b..2c1cfd8582 100644
--- a/spec/system/partner_system_spec.rb
+++ b/spec/system/partner_system_spec.rb
@@ -496,6 +496,12 @@
# Click on the second item category
find("input#partner_group_item_category_ids_#{item_category_2.id}").click
+ # Opt in to sending deadline reminders
+ check 'Yes'
+
+ choose 'toggle-to-date'
+ fill_in "partner_group_day_of_month", with: 1
+ fill_in "partner_group_deadline_day", with: 25
find_button('Add Partner Group').click
assert page.has_content? 'Group Name', wait: page_content_wait
@@ -531,6 +537,24 @@
refute page.has_content? item_category_1.name
assert page.has_content? item_category_2.name
end
+
+ it 'should be able to edit a custom reminder schedule' do
+ visit partners_path
+
+ click_on 'Groups'
+ assert page.has_content? existing_partner_group.name, wait: page_content_wait
+
+ click_on 'Edit'
+ # Opt in to sending deadline reminders
+ check 'Yes'
+ choose 'toggle-to-week-day', wait: page_content_wait
+ select "Second", from: "partner_group_every_nth_day"
+ select "Thursday", from: "partner_group_day_of_week"
+ fill_in "partner_group_deadline_day", with: 24
+
+ find_button('Update Partner Group').click
+ assert page.has_content? 'Monthly on the 2nd Thursday', wait: page_content_wait
+ end
end
end
end
|