4473 expand reminder date possibilities

Gemfile.lock

@@ -420,7 +420,9 @@ GEM
       net-protocol
     newrelic_rpm (9.20.0)
     nio4r (2.7.4)
-    nokogiri (1.18.8-arm64-darwin)
+    nokogiri (1.18.9-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.18.9-x86_64-darwin)
       racc (~> 1.4)
     nokogiri (1.18.9-x86_64-linux-gnu)
       racc (~> 1.4)
@@ -782,7 +784,7 @@ DEPENDENCIES
   guard-rspec
   icalendar
   ice_cube
-  importmap-rails (~> 2.1)
+  importmap-rails (~> 2.2)
   jbuilder
   jwt
   kaminari
@@ -840,4 +842,4 @@ DEPENDENCIES
   webmock (~> 3.25)
 
 BUNDLED WITH
-   2.6.9
+   2.7.0

app/controllers/admin/organizations_controller.rb

@@ -16,7 +16,6 @@ def index
 
   def new
     @organization = Organization.new
-    @organization.get_values_from_reminder_schedule
     account_request = params[:token] && AccountRequest.get_by_identity_token(params[:token])
 
     @user = User.new
@@ -33,6 +32,7 @@ def new
   def create
     @user = User.new(user_params)
     @organization = Organization.new(organization_params)
