activity_notification 2.0.0 → 2.1.0

data/activity_notification.gemspec

@@ -23,19 +23,22 @@ Gem::Specification.new do |s|
   s.add_dependency 'railties', '>= 4.2.0', '< 6.1'
   s.add_dependency 'i18n', '>= 0.5.0'
   s.add_dependency 'jquery-rails', '>= 3.1.1'
+  s.add_dependency 'swagger-blocks', '>= 3.0.0'
 
   s.add_development_dependency 'puma', '>= 3.12.0'
   s.add_development_dependency 'sqlite3', '>= 1.3.13'
   s.add_development_dependency 'mysql2', '>= 0.5.2'
   s.add_development_dependency 'pg', '>= 1.0.0'
   s.add_development_dependency 'mongoid', '>= 4.0.0'
-  s.add_development_dependency 'dynamoid', '>= 3.0.0', '< 3.2.0'
+  s.add_development_dependency 'dynamoid', '3.1.0'
   s.add_development_dependency 'rspec-rails', '>= 3.8.0'
   s.add_development_dependency 'factory_bot_rails', '>= 4.11.0', '< 5.0.0'
   s.add_development_dependency 'simplecov', '~> 0'
   s.add_development_dependency 'yard', '>= 0.9.16'
   s.add_development_dependency 'yard-activesupport-concern', '>= 0.0.1'
   s.add_development_dependency 'devise', '>= 4.5.0'
+  s.add_development_dependency 'devise_token_auth', '>= 1.1.3'
+  s.add_development_dependency 'mongoid-locker', '>=  2.0.0'
   s.add_development_dependency 'aws-sdk-sns', '~> 1'
   s.add_development_dependency 'slack-notifier', '>= 1.5.1'
 end

data/app/channels/activity_notification/notification_api_channel.rb

@@ -0,0 +1,12 @@
+if defined?(ActionCable)
+  # Action Cable API channel to subscribe broadcasted notifications.
+  class ActivityNotification::NotificationApiChannel < ActivityNotification::NotificationChannel
+    # ActionCable::Channel::Base#subscribed
+    # @see https://api.rubyonrails.org/classes/ActionCable/Channel/Base.html#method-i-subscribed
+    def subscribed
+      stream_from "#{ActivityNotification.config.notification_api_channel_prefix}_#{@target.to_class_name}#{ActivityNotification.config.composite_key_delimiter}#{@target.id}"
+    rescue
+      reject
+    end
+  end
+end

data/app/channels/activity_notification/notification_api_with_devise_channel.rb

@@ -0,0 +1,46 @@
+if defined?(ActionCable)
+  # Action Cable API channel to subscribe broadcasted notifications with Devise authentication.
+  class ActivityNotification::NotificationApiWithDeviseChannel < ActivityNotification::NotificationApiChannel
+    # Include PolymorphicHelpers to resolve string extentions
+    include ActivityNotification::PolymorphicHelpers
+
+    protected
+
+      # Find current authenticated target from auth token headers with Devise Token Auth.
+      # @api protected
+      # @param [String] devise_type Class name of Devise resource to authenticate
+      # @return [Object] Current authenticated target from auth token headers
+      def find_current_target(devise_type = nil)
+        devise_type = (devise_type || @target.notification_devise_resource.class.name).to_s
+        current_target = devise_type.to_model_class.find_by!(uid: params[:uid])
+        return nil unless current_target.valid_token?(params[:'access-token'], params[:client])
+        current_target
+      end
+
+      # Set @target instance variable from request parameters.
+      # This method overrides super (ActivityNotiication::NotificationChannel#set_target)
+      # to set devise authenticated target when the target_id params is not specified.
+      # @api protected
+      # @return [Object] Target instance (Reject subscription when request parameters are not enough)
+      def set_target
+        reject and return if (target_type = params[:target_type]).blank?
+        if params[:target_id].blank? && params["#{target_type.to_s.to_resource_name}_id"].blank?
+          reject and return if params[:devise_type].blank?
+          current_target = find_current_target(params[:devise_type])
+          params[:target_id] = target_type.to_model_class.resolve_current_devise_target(current_target)
+          reject and return if params[:target_id].blank?
+        end
+        super
+      end
+
+      # Authenticate the target of requested notification with authenticated devise resource.
+      # @api protected
+      # @return [Response] Returns connected or rejected
+      def authenticate_target!
+        current_resource = find_current_target
+        reject unless @target.authenticated_with_devise?(current_resource)
+      rescue
+        reject
+      end
+  end
+end

