activity_notification 2.5.1 → 2.6.0

data/lib/activity_notification/models/concerns/target.rb

@@ -9,7 +9,7 @@ module ActivityNotification
 
       # Has many notification instances of this target.
       # @scope instance
-      # @return [Array<Notificaion>, Mongoid::Criteria<Notificaion>] Array or database query of notifications of this target
+      # @return [Array<Notification>, Mongoid::Criteria<Notification>] Array or database query of notifications of this target
       has_many_records :notifications,
         class_name: "::ActivityNotification::Notification",
         as: :target,
@@ -64,7 +64,7 @@ module ActivityNotification
       # @option options [String]     :later_than             (nil)   ISO 8601 format time to filter notifications later than specified time
       # @option options [String]     :earlier_than           (nil)   ISO 8601 format time to filter notifications earlier than specified time
       # @option options [Array|Hash] :custom_filter          (nil)   Custom notification filter (e.g. ["created_at >= ?", time.hour.ago])
-      # @return [Array<Notificaion>] All notifications for this target type
+      # @return [Array<Notification>] All notifications for this target type
       def all_notifications(options = {})
         reverse                = options[:reverse] || false
         with_group_members     = options[:with_group_members] || false
@@ -106,7 +106,7 @@ module ActivityNotification
       # @option options [String]     :later_than             (nil)   ISO 8601 format time to filter notifications later than specified time
       # @option options [String]     :earlier_than           (nil)   ISO 8601 format time to filter notifications earlier than specified time
       # @option options [Array|Hash] :custom_filter          (nil)   Custom notification filter (e.g. ["created_at >= ?", time.hour.ago])
-      # @return [Hash<Target, Notificaion>] All notifications for this target type grouped by targets
+      # @return [Hash<Target, Notification>] All notifications for this target type grouped by targets
       def notification_index_map(options = {})
         all_notifications(options).group_by(&:target)
       end
@@ -143,7 +143,7 @@ module ActivityNotification
       end
 
       # Resolves current authenticated target by devise authentication from current resource signed in with Devise.
-      # This method is able to be overridden.
+      # This method can be overridden.
       #
       # @param [Object] current_resource Current resource signed in with Devise
       # @return [Object] Current authenticated target by devise authentication
@@ -160,7 +160,7 @@ module ActivityNotification
     end
 
     # Returns target email address for email notification.
-    # This method is able to be overridden.
+    # This method can be overridden.
     #
     # @return [String] Target email address
     def mailer_to
@@ -168,7 +168,7 @@ module ActivityNotification
     end
 
     # Returns if sending notification email is allowed for the target from configured field or overridden method.
-    # This method is able to be overridden.
+    # This method can be overridden.
     #
     # @param [Object] notifiable Notifiable instance of the notification
     # @param [String] key Key of the notification
@@ -178,7 +178,7 @@ module ActivityNotification
     end
 
     # Returns if sending batch notification email is allowed for the target from configured field or overridden method.
-    # This method is able to be overridden.
+    # This method can be overridden.
     #
     # @param [String] key Key of the notifications
     # @return [Boolean] If sending batch notification email is allowed for the target
@@ -187,7 +187,7 @@ module ActivityNotification
     end
 
     # Returns if subscription management is allowed for the target from configured field or overridden method.
-    # This method is able to be overridden.
+    # This method can be overridden.
     #
     # @param [String] key Key of the notifications
     # @return [Boolean] If subscription management is allowed for the target
@@ -197,7 +197,7 @@ module ActivityNotification
     alias_method :notification_subscription_allowed?, :subscription_allowed?
 
     # Returns if publishing WebSocket using ActionCable is allowed for the target from configured field or overridden method.
-    # This method is able to be overridden.
+    # This method can be overridden.
     #
     # @param [Object] notifiable Notifiable instance of the notification
     # @param [String] key Key of the notification
@@ -228,7 +228,7 @@ module ActivityNotification
     end
 
     # Returns if current resource signed in with Devise is authenticated for the notification.
-    # This method is able to be overridden.
+    # This method can be overridden.
     #
     # @param [Object] current_resource Current resource signed in with Devise
     # @return [Boolean] If current resource signed in with Devise is authenticated for the notification
@@ -288,8 +288,8 @@ module ActivityNotification
     # Returns automatically arranged notification index of the target.
     # This method is the typical way to get notification index from controller and view.
     # When the target has unopened notifications, it returns unopened notifications first.