+    @organization.reminder_schedule.assign_attributes(reminder_schedule_params)
     if @organization.save
       Organization.seed_items(@organization)
       UserInviteService.invite(name: user_params[:name],
@@ -72,10 +72,14 @@ def destroy
   def organization_params
     params.require(:organization)
           .permit(:name, :street, :city, :state, :zipcode, :email, :url, :logo, :intake_location, :default_email_text, :account_request_id,
-                  :start_date, :by_month_or_week, :day_of_month, :day_of_week, :every_nth_day, :every_nth_month, :deadline_day,
+                  :reminder_schedule_definition, :deadline_day,
                   users_attributes: %i(name email organization_admin), account_request_attributes: %i(ndbn_member_id id))
   end
 
+  def reminder_schedule_params
+    params.require(:organization).fetch(:reminder_schedule_service, {}).permit([*ReminderScheduleService::REMINDER_SCHEDULE_FIELDS])
+  end
+
   def user_params
     params.require(:organization).require(:user).permit(:name, :email)
   end

app/controllers/organizations_controller.rb

@@ -109,9 +109,7 @@ def organization_params
   end
 
   def reminder_schedule_params
-    request_type_formatter(params)
-
-    params.require(:organization).require(:reminder_schedule_service).permit([*ReminderScheduleService::REMINDER_SCHEDULE_FIELDS])
+    params.require(:organization).fetch(:reminder_schedule_service, {}).permit([*ReminderScheduleService::REMINDER_SCHEDULE_FIELDS])
   end
 
   def request_type_formatter(params)

app/controllers/partner_groups_controller.rb

@@ -9,6 +9,7 @@ def new
 
   def create
     @partner_group = current_organization.partner_groups.new(partner_group_params)
+    @partner_group.reminder_schedule.assign_attributes(reminder_schedule_params)
     if @partner_group.save
       # Redirect to groups tab in Partner page.
       redirect_to partners_path + "#nav-partner-groups", notice: "Partner group added!"
@@ -22,12 +23,12 @@ def create
   def edit
     @partner_group = current_organization.partner_groups.find(params[:id])
     set_items_categories
-    @partner_group.get_values_from_reminder_schedule
     @item_categories = current_organization.item_categories
   end
 
   def update
     @partner_group = current_organization.partner_groups.find(params[:id])
+    @partner_group.reminder_schedule.assign_attributes(reminder_schedule_params)
     if @partner_group.update(partner_group_params)
       redirect_to partners_path + "#nav-partner-groups", notice: "Partner group edited!"
     else
@@ -55,8 +56,11 @@ def set_partner_group
   end
 
   def partner_group_params
-    params.require(:partner_group).permit(:name, :send_reminders, :reminder_schedule,
-      :deadline_day, :start_date, :by_month_or_week, :day_of_month, :day_of_week, :every_nth_day, :every_nth_month, item_category_ids: [])
+    params.require(:partner_group).permit(:name, :send_reminders, :reminder_schedule_definition, :deadline_day, item_category_ids: [])
+  end
+
+  def reminder_schedule_params
+    params.require(:partner_group).fetch(:reminder_schedule_service, {}).permit([*ReminderScheduleService::REMINDER_SCHEDULE_FIELDS])
   end
 
   def set_items_categories

app/javascript/controllers/deadline_day_controller.js

@@ -15,7 +15,7 @@ const WEEKDAY_NUM_TO_OBJ = {
 
 export default class extends Controller {
   static targets = [
-    'startDate', 'everyNthMonth', 'byDayOfMonth', 'byDayOfWeek', 'dayOfMonthFields', 'dayOfMonth',
+    'byDayOfMonth', 'byDayOfWeek', 'dayOfMonthFields', 'dayOfMonth',
     'dayOfWeekFields', 'everyNthDay', 'dayOfWeek', 'deadlineDay', 'reminderText', 'deadlineText'
   ]
 
@@ -39,22 +39,15 @@ export default class extends Controller {
     let reminder_date = null;
     let deadline_date = null;
 
-    let match = this.startDateTarget.value.match(this.constructor.dateParser);
-    let startDate = new Date(
-      match[1],
-      match[2]-1, // Subtracting 1 because the Date constructor uses month indices, but year and day numbers
-      match[3]
-    );
-    let monthlyInterval = parseInt(this.everyNthMonthTarget.value);
-    // Calculate the next reminder date after the start date, or the current date, whichever is greater.
-    // Do it this way to avoid the next reminder/deadline date being a date in the past.
-    let today = new Date()
-    let untilDate = new Date( Math.max(...[ startDate, today ]) )
+    // TODO: Add comment explaining assumptions about monthylInterval and today?
+    let monthlyInterval = 1;
+    let today = new Date();
+    let untilDate = new Date( today );
     untilDate.setMonth( untilDate.getMonth() + monthlyInterval + 1 )
 
     if (this.byDayOfMonthTarget.checked && this.dayOfMonthTarget.value) {
       const rule = new RRule({
-        dtstart: startDate,
+        dtstart: today,
         freq: RRule.MONTHLY,
         interval: monthlyInterval,
         bymonthday: parseInt(this.dayOfMonthTarget.value),
@@ -64,7 +57,7 @@ export default class extends Controller {
     }
     if (this.byDayOfWeekTarget.checked && this.everyNthDayTarget.value && (this.dayOfWeekTarget.value)) {
       const rule = new RRule({
-        dtstart: startDate,
+        dtstart: today,
         freq: RRule.MONTHLY,
         interval: monthlyInterval,
         byweekday: WEEKDAY_NUM_TO_OBJ[ parseInt(this.dayOfWeekTarget.value) ].nth( parseInt(this.everyNthDayTarget.value) ),
@@ -75,10 +68,10 @@ export default class extends Controller {
     }
     if (reminder_date && this.deadlineDayTarget.value) {
       deadline_date = new Date(reminder_date.getTime());
-      if( deadline_date.getDate() >= parseInt(this.deadlineDayTarget.value)){
+      deadline_date.setDate(parseInt(this.deadlineDayTarget.value))
+      if( reminder_date.getDate() >= parseInt(this.deadlineDayTarget.value)){
         deadline_date.setMonth( deadline_date.getMonth() + 1 )
       }
-      deadline_date.setDate(parseInt(this.deadlineDayTarget.value))
     }
 
     if (this.byDayOfMonthTarget.checked && this.dayOfMonthTarget.value
@@ -101,7 +94,7 @@ export default class extends Controller {
         $(this.deadlineTextTarget).text("Deadline day must be between 1 and 28");
       } else {
         $(this.deadlineTextTarget).removeClass('text-danger').addClass('text-muted');
-        $(this.deadlineTextTarget).text(deadline_date ? `Your next deadline date is ${deadline_date.toDateString()}.` : "");
+        $(this.deadlineTextTarget).text(deadline_date ? `The deadline on your next reminder email will be ${deadline_date.toDateString()}.` : "");
       }
     }
   }

app/mailers/reminder_deadline_mailer.rb

@@ -15,7 +15,7 @@ def notify_deadline(partner)
   private
 
   def deadline_date(partner)
-    date = DeadlineService.new(partner: partner).next_deadline
+    date = DeadlineService.new(deadline_day: DeadlineService.get_deadline_for_partner(partner)).next_deadline
 
     return date if date