data/app/channels/activity_notification/notification_channel.rb

@@ -29,7 +29,7 @@ if defined?(ActionCable)
 
       # Allow the target to subscribe notification channel if notification_action_cable_with_devise? returns false
       # @api protected
-      # @return [Responce] Returns connected or rejected
+      # @return [Response] Returns connected or rejected
       def authenticate_target!
         reject if @target.nil? || @target.notification_action_cable_with_devise?
       end

data/app/channels/activity_notification/notification_with_devise_channel.rb

@@ -40,7 +40,7 @@ if defined?(ActionCable)
 
       # Authenticate the target of requested notification with authenticated devise resource.
       # @api protected
-      # @return [Responce] Returns connected or rejected
+      # @return [Response] Returns connected or rejected
       def authenticate_target!
         current_resource = find_current_target
         reject unless @target.authenticated_with_devise?(current_resource)

data/app/controllers/activity_notification/apidocs_controller.rb

@@ -0,0 +1,75 @@
+module ActivityNotification
+  # Controller to manage Swagger API references.
+  # @See https://github.com/fotinakis/swagger-blocks/blob/master/spec/lib/swagger_v3_blocks_spec.rb
+  class ApidocsController < ActivityNotification.config.parent_controller.constantize
+    include ::Swagger::Blocks
+
+    swagger_root do
+      key :openapi, '3.0.0'
+      info version: ActivityNotification::VERSION do
+        key :description, 'A default REST API created by activity_notification which provides integrated user activity notifications for Ruby on Rails'
+        key :title, 'ActivityNotification'
+        key :termsOfService, 'https://github.com/simukappu/activity_notification'
+        contact do
+          key :name, 'activity_notification community'
+          key :url,  'https://github.com/simukappu/activity_notification#help'
+        end
+        license do
+          key :name, 'MIT'
+          key :url,  'https://github.com/simukappu/activity_notification/blob/master/MIT-LICENSE'
+        end
+      end
+
+      server do
+        key :url, 'https://activity-notification-example.herokuapp.com/api/{version}'
+        key :description, 'ActivityNotification online demo including REST API'
+  
+        variable :version do
+          key :enum, ['v2']
+          key :default, :"v#{ActivityNotification::GEM_VERSION::MAJOR}"
+        end
+      end
+      server do
+        key :url, 'http://localhost:3000/api/{version}'
+        key :description, 'Example Rails application at localhost including REST API'
+  
+        variable :version do
+          key :enum, ['v2']
+          key :default, :"v#{ActivityNotification::GEM_VERSION::MAJOR}"
+        end
+      end
+
+      tag do
+        key :name, 'notifications'
+        key :description, 'Operations about user activity notifications'
+        externalDocs do
+          key :description, 'Find out more'
+          key :url, 'https://github.com/simukappu/activity_notification#creating-notifications'
+        end
+      end
+
+      tag do
+        key :name, 'subscriptions'
+        key :description, 'Operations about subscription management'
+        externalDocs do
+          key :description, 'Find out more'
+          key :url, 'https://github.com/simukappu/activity_notification#subscription-management'
+        end
+      end
+    end
+  
+    SWAGGERED_CLASSES = [
+      Notification,
+      NotificationsApiController,
+      Subscription,
+      SubscriptionsApiController,
+      self
+    ].freeze
+  
+    # Returns root JSON of Swagger API references.
+    # GET /apidocs
+    def index
+      render json: ::Swagger::Blocks.build_root_json(SWAGGERED_CLASSES)
+    end
+  end
+end

data/app/controllers/activity_notification/notifications_api_controller.rb

