Show notifications from 7 days before or after product year

Author: embarnard

app/controllers/hub/user_notifications_controller.rb

@@ -5,7 +5,13 @@ class UserNotificationsController < Hub::BaseController
 
     def index
       @page_title = I18n.t("hub.clients.navigation.notifications")
-      @user_notifications = current_user.notifications.where('created_at >= ?', Date.new(Rails.configuration.product_year)).order(created_at: :desc).page(params[:page])
+      cutoff = [
+        app_time - 7.days,
+        Date.new(Rails.configuration.product_year)
+      ].min
+      @user_notifications = current_user.notifications
+                                        .where('created_at >= ?', cutoff)
+                                        .order(created_at: :desc).page(params[:page])
     end
 
     def mark_all_notifications_read

spec/features/hub/bulk_actions_spec.rb

@@ -27,14 +27,14 @@
 
     click_on "Change organization"
 
-    expect(page).to have_text "You’ve selected Change Organization for 2 clients"
+    page_change_check("You’ve selected Change Organization for 2 clients")
     select "Orange Organization", from: "New organization"
     fill_in "Send message (English)", with: "Orange is your best bet"
     fill_in "Send message (Spanish)", with: "Naranja es la mejor"
     fill_in "Add an internal note", with: "Moved!"
     click_on "Submit"
 
-    expect(current_path).to eq hub_user_notifications_path
+    page_change_check(hub_user_notifications_path, path: true)
     perform_enqueued_jobs
     visit page.current_path
     expect(page).to have_text "You successfully moved 2 clients to Orange Organization."
@@ -51,12 +51,12 @@
       click_on "Nombre"
     end
     click_on "Notes"
-    expect(page).to have_text "Moved!"
+    page_change_check("Moved!")
 
     perform_enqueued_jobs
 
     click_on "Messages"
-    expect(page).to have_text "Naranja es la mejor"
+    page_change_check("Naranja es la mejor")
 
     visit hub_user_notifications_path
     within ".in-progress" do
@@ -86,12 +86,12 @@
 
     click_on "Send a message"
 
-    expect(page).to have_text "You’ve selected Send a Message for 2 clients"
+    page_change_check("You’ve selected Send a Message for 2 clients")
     fill_in "Send message (English)", with: "Orange is your best bet"
     fill_in "Send message (Spanish)", with: "Naranja es la mejor"
     click_on "Submit"
 
-    expect(current_path).to eq hub_user_notifications_path
+    page_change_check(hub_user_notifications_path, path: true)
     perform_enqueued_jobs
     visit page.current_path
     expect(page).to have_text "Bulk Send a Message In Progress"
@@ -106,7 +106,7 @@
       click_on "Nombre"
     end
     click_on "Messages"
-    expect(page).to have_text "Naranja es la mejor"
+    page_change_check("Naranja es la mejor")
 
     visit hub_user_notifications_path
     within ".in-progress" do
@@ -117,7 +117,7 @@
       click_on "Name"
     end
     click_on "Messages"
-    expect(page).to have_text "Orange is your best bet"
+    page_change_check("Orange is your best bet")
   end
 
   scenario "bulk changing assignee and/or status", js: true do