Fix in date_range_helper.rb and application_controller.rb for invalid filter date_range param

Author: wjwb-us

app/controllers/application_controller.rb

@@ -24,34 +24,34 @@ def current_organization
     return @current_organization if instance_variable_defined? :@current_organization
 
     @current_organization = if !current_role
-      nil
-    elsif current_role.resource.is_a?(Organization)
-      current_role.resource
-    else
-      Organization.find_by(short_name: params[:organization_name])
-    end
+                              nil
+                            elsif current_role.resource.is_a?(Organization)
+                              current_role.resource
+                            else
+                              Organization.find_by(short_name: params[:organization_name])
+                            end
   end
   helper_method :current_organization
 
   def current_partner
     return @current_partner if instance_variable_defined? :@current_partner
 
     @current_partner = if !current_role || current_role.name.to_sym != Role::PARTNER
-      nil
-    else
-      current_role.resource
-    end
+                         nil
+                       else
+                         current_role.resource
+                       end
   end
   helper_method :current_partner
 
   def current_role
     return @role if instance_variable_defined? :@role
 
     @role = if !current_user
-      nil
-    else
-      Role.find_by(id: session[:current_role]) || UsersRole.current_role_for(current_user)
-    end
+              nil
+            else
+              Role.find_by(id: session[:current_role]) || UsersRole.current_role_for(current_user)
+            end
   end
 
   def dashboard_path_from_current_role
@@ -142,6 +142,10 @@ def setup_date_range_picker
     @selected_date_interval = helpers.selected_interval
     @selected_date_range = helpers.selected_interval.map { |d| d.to_fs(:long) }.join(" - ")
     @selected_date_range_label = helpers.date_range_label
+
+    if helpers.date_range_params_invalid?
+      flash.now[:error] = "The date range you supplied was invalid, so we used a default range instead."
+    end
   end
 
   def configure_permitted_parameters

app/helpers/date_range_helper.rb

@@ -33,12 +33,18 @@ def default_date
     "#{start_date.strftime("%B %d, %Y")} - #{end_date.strftime("%B %d, %Y")}"
   end
 
+  def parse_date_range(date_range_string)
+    parts = date_range_string.to_s.split(" - ")
+    return nil unless parts.size == 2
+
+    parts.map { |d| Date.strptime(d.strip, "%B %d, %Y") }
+  rescue ArgumentError => e
+    Rails.logger.warn("Invalid date range '#{date_range_string}': #{e.message}")
+    nil
+  end
+
   def selected_interval
-    date_range_params.split(" - ").map do |d|
-      Date.strptime(d, "%B %d, %Y")
-    rescue
-      raise "Invalid date: #{d} in #{date_range_params}"
-    end
+    parse_date_range(date_range_params) || parse_date_range(default_date)
   end
 
   def selected_range
@@ -56,4 +62,8 @@ def selected_range_described
       "during the period #{start_date.to_fs(:short)} to #{end_date.to_fs(:short)}"
     end
   end
+
+  def date_range_params_invalid?
+    parse_date_range(date_range_params).nil?
+  end
 end