@@ -0,0 +1,143 @@
+module ActivityNotification
+  # Controller to manage notifications API.
+  class NotificationsApiController < NotificationsController
+    # Include Swagger API reference
+    include Swagger::NotificationsApi
+    # Include CommonApiController to select target and define common methods
+    include CommonApiController
+    protect_from_forgery except: [:open_all]
+    rescue_from ActivityNotification::NotifiableNotFoundError, with: :render_notifiable_not_found
+
+    # Returns notification index of the target.
+    #
+    # GET /:target_type/:target_id/notifications
+    # @overload index(params)
+    #   @param [Hash] params Request parameter options for notification index
+    #   @option params [String] :filter                 (nil)     Filter option to load notification index by their status (Nothing as auto, 'opened' or 'unopened')
+    #   @option params [String] :limit                  (nil)     Maximum number of notifications to return
+    #   @option params [String] :reverse                ('false') Whether notification index will be ordered as earliest first
+    #   @option params [String] :without_grouping       ('false') Whether notification index will include group members
+    #   @option params [String] :with_group_members     ('false') Whether notification index will include group members
+    #   @option params [String] :filtered_by_type       (nil)     Notifiable type to filter notification index
+    #   @option params [String] :filtered_by_group_type (nil)     Group type to filter notification index, valid with :filtered_by_group_id
+    #   @option params [String] :filtered_by_group_id   (nil)     Group instance ID to filter notification index, valid with :filtered_by_group_type
+    #   @option params [String] :filtered_by_key        (nil)     Key of notifications to filter notification index
+    #   @option params [String] :later_than             (nil)     ISO 8601 format time to filter notification index later than specified time
+    #   @option params [String] :earlier_than           (nil)     ISO 8601 format time to filter notification index earlier than specified time
+    #   @return [JSON] count: number of notification index records, notifications: notification index
+    def index
+      super
+      render json: {
+        count: @notifications.size, 
+        notifications: @notifications.as_json(notification_json_options)
+      }
+    end
+
+    # Opens all notifications of the target.
+    #
+    # POST /:target_type/:target_id/notifications/open_all
+    # @overload open_all(params)
+    #   @param [Hash] params Request parameters
+    #   @option params [String] :filtered_by_type       (nil)     Notifiable type to filter notification index
+    #   @option params [String] :filtered_by_group_type (nil)     Group type to filter notification index, valid with :filtered_by_group_id
+    #   @option params [String] :filtered_by_group_id   (nil)     Group instance ID to filter notification index, valid with :filtered_by_group_type
+    #   @option params [String] :filtered_by_key        (nil)     Key of notifications to filter notification index
+    #   @option params [String] :later_than             (nil)     ISO 8601 format time to filter notification index later than specified time
+    #   @option params [String] :earlier_than           (nil)     ISO 8601 format time to filter notification index earlier than specified time
+    #   @return [JSON] count: number of opened notification records, notifications: opened notifications
+    def open_all
+      super
+      render json: {
+        count: @opened_notifications.size,
+        notifications: @opened_notifications.as_json(notification_json_options)
+      }
+    end
+  
+    # Returns a single notification.
+    #
+    # GET /:target_type/:target_id/notifications/:id
+    # @overload show(params)
+    #   @param [Hash] params Request parameters
+    #   @return [JSON] Found single notification
+    def show
+      super
+      render json: notification_json
+    end
+  
+    # Deletes a notification.
+    #
+    # DELETE /:target_type/:target_id/notifications/:id
+    # @overload destroy(params)
+    #   @param [Hash] params Request parameters
+    #   @return [JSON] 204 No Content
+    def destroy
+      super
+      head 204
+    end
+  
+    # Opens a notification.
+    #
+    # PUT /:target_type/:target_id/notifications/:id/open
+    # @overload open(params)
+    #   @param [Hash] params Request parameters
+    #   @option params [String] :move ('false') Whether it redirects to notifiable_path after the notification is opened
+    #   @return [JSON] count: number of opened notification records, notification: opened notification
+    def open
+      super
+      unless params[:move].to_s.to_boolean(false)
+        render json: {
+          count: @opened_notifications_count,
+          notification: notification_json
+        }
+      end
+    end
+
+    # Moves to notifiable_path of the notification.
+    #
+    # GET /:target_type/:target_id/notifications/:id/move
+    # @overload open(params)
+    #   @param [Hash] params Request parameters
+    #   @option params [String] :open ('false') Whether the notification will be opened
+    #   @return [JSON] location: notifiable path, count: number of opened notification records, notification: specified notification
+    def move
+      super
+      render status: 302, location: @notification.notifiable_path, json: {
+        location: @notification.notifiable_path,
+        count: (@opened_notifications_count || 0),
+        notification: notification_json
+      }
+    end
+
+    protected
+
+      # Returns options for notification JSON
+      # @api protected
+      def notification_json_options
+        {
+          include: {
+            target: { methods: [:printable_type, :printable_target_name] },
+            notifiable: { methods: [:printable_type] },
+            group: { methods: [:printable_type, :printable_group_name] },
+            notifier: { methods: [:printable_type, :printable_notifier_name] },
+            group_members: {}
+          },
+          methods: [:notifiable_path, :printable_notifiable_name, :group_member_notifier_count, :group_notification_count]
+        }
+      end
+
+      # Returns JSON of @notification
+      # @api protected
+      def notification_json
+        @notification.as_json(notification_json_options)
+      end
+
+      # Render associated notifiable record not found error with 500 status
+      # @api protected
+      # @param [Error] error Error object
+      # @return [void]
+      def render_notifiable_not_found(error)
+        render status: 500, json: error_response(code: 500, message: "Associated record not found", type: error.message)
+      end
+
+  end
+end