-    # Additionaly, it returns opened notifications unless unopened index size overs the limit.
-    # @todo Is this conbimned array the best solution?
+    # Additionally, it returns opened notifications unless unopened index size overs the limit.
+    # @todo Is this combined array the best solution?
     #
     # @example Get automatically arranged notification index of @user
     #   @notifications = @user.notification_index
@@ -307,7 +307,7 @@ module ActivityNotification
     # @option options [String]     :later_than             (nil)   ISO 8601 format time to filter notifications later than specified time
     # @option options [String]     :earlier_than           (nil)   ISO 8601 format time to filter notifications earlier than specified time
     # @option options [Array|Hash] :custom_filter          (nil)   Custom notification filter (e.g. ["created_at >= ?", time.hour.ago])
-    # @return [Array<Notificaion>] Notification index of the target
+    # @return [Array<Notification>] Notification index of the target
     def notification_index(options = {})
       arrange_notification_index(method(:unopened_notification_index),
                                  method(:opened_notification_index),
@@ -332,7 +332,7 @@ module ActivityNotification
     # @option options [String]     :later_than             (nil)   ISO 8601 format time to filter notifications later than specified time
     # @option options [String]     :earlier_than           (nil)   ISO 8601 format time to filter notifications earlier than specified time
     # @option options [Array|Hash] :custom_filter          (nil)   Custom notification filter (e.g. ["created_at >= ?", time.hour.ago])
-    # @return [Array<Notificaion>] Unopened notification index of the target
+    # @return [Array<Notification>] Unopened notification index of the target
     def unopened_notification_index(options = {})
       arrange_single_notification_index(method(:_unopened_notification_index), options)
     end
@@ -355,7 +355,7 @@ module ActivityNotification
     # @option options [String]     :later_than             (nil)   ISO 8601 format time to filter notifications later than specified time
     # @option options [String]     :earlier_than           (nil)   ISO 8601 format time to filter notifications earlier than specified time
     # @option options [Array|Hash] :custom_filter          (nil)   Custom notification filter (e.g. ["created_at >= ?", time.hour.ago])
-    # @return [Array<Notificaion>] Opened notification index of the target
+    # @return [Array<Notification>] Opened notification index of the target
     def opened_notification_index(options = {})
       arrange_single_notification_index(method(:_opened_notification_index), options)
     end
@@ -374,7 +374,7 @@ module ActivityNotification
     # @option options [Boolean]                 :send_email               (true)                                Whether it sends notification email
     # @option options [Boolean]                 :send_later               (true)                                Whether it sends notification email asynchronously
     # @option options [Boolean]                 :publish_optional_targets (true)                                Whether it publishes notification to optional targets
-    # @option options [Hash<String, Hash>]      :optional_targets         ({})                                  Options for optional targets, keys are optional target name (:amazon_sns or :slack etc) and values are options
+    # @option options [Hash<String, Hash>]      :optional_targets         ({})                                  Options for optional targets, keys are optional target name (:amazon_sns or :slack etc.) and values are options
     # @return [Notification] Generated notification instance
     def receive_notification_of(notifiable, options = {})
       Notification.notify_to(self, notifiable, options)
@@ -395,7 +395,7 @@ module ActivityNotification
     # @option options [Boolean]                 :send_email               (true)                                Whether it sends notification email
     # @option options [Boolean]                 :send_later               (true)                                Whether it sends notification email asynchronously
     # @option options [Boolean]                 :publish_optional_targets (true)                                Whether it publishes notification to optional targets
-    # @option options [Hash<String, Hash>]      :optional_targets         ({})                                  Options for optional targets, keys are optional target name (:amazon_sns or :slack etc) and values are options
+    # @option options [Hash<String, Hash>]      :optional_targets         ({})                                  Options for optional targets, keys are optional target name (:amazon_sns or :slack etc.) and values are options
     # @return [Notification] Generated notification instance
     def receive_notification_later_of(notifiable, options = {})
       Notification.notify_later_to(self, notifiable, options)
@@ -439,7 +439,7 @@ module ActivityNotification
     # Gets automatically arranged notification index of the target with included attributes like target, notifiable, group and notifier.
     # This method is the typical way to get notifications index from controller of view.
     # When the target have unopened notifications, it returns unopened notifications first.
-    # Additionaly, it returns opened notifications unless unopened index size overs the limit.
+    # Additionally, it returns opened notifications unless unopened index size overs the limit.
     # @todo Is this switching the best solution?
     #
     # @example Get automatically arranged notification index of the @user with included attributes
@@ -461,7 +461,7 @@ module ActivityNotification
     # @option options [String]         :later_than             (nil)           ISO 8601 format time to filter notifications later than specified time
     # @option options [String]         :earlier_than           (nil)           ISO 8601 format time to filter notifications earlier than specified time
     # @option options [Array|Hash]     :custom_filter          (nil)           Custom notification filter (e.g. ["created_at >= ?", time.hour.ago])
-    # @return [Array<Notificaion>] Notification index of the target with attributes
+    # @return [Array<Notification>] Notification index of the target with attributes
     def notification_index_with_attributes(options = {})
       arrange_notification_index(method(:unopened_notification_index_with_attributes),
                                  method(:opened_notification_index_with_attributes),
@@ -486,7 +486,7 @@ module ActivityNotification
     # @option options [String]     :later_than             (nil)   ISO 8601 format time to filter notifications later than specified time
     # @option options [String]     :earlier_than           (nil)   ISO 8601 format time to filter notifications earlier than specified time
     # @option options [Array|Hash] :custom_filter          (nil)   Custom notification filter (e.g. ["created_at >= ?", time.hour.ago])
-    # @return [Array<Notificaion>] Unopened notification index of the target with attributes
+    # @return [Array<Notification>] Unopened notification index of the target with attributes
     def unopened_notification_index_with_attributes(options = {})
       include_attributes(_unopened_notification_index(options)).to_a
     end
@@ -509,7 +509,7 @@ module ActivityNotification
     # @option options [String]     :later_than             (nil)   ISO 8601 format time to filter notifications later than specified time
     # @option options [String]     :earlier_than           (nil)   ISO 8601 format time to filter notifications earlier than specified time
     # @option options [Array|Hash] :custom_filter          (nil)   Custom notification filter (e.g. ["created_at >= ?", time.hour.ago])
-    # @return [Array<Notificaion>] Opened notification index of the target with attributes
+    # @return [Array<Notification>] Opened notification index of the target with attributes
     def opened_notification_index_with_attributes(options = {})
       include_attributes(_opened_notification_index(options)).to_a
     end
@@ -545,17 +545,20 @@ module ActivityNotification
     # It also returns true when the subscription management is not allowed for the target.
     #
     # @param [String]  key                  Key of the notification
-    # @param [Boolean] subscribe_as_default Default subscription value to use when the subscription record does not configured
+    # @param [Boolean] subscribe_as_default Default subscription value to use when the subscription record is not configured
+    # @param [Object]  notifiable           Optional notifiable instance for instance-level subscription check
     # @return [Boolean] If the target subscribes the notification or the subscription management is not allowed for the target
-    def subscribes_to_notification?(key, subscribe_as_default = ActivityNotification.config.subscribe_as_default)
-      !subscription_allowed?(key) || _subscribes_to_notification?(key, subscribe_as_default)
+    def subscribes_to_notification?(key, subscribe_as_default = ActivityNotification.config.subscribe_as_default, notifiable: nil)
+      return true unless subscription_allowed?(key)
+      _subscribes_to_notification?(key, subscribe_as_default) ||
+        (notifiable.present? && _subscribes_to_notification_for_instance?(key, notifiable))
     end
 
     # Returns if the target subscribes to the notification email.
     # It also returns true when the subscription management is not allowed for the target.
     #
     # @param [String]  key                  Key of the notification
-    # @param [Boolean] subscribe_as_default Default subscription value to use when the subscription record does not configured
+    # @param [Boolean] subscribe_as_default Default subscription value to use when the subscription record is not configured
     # @return [Boolean] If the target subscribes the notification email or the subscription management is not allowed for the target
     def subscribes_to_notification_email?(key, subscribe_as_default = ActivityNotification.config.subscribe_to_email_as_default)
       !subscription_allowed?(key) || _subscribes_to_notification_email?(key, subscribe_as_default)
@@ -567,7 +570,7 @@ module ActivityNotification
     #
     # @param [String]         key                  Key of the notification
     # @param [String, Symbol] optional_target_name Class name of the optional target implementation (e.g. :amazon_sns, :slack)
-    # @param [Boolean]        subscribe_as_default Default subscription value to use when the subscription record does not configured
+    # @param [Boolean]        subscribe_as_default Default subscription value to use when the subscription record is not configured
     # @return [Boolean] If the target subscribes the notification email or the subscription management is not allowed for the target
     def subscribes_to_optional_target?(key, optional_target_name, subscribe_as_default = ActivityNotification.config.subscribe_to_optional_targets_as_default)
       !subscription_allowed?(key) || _subscribes_to_optional_target?(key, optional_target_name, subscribe_as_default)
@@ -590,7 +593,7 @@ module ActivityNotification
       # @option options [String]     :later_than             (nil)   ISO 8601 format time to filter notifications later than specified time
       # @option options [String]     :earlier_than           (nil)   ISO 8601 format time to filter notifications earlier than specified time
       # @option options [Array|Hash] :custom_filter          (nil)   Custom notification filter (e.g. ["created_at >= ?", time.hour.ago])
-      # @return [ActiveRecord_AssociationRelation<Notificaion>|Mongoid::Criteria<Notificaion>|Dynamoid::Criteria::Chain] Unopened notification index of the target
+      # @return [ActiveRecord_AssociationRelation<Notification>|Mongoid::Criteria<Notification>|Dynamoid::Criteria::Chain] Unopened notification index of the target
       def _unopened_notification_index(options = {})
         reverse            = options[:reverse] || false
         with_group_members = options[:with_group_members] || false
@@ -612,7 +615,7 @@ module ActivityNotification
       # @option options [String]     :later_than             (nil)   ISO 8601 format time to filter notifications later than specified time
       # @option options [String]     :earlier_than           (nil)   ISO 8601 format time to filter notifications earlier than specified time
       # @option options [Array|Hash] :custom_filter          (nil)   Custom notification filter (e.g. ["created_at >= ?", time.hour.ago])
-      # @return [ActiveRecord_AssociationRelation<Notificaion>|Mongoid::Criteria<Notificaion>|Dynamoid::Criteria::Chain] Opened notification index of the target
+      # @return [ActiveRecord_AssociationRelation<Notification>|Mongoid::Criteria<Notification>|Dynamoid::Criteria::Chain] Opened notification index of the target
       def _opened_notification_index(options = {})
         limit              = options[:limit] || ActivityNotification.config.opened_index_limit
         reverse            = options[:reverse] || false
@@ -622,11 +625,11 @@ module ActivityNotification
 
       # Includes attributes like target, notifiable, group or notifier from the notification index.
       # When group member exists in the notification index, group will be included in addition to target, notifiable and or notifier.
-      # Otherwise, target, notifiable and or notifier will be include without group.
+      # Otherwise, target, notifiable and or notifier will be included without group.
       # @api private
       #
-      # @param [ActiveRecord_AssociationRelation<Notificaion>|Mongoid::Criteria<Notificaion>|Dynamoid::Criteria::Chain] target_index Notification index
-      # @return [ActiveRecord_AssociationRelation<Notificaion>|Mongoid::Criteria<Notificaion>|Dynamoid::Criteria::Chain] Notification index with attributes
+      # @param [ActiveRecord_AssociationRelation<Notification>|Mongoid::Criteria<Notification>|Dynamoid::Criteria::Chain] target_index Notification index
+      # @return [ActiveRecord_AssociationRelation<Notification>|Mongoid::Criteria<Notification>|Dynamoid::Criteria::Chain] Notification index with attributes
       def include_attributes(target_index)
         if target_index.present?
           Notification.group_member_exists?(target_index.to_a) ?
@@ -654,7 +657,7 @@ module ActivityNotification
       # @option options [String]     :later_than             (nil)   ISO 8601 format time to filter notifications later than specified time
       # @option options [String]     :earlier_than           (nil)   ISO 8601 format time to filter notifications earlier than specified time
       # @option options [Array|Hash] :custom_filter          (nil)   Custom notification filter (e.g. ["created_at >= ?", time.hour.ago])
-      # @return [Array<Notificaion>] Notification index of the target
+      # @return [Array<Notification>] Notification index of the target
       def arrange_single_notification_index(loading_index_method, options = {})
         as_latest_group_member = options[:as_latest_group_member] || false
         as_latest_group_member ?
@@ -664,7 +667,7 @@ module ActivityNotification
 
       # Gets automatically arranged notification index of the target.
       # When the target have unopened notifications, it returns unopened notifications first.
-      # Additionaly, it returns opened notifications unless unopened index size overs the limit.
+      # Additionally, it returns opened notifications unless unopened index size overs the limit.
       # @api private
       # @todo Is this switching the best solution?
       #
@@ -683,7 +686,7 @@ module ActivityNotification
       # @option options [String]     :later_than             (nil)   ISO 8601 format time to filter notifications later than specified time
       # @option options [String]     :earlier_than           (nil)   ISO 8601 format time to filter notifications earlier than specified time
       # @option options [Array|Hash] :custom_filter          (nil)   Custom notification filter (e.g. ["created_at >= ?", time.hour.ago])
-      # @return [Array<Notificaion>] Notification index of the target
+      # @return [Array<Notification>] Notification index of the target
       def arrange_notification_index(loading_unopened_index_method, loading_opened_index_method, options = {})
         # When the target have unopened notifications
         if has_unopened_notifications?(options)
@@ -691,7 +694,7 @@ module ActivityNotification
           target_unopened_index = arrange_single_notification_index(loading_unopened_index_method, options)
           # Total limit of notification index
           total_limit = options[:limit] || ActivityNotification.config.opened_index_limit
-          # Additionaly, return opened notifications unless unopened index size overs the limit
+          # Additionally, return opened notifications unless unopened index size overs the limit
           if (opened_limit = total_limit - target_unopened_index.size) > 0
             target_opened_index = arrange_single_notification_index(loading_opened_index_method, options.merge(limit: opened_limit))
             target_unopened_index.concat(target_opened_index.to_a)

data/lib/activity_notification/optional_targets/action_cable_api_channel.rb

@@ -57,7 +57,7 @@ module ActivityNotification
           }
         end
 
-        # Overriden rendering notification message using format_message
+        # Overridden rendering notification message using format_message
         # @param [Notification] notification Notification instance
         # @param [Hash]         options      Options for rendering
         # @return [String] Rendered json formatted message to broadcast

data/lib/activity_notification/optional_targets/slack.rb

@@ -6,7 +6,7 @@ module ActivityNotification
 
       # Initialize method to prepare Slack::Notifier
       # @param [Hash] options Options for initializing
-      # @option options [String, Proc, Symbol] :target_username (nil) Target user name of Slack, it resolved by target instance like email_allowed?
+      # @option options [String, Proc, Symbol] :target_username (nil) Target username of Slack, it resolved by target instance like email_allowed?
       # @option options [required, String]     :webhook_url     (nil) Webhook URL of Slack Incoming WebHooks integration
       # @option options [Hash]                 others                 Other options to be set Slack::Notifier.new, like :channel, :username, :icon_emoji etc
       def initialize_target(options = {})
@@ -17,7 +17,7 @@ module ActivityNotification
       # Publishes notification message to Slack
       # @param [Notification] notification Notification instance
       # @param [Hash] options Options for publishing
-      # @option options [String, Proc, Symbol] :target_username (nil)                     Target user name of Slack, it resolved by target instance like email_allowed?
+      # @option options [String, Proc, Symbol] :target_username (nil)                     Target username of Slack, it resolved by target instance like email_allowed?
       # @option options [String]               :partial_root    ("activity_notification/optional_targets/#{target}/#{optional_target_name}", "activity_notification/optional_targets/#{target}/base", "activity_notification/optional_targets/default/#{optional_target_name}", "activity_notification/optional_targets/default/base") Partial template name
       # @option options [String]               :partial         (self.key.tr('.', '/'))   Root path of partial template
       # @option options [String]               :layout          (nil)                     Layout template name

data/lib/activity_notification/orm/active_record/notification.rb

@@ -36,7 +36,7 @@ module ActivityNotification
         # Only group owner instance has :group_members value.
         # Group member instance has nil as :group_members association.
         # @scope instance
-        # @return [ActiveRecord_AssociationRelation<Notificaion>] Database query of the group member notification instances of this notification
+        # @return [ActiveRecord_AssociationRelation<Notification>] Database query of the group member notification instances of this notification
         has_many   :group_members, class_name: "ActivityNotification::Notification", foreign_key: :group_owner_id
 
         # Belongs to :notifier instance of this notification.
@@ -59,52 +59,52 @@ module ActivityNotification
 
         # Selects group owner notifications only.
         # @scope class
-        # @return [ActiveRecord_AssociationRelation<Notificaion>] Database query of filtered notifications
+        # @return [ActiveRecord_AssociationRelation<Notification>] Database query of filtered notifications
         scope :group_owners_only,                 -> { where(group_owner_id: nil) }
 
         # Selects group member notifications only.
         # @scope class
-        # @return [ActiveRecord_AssociationRelation<Notificaion>] Database query of filtered notifications
+        # @return [ActiveRecord_AssociationRelation<Notification>] Database query of filtered notifications
         scope :group_members_only,                -> { where.not(group_owner_id: nil) }
 
         # Selects unopened notifications only.
         # @scope class
-        # @return [ActiveRecord_AssociationRelation<Notificaion>] Database query of filtered notifications
+        # @return [ActiveRecord_AssociationRelation<Notification>] Database query of filtered notifications
         scope :unopened_only,                     -> { where(opened_at: nil) }
 
         # Selects opened notifications only without limit.
         # Be careful to get too many records with this method.
         # @scope class
-        # @return [ActiveRecord_AssociationRelation<Notificaion>] Database query of filtered notifications
+        # @return [ActiveRecord_AssociationRelation<Notification>] Database query of filtered notifications
         scope :opened_only!,                      -> { where.not(opened_at: nil) }
 
         # Selects opened notifications only with limit.
         # @scope class
         # @param [Integer] limit Limit to query for opened notifications
-        # @return [ActiveRecord_AssociationRelation<Notificaion>] Database query of filtered notifications
+        # @return [ActiveRecord_AssociationRelation<Notification>] Database query of filtered notifications
         scope :opened_only,                       ->(limit) { opened_only!.limit(limit) }
 
         # Selects group member notifications in unopened_index.
         # @scope class
-        # @return [ActiveRecord_AssociationRelation<Notificaion>] Database query of filtered notifications
+        # @return [ActiveRecord_AssociationRelation<Notification>] Database query of filtered notifications
         scope :unopened_index_group_members_only, -> { where(group_owner_id: unopened_index.map(&:id)) }
 
         # Selects group member notifications in opened_index.
         # @scope class
         # @param [Integer] limit Limit to query for opened notifications
-        # @return [ActiveRecord_AssociationRelation<Notificaion>] Database query of filtered notifications
+        # @return [ActiveRecord_AssociationRelation<Notification>] Database query of filtered notifications
         scope :opened_index_group_members_only,   ->(limit) { where(group_owner_id: opened_index(limit).map(&:id)) }
 
         # Selects notifications within expiration.
         # @scope class
         # @param [ActiveSupport::Duration] expiry_delay Expiry period of notifications
-        # @return [ActiveRecord_AssociationRelation<Notificaion>] Database query of filtered notifications
+        # @return [ActiveRecord_AssociationRelation<Notification>] Database query of filtered notifications
         scope :within_expiration_only,            ->(expiry_delay) { where("created_at > ?", expiry_delay.ago) }
 
         # Selects group member notifications with specified group owner ids.
         # @scope class
         # @param [Array<String>] owner_ids Array of group owner ids
-        # @return [ActiveRecord_AssociationRelation<Notificaion>] Database query of filtered notifications
+        # @return [ActiveRecord_AssociationRelation<Notification>] Database query of filtered notifications
         scope :group_members_of_owner_ids_only,   ->(owner_ids) { where(group_owner_id: owner_ids) }
 
         # Selects filtered notifications by target instance.
@@ -113,63 +113,63 @@ module ActivityNotification
         #   @user.notifications
         # @scope class
         # @param [Object] target Target instance for filter
-        # @return [ActiveRecord_AssociationRelation<Notificaion>] Database query of filtered notifications
+        # @return [ActiveRecord_AssociationRelation<Notification>] Database query of filtered notifications
         scope :filtered_by_target,                ->(target) { where(target: target) }
 
         # Selects filtered notifications by notifiable instance.
-        # @example Get filtered unopened notificatons of the @user for @comment as notifiable
+        # @example Get filtered unopened notifications of the @user for @comment as notifiable
         #   @notifications = @user.notifications.unopened_only.filtered_by_instance(@comment)
         # @scope class
         # @param [Object] notifiable Notifiable instance for filter
-        # @return [ActiveRecord_AssociationRelation<Notificaion>] Database query of filtered notifications
+        # @return [ActiveRecord_AssociationRelation<Notification>] Database query of filtered notifications
         scope :filtered_by_instance,              ->(notifiable) { where(notifiable: notifiable) }
 
         # Selects filtered notifications by group instance.
-        # @example Get filtered unopened notificatons of the @user for @article as group
+        # @example Get filtered unopened notifications of the @user for @article as group
         #   @notifications = @user.notifications.unopened_only.filtered_by_group(@article)
         # @scope class
         # @param [Object] group Group instance for filter
-        # @return [ActiveRecord_AssociationRelation<Notificaion>] Database query of filtered notifications
+        # @return [ActiveRecord_AssociationRelation<Notification>] Database query of filtered notifications
         scope :filtered_by_group,                 ->(group) { where(group: group) }
 
         # Selects filtered notifications later than specified time.
-        # @example Get filtered unopened notificatons of the @user later than @notification
+        # @example Get filtered unopened notifications of the @user later than @notification
         #   @notifications = @user.notifications.unopened_only.later_than(@notification.created_at)
         # @scope class
         # @param [Time] Created time of the notifications for filter
-        # @return [ActiveRecord_AssociationRelation<Notificaion>, Mongoid::Criteria<Notificaion>] Database query of filtered notifications
+        # @return [ActiveRecord_AssociationRelation<Notification>, Mongoid::Criteria<Notification>] Database query of filtered notifications
         scope :later_than,                        ->(created_time) { where('created_at > ?', created_time) }
 
         # Selects filtered notifications earlier than specified time.
-        # @example Get filtered unopened notificatons of the @user earlier than @notification
+        # @example Get filtered unopened notifications of the @user earlier than @notification
         #   @notifications = @user.notifications.unopened_only.earlier_than(@notification.created_at)
         # @scope class
         # @param [Time] Created time of the notifications for filter
-        # @return [ActiveRecord_AssociationRelation<Notificaion>, Mongoid::Criteria<Notificaion>] Database query of filtered notifications
+        # @return [ActiveRecord_AssociationRelation<Notification>, Mongoid::Criteria<Notification>] Database query of filtered notifications
         scope :earlier_than,                      ->(created_time) { where('created_at < ?', created_time) }
 
         # Includes target instance with query for notifications.
-        # @return [ActiveRecord_AssociationRelation<Notificaion>] Database query of notifications with target
+        # @return [ActiveRecord_AssociationRelation<Notification>] Database query of notifications with target
         scope :with_target,                       -> { includes(:target) }
 
         # Includes notifiable instance with query for notifications.
-        # @return [ActiveRecord_AssociationRelation<Notificaion>] Database query of notifications with notifiable
+        # @return [ActiveRecord_AssociationRelation<Notification>] Database query of notifications with notifiable
         scope :with_notifiable,                   -> { includes(:notifiable) }
 
         # Includes group instance with query for notifications.
-        # @return [ActiveRecord_AssociationRelation<Notificaion>] Database query of notifications with group
+        # @return [ActiveRecord_AssociationRelation<Notification>] Database query of notifications with group
         scope :with_group,                        -> { includes(:group) }
 
         # Includes group owner instances with query for notifications.
-        # @return [ActiveRecord_AssociationRelation<Notificaion>] Database query of notifications with group owner
+        # @return [ActiveRecord_AssociationRelation<Notification>] Database query of notifications with group owner
         scope :with_group_owner,                  -> { includes(:group_owner) }
 
         # Includes group member instances with query for notifications.
-        # @return [ActiveRecord_AssociationRelation<Notificaion>] Database query of notifications with group members
+        # @return [ActiveRecord_AssociationRelation<Notification>] Database query of notifications with group members
         scope :with_group_members,                -> { includes(:group_members) }
 
         # Includes notifier instance with query for notifications.
-        # @return [ActiveRecord_AssociationRelation<Notificaion>] Database query of notifications with notifier
+        # @return [ActiveRecord_AssociationRelation<Notification>] Database query of notifications with notifier
         scope :with_notifier,                     -> { includes(:notifier) }
 
         # Raise DeleteRestrictionError for notifications.

data/lib/activity_notification/orm/active_record/subscription.rb

@@ -13,6 +13,13 @@ module ActivityNotification
         # @return [Object] Target instance of this subscription
         belongs_to :target,               polymorphic: true
 
+        # Belongs to notifiable instance of this subscription as polymorphic association (optional).
+        # When present, this subscription is scoped to a specific notifiable instance.
+        # When nil, this is a key-level subscription that applies globally.
+        # @scope instance
+        # @return [Object, nil] Notifiable instance of this subscription
+        belongs_to :notifiable,           polymorphic: true, optional: true
+
         # Serialize parameters Hash
         # :nocov:
         if Rails.gem_version >= Gem::Version.new('7.1')
@@ -23,7 +30,7 @@ module ActivityNotification
         # :nocov:
 
         validates  :target,               presence: true
-        validates  :key,                  presence: true, uniqueness: { scope: :target }
+        validates  :key,                  presence: true, uniqueness: { scope: [:target_type, :target_id, :notifiable_type, :notifiable_id] }
         validates_inclusion_of :subscribing,          in: [true, false]
         validates_inclusion_of :subscribing_to_email, in: [true, false]
         validate   :subscribing_to_email_cannot_be_true_when_subscribing_is_false
@@ -46,6 +53,19 @@ module ActivityNotification
         # @return [ActiveRecord_AssociationRelation<Subscription>] Database query of subscriptions with target
         scope :with_target,               -> { includes(:target) }
 
+        # Selects key-level subscriptions only (where notifiable is nil).
+        # @return [ActiveRecord_AssociationRelation<Subscription>] Database query of key-level subscriptions
+        scope :key_level_only,            -> { where(notifiable_type: nil) }
+
+        # Selects instance-level subscriptions only (where notifiable is present).
+        # @return [ActiveRecord_AssociationRelation<Subscription>] Database query of instance-level subscriptions
+        scope :instance_level_only,       -> { where.not(notifiable_type: nil) }
+
+        # Selects subscriptions for a specific notifiable instance.
+        # @param [Object] notifiable Notifiable instance for filter
+        # @return [ActiveRecord_AssociationRelation<Subscription>] Database query of filtered subscriptions
+        scope :for_notifiable,            ->(notifiable) { where(notifiable_type: notifiable.class.name, notifiable_id: notifiable.id) }
+
         # Selects unique keys from query for subscriptions.
         # @return [Array<String>] Array of subscription unique keys
         def self.uniq_keys

data/lib/activity_notification/orm/dynamoid/extension.rb

@@ -1,6 +1,6 @@
 require 'dynamoid/adapter_plugin/aws_sdk_v3'
 
-# Entend Dynamoid v3.1.0 to support none, limit, exists?, update_all, serializable_hash in Dynamoid::Criteria::Chain.
+# Extend Dynamoid v3.1.0 to support none, limit, exists?, update_all, serializable_hash in Dynamoid::Criteria::Chain.
 # ActivityNotification project will try to contribute these fundamental functions to Dynamoid upstream.
 # @private
 module Dynamoid # :nodoc: all
@@ -83,13 +83,13 @@ module Dynamoid # :nodoc: all
   end
 end
 
-# Entend Dynamoid to support uniqueness validator
+# Extend Dynamoid to support uniqueness validator
 # @private
 module Dynamoid # :nodoc: all
   # https://github.com/Dynamoid/dynamoid/blob/master/lib/dynamoid/validations.rb
   # @private
   module Validations
-    # Validates whether or not a field is unique against the records in the database.
+    # Validates whether a field is unique against the records in the database.
     class UniquenessValidator < ActiveModel::EachValidator
       # Validate the document for uniqueness violations.
       # @param [Document] document The document to validate.

data/lib/activity_notification/orm/dynamoid/subscription.rb

@@ -19,6 +19,13 @@ module ActivityNotification
         # @return [Object] Target instance of this subscription
         belongs_to_composite_xdb_record :target
 
+        # Belongs to notifiable instance of this subscription as polymorphic association using composite key (optional).
+        # When present, this subscription is scoped to a specific notifiable instance.
+        # When nil, this is a key-level subscription that applies globally.
+        # @scope instance
+        # @return [Object, nil] Notifiable instance of this subscription
+        belongs_to_composite_xdb_record :notifiable, optional: true
+
         field :key,                       :string
         field :subscribing,               :boolean, default: ActivityNotification.config.subscribe_as_default
         field :subscribing_to_email,      :boolean, default: ActivityNotification.config.subscribe_to_email_as_default
@@ -31,7 +38,7 @@ module ActivityNotification
         global_secondary_index name: :index_target_key_created_at, hash_key: :target_key, range_key: :created_at, projected_attributes: :all
 
         validates  :target,               presence: true
-        validates  :key,                  presence: true, uniqueness: { scope: :target_key }
+        validates  :key,                  presence: true, uniqueness: { scope: [:target_key, :notifiable_key] }
         validates_inclusion_of :subscribing,          in: [true, false]
         validates_inclusion_of :subscribing_to_email, in: [true, false]
         validate   :subscribing_to_email_cannot_be_true_when_subscribing_is_false