activity_notification 2.7.2 → 2.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c4c8885cdeaf0c979ae2474e5ca5459a16e0f14c605fa5d2f0ad37076e7c793
-  data.tar.gz: 267223c3dbc745920baabb75d5e936cafef5a3fbe2e301f46aab04ae9d6a34a8
+  metadata.gz: 47f4dd8ad07b61e91c1d44516461cf8bd348807ea1eeab0dd8ffdd76e549606e
+  data.tar.gz: 52249dfbf866444bdc81aacb4d2094e1e0eb30a6a28f387aa85d33f1ed533e3e
 SHA512:
-  metadata.gz: bcb53649395b3e43ab8e3b4a043a40947305ee35cd15fe16a9737f16c866ff543749e78b00c5c5659d8a34eaf198a6c30b6933d29a048db00d56ea17b7c4694e
-  data.tar.gz: cc390e51688280d2c84bb949814ae6a3ecad9f1c444066b45d91316d47fea5bb71a7dec03fd4a582d503cc5f7aad70e47c9c0f7ddf16b1da1f92ae1485c10595
+  metadata.gz: 9663a31226c9b1fb504122b4ee06da5e953bd48b80c5a9de4903c658e03279ecc1d49151a2fbffee1dc9ab4ff19f028bd0e78b103b34bf9d70a181453cbe94a9
+  data.tar.gz: ed5cc0ebfa1828953db40e8ba37f339999204035bd889a647d1afe5c2873cce5884ac024d5585ede035760145910ecd329d963656184db8122cc4e827db9f4d4

data/app/controllers/activity_notification/notifications_api_controller.rb

@@ -154,7 +154,7 @@ module ActivityNotification
           end
         {
           include: include_options,
-          methods: [:notifiable_path, :printable_notifiable_name, :group_member_notifier_count, :group_notification_count]
+          methods: [:notifiable_path, :printable_notifiable_name, :group_member_notifier_count, :group_notification_count] + polymorphic_association_json_methods(ActivityNotification::Notification)
         }
       end
 

data/app/controllers/activity_notification/subscriptions_api_controller.rb

@@ -20,7 +20,7 @@ module ActivityNotification
     #   @return [JSON] configured_count: count of subscription index, subscriptions: subscription index, unconfigured_count: count of unconfigured notification keys, unconfigured_notification_keys: unconfigured notification keys
     def index
       super
-      json_response = { configured_count: @subscriptions.size, subscriptions: @subscriptions } if @subscriptions
+      json_response = { configured_count: @subscriptions.size, subscriptions: @subscriptions.as_json(include: subscription_json_include_option, methods: subscription_json_methods_option) } if @subscriptions
       json_response = (json_response || {}).merge(unconfigured_count: @notification_keys.size, unconfigured_notification_keys: @notification_keys) if @notification_keys
       render json: json_response
     end
@@ -180,7 +180,7 @@ module ActivityNotification
       # Returns methods option for subscription JSON
       # @api protected
       def subscription_json_methods_option
-        [].freeze
+        polymorphic_association_json_methods(ActivityNotification::Subscription).freeze
       end
 
       # Returns JSON of @subscription

data/lib/activity_notification/controllers/common_api_controller.rb

@@ -26,5 +26,16 @@ module ActivityNotification
       def redirect_to_subscription_path
       end
 
+      # Returns methods to add polymorphic association type and id to JSON of the model.
+      # Dynamoid models store polymorphic associations as composite keys (e.g. target_key),
+      # so their type and id are added to JSON responses as with other ORMs.
+      # @api protected
+      # @param [Class] model_class Model class of the JSON (e.g. ActivityNotification::Notification)
+      # @return [Array<Symbol>] Methods to add to JSON
+      def polymorphic_association_json_methods(model_class)
+        associations = ActivityNotification.config.orm == :dynamoid ? model_class._associated_composite_records : []
+        associations.flat_map { |association| [:"#{association}_type", :"#{association}_id"] }
+      end
+
   end
 end

data/lib/activity_notification/version.rb

@@ -1,3 +1,3 @@
 module ActivityNotification
-  VERSION = "2.7.2"
+  VERSION = "2.7.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activity_notification
 version: !ruby/object:Gem::Version
-  version: 2.7.2
+  version: 2.7.3
 platform: ruby
 authors:
 - Shota Yamazaki