data/app/controllers/activity_notification/notifications_api_with_devise_controller.rb

@@ -0,0 +1,7 @@
+module ActivityNotification
+  # Controller to manage notifications API with Devise authentication.
+  class NotificationsApiWithDeviseController < NotificationsApiController
+    include DeviseTokenAuth::Concerns::SetUserByToken
+    include DeviseAuthenticationController
+  end
+end

data/app/controllers/activity_notification/notifications_controller.rb

@@ -10,24 +10,22 @@ module ActivityNotification
     # GET /:target_type/:target_id/notifications
     # @overload index(params)
     #   @param [Hash] params Request parameter options for notification index
-    #   @option params [String] :filter                 (nil)     Filter option to load notification index (Nothing as auto, 'opened' or 'unopened')
-    #   @option params [String] :limit                  (nil)     Limit to query for notifications
-    #   @option params [String] :reverse                ('false') If notification index will be ordered as earliest first
-    #   @option params [String] :without_grouping       ('false') If notification index will include group members
-    #   @option params [String] :with_group_members     ('false') If notification index will include group members
-    #   @option params [String] :filtered_by_type       (nil)     Notifiable type for filter
-    #   @option params [String] :filtered_by_group_type (nil)     Group type for filter, valid with :filtered_by_group_id
-    #   @option params [String] :filtered_by_group_id   (nil)     Group instance id for filter, valid with :filtered_by_group_type
-    #   @option params [String] :filtered_by_key        (nil)     Key of the notification for filter
+    #   @option params [String] :filter                 (nil)     Filter option to load notification index by their status (Nothing as auto, 'opened' or 'unopened')
+    #   @option params [String] :limit                  (nil)     Maximum number of notifications to return
+    #   @option params [String] :reverse                ('false') Whether notification index will be ordered as earliest first
+    #   @option params [String] :without_grouping       ('false') Whether notification index will include group members
+    #   @option params [String] :with_group_members     ('false') Whether notification index will include group members
+    #   @option params [String] :filtered_by_type       (nil)     Notifiable type to filter notification index
+    #   @option params [String] :filtered_by_group_type (nil)     Group type to filter notification index, valid with :filtered_by_group_id
+    #   @option params [String] :filtered_by_group_id   (nil)     Group instance ID to filter notification index, valid with :filtered_by_group_type
+    #   @option params [String] :filtered_by_key        (nil)     Key of notifications to filter notification index
+    #   @option params [String] :later_than             (nil)     ISO 8601 format time to filter notification index later than specified time
+    #   @option params [String] :earlier_than           (nil)     ISO 8601 format time to filter notification index earlier than specified time
     #   @option params [String] :reload                 ('true')  Whether notification index will be reloaded
-    #   @return [Responce] HTML view as default or JSON of notification index with json format parameter
+    #   @return [Response] HTML view of notification index
     def index
       set_index_options
       load_index if params[:reload].to_s.to_boolean(true)
-      respond_to do |format|
-        format.html # index.html.erb
-        format.json { render json: @notifications.to_json(include: [:target, :notifiable, :group]) }
-      end
     end
 
     # Opens all notifications of the target.
@@ -35,18 +33,20 @@ module ActivityNotification
     # POST /:target_type/:target_id/notifications/open_all
     # @overload open_all(params)
     #   @param [Hash] params Request parameters
-    #   @option params [String] :filter  (nil)     Filter option to load notification index (Nothing as auto, 'opened' or 'unopened')
-    #   @option params [String] :limit   (nil)     Limit to query for notifications
-    #   @option params [String] :reload  ('true')  Whether notification index will be reloaded
-    #   @option params [String] :without_grouping       ('false') If notification index will include group members
-    #   @option params [String] :with_group_members     ('false') If notification index will include group members
-    #   @option params [String] :filtered_by_type       (nil) Notifiable type for filter
-    #   @option params [String] :filtered_by_group_type (nil) Group type for filter, valid only :filtered_by_group_id
-    #   @option params [String] :filtered_by_group_id   (nil) Group instance id for filter, valid only :filtered_by_group_type
-    #   @option params [String] :filtered_by_key        (nil) Key of the notification for filter 
-    #   @return [Responce] JavaScript view for ajax request or redirects to back as default
+    #   @option params [String] :filter                 (nil)     Filter option to load notification index by their status (Nothing as auto, 'opened' or 'unopened')
+    #   @option params [String] :limit                  (nil)     Maximum number of notifications to return
+    #   @option params [String] :without_grouping       ('false') Whether notification index will include group members
+    #   @option params [String] :with_group_members     ('false') Whether notification index will include group members
+    #   @option params [String] :filtered_by_type       (nil)     Notifiable type to filter notification index
+    #   @option params [String] :filtered_by_group_type (nil)     Group type to filter notification index, valid with :filtered_by_group_id
+    #   @option params [String] :filtered_by_group_id   (nil)     Group instance ID to filter notification index, valid with :filtered_by_group_type
+    #   @option params [String] :filtered_by_key        (nil)     Key of notifications to filter notification index
+    #   @option params [String] :later_than             (nil)     ISO 8601 format time to filter notification index later than specified time
+    #   @option params [String] :earlier_than           (nil)     ISO 8601 format time to filter notification index earlier than specified time
+    #   @option params [String] :reload                 ('true')  Whether notification index will be reloaded
+    #   @return [Response] JavaScript view for ajax request or redirects to back as default
     def open_all
-      @target.open_all_notifications(params)
+      @opened_notifications = @target.open_all_notifications(params)
       return_back_or_ajax
     end
   
@@ -55,22 +55,21 @@ module ActivityNotification
     # GET /:target_type/:target_id/notifications/:id
     # @overload show(params)
     #   @param [Hash] params Request parameters
-    #   @return [Responce] HTML view as default
+    #   @return [Response] HTML view as default
     def show
     end
   
     # Deletes a notification.
     #
     # DELETE /:target_type/:target_id/notifications/:id
-    #
     # @overload destroy(params)
     #   @param [Hash] params Request parameters
-    #   @option params [String] :filter             (nil)     Filter option to load notification index (Nothing as auto, 'opened' or 'unopened')
-    #   @option params [String] :limit              (nil)     Limit to query for notifications
-    #   @option params [String] :reload             ('true')  Whether notification index will be reloaded
-    #   @option params [String] :without_grouping   ('false') If notification index will include group members
-    #   @option params [String] :with_group_members ('false') If notification index will include group members
-    #   @return [Responce] JavaScript view for ajax request or redirects to back as default
+    #   @option params [String] :filter                 (nil)     Filter option to load notification index by their status (Nothing as auto, 'opened' or 'unopened')
+    #   @option params [String] :limit                  (nil)     Maximum number of notifications to return
+    #   @option params [String] :without_grouping       ('false') Whether notification index will include group members
+    #   @option params [String] :with_group_members     ('false') Whether notification index will include group members
+    #   @option params [String] :reload                 ('true')  Whether notification index will be reloaded
+    #   @return [Response] JavaScript view for ajax request or redirects to back as default
     def destroy
       @notification.destroy
       return_back_or_ajax
@@ -78,22 +77,20 @@ module ActivityNotification
   
     # Opens a notification.
     #
-    # POST /:target_type/:target_id/notifications/:id/open
+    # PUT /:target_type/:target_id/notifications/:id/open
     # @overload open(params)
     #   @param [Hash] params Request parameters
-    #   @option params [String] :move               ('false') Whether redirects to notifiable_path after the notification is opened
-    #   @option params [String] :filter             (nil)     Filter option to load notification index (Nothing as auto, 'opened' or 'unopened')
-    #   @option params [String] :limit              (nil)     Limit to query for notifications
-    #   @option params [String] :reload             ('true')  Whether notification index will be reloaded
-    #   @option params [String] :without_grouping   ('false') If notification index will include group members
-    #   @option params [String] :with_group_members ('false') If notification index will include group members
-    #   @return [Responce] JavaScript view for ajax request or redirects to back as default
+    #   @option params [String] :move                   ('false') Whether it redirects to notifiable_path after the notification is opened
+    #   @option params [String] :filter                 (nil)     Filter option to load notification index by their status (Nothing as auto, 'opened' or 'unopened')
+    #   @option params [String] :limit                  (nil)     Maximum number of notifications to return
+    #   @option params [String] :without_grouping       ('false') Whether notification index will include group members
+    #   @option params [String] :with_group_members     ('false') Whether notification index will include group members
+    #   @option params [String] :reload                 ('true')  Whether notification index will be reloaded
+    #   @return [Response] JavaScript view for ajax request or redirects to back as default
     def open
       with_members = !(params[:with_group_members].to_s.to_boolean(false) || params[:without_grouping].to_s.to_boolean(false))
-      @notification.open!(with_members: with_members)
-      params[:move].to_s.to_boolean(false) ? 
-        move : 
-        return_back_or_ajax
+      @opened_notifications_count = @notification.open!(with_members: with_members)
+      params[:move].to_s.to_boolean(false) ? move : return_back_or_ajax
     end
 
     # Moves to notifiable_path of the notification.
@@ -101,14 +98,17 @@ module ActivityNotification
     # GET /:target_type/:target_id/notifications/:id/move
     # @overload open(params)
     #   @param [Hash] params Request parameters
-    #   @option params [String] :open    ('false') Whether the notification will be opened
-    #   @option params [String] :filter  (nil)     Filter option to load notification index (Nothing as auto, 'opened' or 'unopened')
-    #   @option params [String] :limit   (nil)     Limit to query for notifications
-    #   @option params [String] :reload  ('true')  Whether notification index will be reloaded
-    #   @return [Responce] JavaScript view for ajax request or redirects to back as default
+    #   @option params [String] :open                   ('false') Whether the notification will be opened
+    #   @option params [String] :filter                 (nil)     Filter option to load notification index by their status (Nothing as auto, 'opened' or 'unopened')
+    #   @option params [String] :limit                  (nil)     Maximum number of notifications to return
+    #   @option params [String] :without_grouping       ('false') Whether notification index will include group members
+    #   @option params [String] :with_group_members     ('false') Whether notification index will include group members
+    #   @option params [String] :reload                 ('true')  Whether notification index will be reloaded
+    #   @return [Response] JavaScript view for ajax request or redirects to back as default
     def move
-      @notification.open! if params[:open].to_s.to_boolean(false)
-      redirect_to @notification.notifiable_path
+      with_members = !(params[:with_group_members].to_s.to_boolean(false) || params[:without_grouping].to_s.to_boolean(false))
+      @opened_notifications_count = @notification.open!(with_members: with_members) if params[:open].to_s.to_boolean(false)
+      redirect_to_notifiable_path
     end
   
     # Returns path of the target view templates.
@@ -117,6 +117,26 @@ module ActivityNotification
       super
     end
 
+    # :nocov:
+    if Rails::VERSION::MAJOR == 4
+      # Defines custom renderer class method for Rails 4.2
+      def self.renderer
+        view_context = ActionView::Base.new(ActionController::Base.view_paths, {})
+        view_context.class_eval do 
+          include Rails.application.routes.url_helpers
+          def default_url_options
+            ActionMailer::Base.default_url_options
+          end
+          def render(params = {})
+            assign(params[:assigns])
+            super(params)
+          end
+        end
+        view_context
+      end
+    end
+    # :nocov:
+
     protected
 
       # Sets @notification instance variable from request parameters.
@@ -135,7 +155,7 @@ module ActivityNotification
                                params[:reverse].to_s.to_boolean(false) : nil
         with_group_members = params[:with_group_members].present? || params[:without_grouping].present? ?
                                params[:with_group_members].to_s.to_boolean(false) || params[:without_grouping].to_s.to_boolean(false) : nil
-        @index_options     = params.permit(:filter, :filtered_by_type, :filtered_by_group_type, :filtered_by_group_id, :filtered_by_key, :routing_scope, :devise_default_routes)
+        @index_options     = params.permit(:filter, :filtered_by_type, :filtered_by_group_type, :filtered_by_group_id, :filtered_by_key, :later_than, :earlier_than, :routing_scope, :devise_default_routes)
                                    .to_h.symbolize_keys
                                    .merge(limit: limit, reverse: reverse, with_group_members: with_group_members)
       end
@@ -155,6 +175,12 @@ module ActivityNotification
           end
       end
 
+      # Redirect to notifiable_path
+      # @api protected
+      def redirect_to_notifiable_path
+        redirect_to @notification.notifiable_path
+      end
+
       # Returns controller path.
       # This method is called from target_view_path method and can be overridden.
       # @api protected