activity_notification 2.3.2 → 2.4.0

data/lib/activity_notification/orm/dynamoid.rb

@@ -98,7 +98,15 @@ module ActivityNotification
           ["#{attribute}_key".to_sym, value.nil? ? nil : "#{value.class.name}#{ActivityNotification.config.composite_key_delimiter}#{value.id}"] :
           [attribute, value]
       }.to_h
-      update_attributes(attributes_with_association)
+      
+      # Use update_attributes if available, otherwise use the manual approach
+      if respond_to?(:update_attributes)
+        update_attributes(attributes_with_association)
+      else
+        # Manual update for models that don't have update_attributes
+        attributes_with_association.each { |attribute, value| write_attribute(attribute, value) }
+        save
+      end
     end
   end
 end
@@ -179,10 +187,12 @@ module Dynamoid # :nodoc: all
       # Selects filtered notifications or subscriptions by association type.
       # @scope class
       # @param [String] name     Association name
-      # @param [Object] type     Association type
+      # @param [Object] type     Association type (can be class name string or object instance)
       # @return [Dynamoid::Criteria::Chain] Database query of filtered notifications or subscriptions
       def filtered_by_association_type(name, type)
-        type.present? ? where("#{name}_key.begins_with" => "#{type}#{ActivityNotification.config.composite_key_delimiter}") : none
+        # Handle both string class names and object instances
+        type_name = type.is_a?(String) ? type : type.class.name
+        where("#{name}_key.begins_with" => "#{type_name}#{ActivityNotification.config.composite_key_delimiter}")
       end
 
       # Selects filtered notifications or subscriptions by association type and id.
@@ -391,14 +401,32 @@ module Dynamoid # :nodoc: all
       # @scope class
       # @return [Dynamoid::Criteria::Chain] Database query of filtered notifications
       def group_members_only
-        where('group_owner_id.not_null': true)
+        # Create a new chain to avoid state issues
+        new_chain = @source.where('group_owner_id.not_null': true)
+        # Apply existing conditions from current chain
+        if instance_variable_defined?(:@where_conditions) && @where_conditions
+          @where_conditions.instance_variable_get(:@hash_conditions).each do |condition|
+            # Skip conflicting group_owner_id conditions
+            next if condition.key?(:"group_owner_id.null") || condition.key?(:"group_owner_id.not_null")
+            new_chain = new_chain.where(condition)
+          end
+        end
+        new_chain
       end
 
       # Selects unopened notifications only.
       # @scope class
       # @return [Dynamoid::Criteria::Chain] Database query of filtered notifications
       def unopened_only
-        where('opened_at.null': true)
+        # Create a new chain to avoid state issues
+        new_chain = @source.where('opened_at.null': true)
+        # Apply existing conditions from current chain
+        if instance_variable_defined?(:@where_conditions) && @where_conditions
+          @where_conditions.instance_variable_get(:@hash_conditions).each do |condition|
+            new_chain = new_chain.where(condition)
+          end
+        end
+        new_chain
       end
 
       # Selects opened notifications only without limit.
@@ -406,7 +434,15 @@ module Dynamoid # :nodoc: all
       # @scope class
       # @return [Dynamoid::Criteria::Chain] Database query of filtered notifications
       def opened_only!
-        where('opened_at.not_null': true)
+        # Create a new chain to avoid state issues
+        new_chain = @source.where('opened_at.not_null': true)
+        # Apply existing conditions from current chain
+        if instance_variable_defined?(:@where_conditions) && @where_conditions
+          @where_conditions.instance_variable_get(:@hash_conditions).each do |condition|
+            new_chain = new_chain.where(condition)
+          end
+        end
+        new_chain
       end
 
       # Selects opened notifications only with limit.

data/lib/activity_notification/rails/routes.rb

@@ -153,7 +153,7 @@ module ActionDispatch::Routing
         if options[:with_devise].present? && options[:devise_default_routes].present?
           create_notification_routes options, resources_options
         else
-          self.resources target, only: :none do
+          self.resources target, only: [] do
             create_notification_routes options, resources_options
           end
         end
@@ -348,7 +348,7 @@ module ActionDispatch::Routing
         if options[:with_devise].present? && options[:devise_default_routes].present?
           create_subscription_routes options, resources_options
         else
-          self.resources target, only: :none do
+          self.resources target, only: [] do
             create_subscription_routes options, resources_options
           end
         end
@@ -414,6 +414,7 @@ module ActionDispatch::Routing
         self.resources options[:model], resources_options do
           collection do
             post :open_all unless ignore_path?(:open_all, options)
+            post :destroy_all unless ignore_path?(:destroy_all, options)
           end
           member do
             get  :move     unless ignore_path?(:move, options)

data/lib/activity_notification/version.rb

@@ -1,3 +1,3 @@
 module ActivityNotification
-  VERSION = "2.3.2"
+  VERSION = "2.4.0"
 end

data/lib/activity_notification.rb

@@ -16,6 +16,7 @@ module ActivityNotification
   autoload :Common
   autoload :Config
   autoload :Renderable
+  autoload :NotificationResilience
   autoload :VERSION
   autoload :GEM_VERSION
 

data/lib/generators/templates/controllers/notifications_api_controller.rb

@@ -9,6 +9,11 @@ class <%= @target_prefix %>NotificationsController < ActivityNotification::Notif
   #   super
   # end
 
+  # POST /:target_type/:target_id/notifications/destroy_all
+  # def destroy_all
+  #   super
+  # end
+
   # GET /:target_type/:target_id/notifications/:id
   # def show
   #   super

data/lib/generators/templates/controllers/notifications_api_with_devise_controller.rb

@@ -9,6 +9,11 @@ class <%= @target_prefix %>NotificationsWithDeviseController < ActivityNotificat
   #   super
   # end
 
+  # POST /:target_type/:target_id/notifications/destroy_all
+  # def destroy_all
+  #   super
+  # end
+
   # GET /:target_type/:target_id/notifications/:id
   # def show
   #   super

data/lib/generators/templates/controllers/notifications_controller.rb

@@ -9,6 +9,11 @@ class <%= @target_prefix %>NotificationsController < ActivityNotification::Notif
   #   super
   # end
 
+  # POST /:target_type/:target_id/notifications/destroy_all
+  # def destroy_all
+  #   super
+  # end
+
   # GET /:target_type/:target_id/notifications/:id
   # def show
   #   super

data/lib/generators/templates/controllers/notifications_with_devise_controller.rb

@@ -9,6 +9,11 @@ class <%= @target_prefix %>NotificationsWithDeviseController < ActivityNotificat
   #   super
   # end
 
+  # POST /:target_type/:target_id/notifications/destroy_all
+  # def destroy_all
+  #   super
+  # end
+
   # GET /:target_type/:target_id/notifications/:id
   # def show
   #   super

data/spec/concerns/apis/notification_api_spec.rb

@@ -54,7 +54,7 @@ shared_examples_for :notification_api do
           expect(ActivityNotification::Mailer.deliveries.first.to[0]).to eq(@author_user.email)
           expect(ActivityNotification::Mailer.deliveries.last.to[0]).to eq(@user_1.email)
         end
-  
+
         it "sends notification email with active job queue" do
           expect {
             described_class.notify(:users, @comment_2)
@@ -318,7 +318,7 @@ shared_examples_for :notification_api do
 
       context "with options" do
         context "as default" do
-          let(:created_notification) { 
+          let(:created_notification) {
             described_class.notify_to(@user_1, @comment_2)
             @user_1.notifications.latest
           }
@@ -360,7 +360,7 @@ shared_examples_for :notification_api do
         end
 
         context "as specified default value" do
-          let(:created_notification) { 
+          let(:created_notification) {
             described_class.notify_to(@user_1, @comment_2)
           }
 
@@ -382,7 +382,7 @@ shared_examples_for :notification_api do
         end
 
         context "as api options" do
-          let(:created_notification) { 
+          let(:created_notification) {
             described_class.notify_to(
               @user_1, @comment_2,
               key: 'custom_test_key',
@@ -592,6 +592,131 @@ shared_examples_for :notification_api do
           expect(@user_1.notifications.opened_only!.count).to eq(1)
         end
       end
+
+      context 'with ids options' do
+        it "opens notifications with specified IDs only" do
+          notification_to_open = @user_1.notifications.first
+          described_class.open_all_of(@user_1, { ids: [notification_to_open.id] })
+          expect(@user_1.notifications.unopened_only.count).to eq(1)
+          expect(@user_1.notifications.opened_only!.count).to eq(1)
+          expect(@user_1.notifications.opened_only!.first).to eq(notification_to_open)
+        end
+
+        it "applies other filter options when ids are specified" do
+          notification_to_open = @user_1.notifications.first
+          described_class.open_all_of(@user_1, { 
+            ids: [notification_to_open.id], 
+            filtered_by_key: 'non_existent_key' 
+          })
+          expect(@user_1.notifications.unopened_only.count).to eq(2)
+          expect(@user_1.notifications.opened_only!.count).to eq(0)
+        end
+
+        it "only opens unopened notifications even when opened notification IDs are provided" do
+          # First open one notification
+          notification_to_open = @user_1.notifications.first
+          notification_to_open.open!
+          
+          # Try to open it again using ids parameter
+          described_class.open_all_of(@user_1, { ids: [notification_to_open.id] })
+          
+          # Should not affect the count since it was already opened
+          expect(@user_1.notifications.unopened_only.count).to eq(1)
+          expect(@user_1.notifications.opened_only!.count).to eq(1)
+        end
+      end
+    end
+
+    describe ".destroy_all_of" do
+      before do
+        described_class.notify_to(@user_1, @article, group: @article, key: 'key.1')
+        described_class.notify_to(@user_1, @comment_2, group: @comment_2, key: 'key.2')
+        expect(@user_1.notifications.count).to eq(2)
+        expect(@user_2.notifications.count).to eq(0)
+      end
+
+      it "returns array of destroyed notification records" do
+        destroyed_notifications = described_class.destroy_all_of(@user_1)
+        expect(destroyed_notifications).to be_a Array
+        expect(destroyed_notifications.size).to eq(2)
+      end
+
+      it "destroys all notifications of the target" do
+        described_class.destroy_all_of(@user_1)
+        expect(@user_1.notifications.count).to eq(0)
+      end
+
+      it "does not destroy any notifications of the other targets" do
+        described_class.destroy_all_of(@user_2)
+        expect(@user_1.notifications.count).to eq(2)
+        expect(@user_2.notifications.count).to eq(0)
+      end
+
+      context 'with filtered_by_type options' do
+        it "destroys filtered notifications only" do
+          described_class.destroy_all_of(@user_1, { filtered_by_type: @comment_2.to_class_name })
+          expect(@user_1.notifications.count).to eq(1)
+          expect(@user_1.notifications.first.notifiable).to eq(@article)
+        end
+      end
+
+      context 'with filtered_by_group options' do
+        it "destroys filtered notifications only" do
+          described_class.destroy_all_of(@user_1, { filtered_by_group: @comment_2 })
+          expect(@user_1.notifications.count).to eq(1)
+          expect(@user_1.notifications.first.notifiable).to eq(@article)
+        end
+      end
+
+      context 'with filtered_by_group_type and :filtered_by_group_id options' do
+        it "destroys filtered notifications only" do
+          described_class.destroy_all_of(@user_1, { filtered_by_group_type: 'Comment', filtered_by_group_id: @comment_2.id.to_s })
+          expect(@user_1.notifications.count).to eq(1)
+          expect(@user_1.notifications.first.notifiable).to eq(@article)
+        end
+      end
+
+      context 'with filtered_by_key options' do
+        it "destroys filtered notifications only" do
+          described_class.destroy_all_of(@user_1, { filtered_by_key: 'key.2' })
+          expect(@user_1.notifications.count).to eq(1)
+          expect(@user_1.notifications.first.notifiable).to eq(@article)
+        end
+      end
+
+      context 'with later_than options' do
+        it "destroys filtered notifications only" do
+          described_class.destroy_all_of(@user_1, { later_than: (@user_1.notifications.earliest.created_at.in_time_zone + 0.001).iso8601(3) })
+          expect(@user_1.notifications.count).to eq(1)
+          expect(@user_1.notifications.first).to eq(@user_1.notifications.earliest)
+        end
+      end
+
+      context 'with earlier_than options' do
+        it "destroys filtered notifications only" do
+          described_class.destroy_all_of(@user_1, { earlier_than: @user_1.notifications.latest.created_at.iso8601(3) })
+          expect(@user_1.notifications.count).to eq(1)
+          expect(@user_1.notifications.first).to eq(@user_1.notifications.latest)
+        end
+      end
+
+      context 'with ids options' do
+        it "destroys notifications with specified IDs only" do
+          notification_to_destroy = @user_1.notifications.first
+          described_class.destroy_all_of(@user_1, { ids: [notification_to_destroy.id] })
+          expect(@user_1.notifications.count).to eq(1)
+          expect(@user_1.notifications.first).not_to eq(notification_to_destroy)
+        end
+
+        it "applies other filter options when ids are specified" do
+          notification_to_destroy = @user_1.notifications.first
+          described_class.destroy_all_of(@user_1, { 
+            ids: [notification_to_destroy.id], 
+            filtered_by_key: 'non_existent_key' 
+          })
+          expect(@user_1.notifications.count).to eq(2)
+        end
+      end
     end
 
     describe ".group_member_exists?" do
@@ -817,6 +942,37 @@ shared_examples_for :notification_api do
           expect(test_instance.open!(with_members: false)).to eq(1)
         end
       end
+
+      context "when the associated notifiable record has been deleted" do
+        let(:notifiable_id) { test_instance.notifiable.id }
+
+        before do
+          notifiable_class.where(id: notifiable_id).delete_all
+          test_instance.reload
+        end
+
+        it "ensures the notifiable is gone and the notification is still persisted" do
+          expect(notifiable_class.exists?(notifiable_id)).to be_falsey
+          expect(test_instance).to be_persisted
+        end
+
+        if ActivityNotification.config.orm == :active_record
+          it "does not open the notification without skip_validation option when using ActiveRecord" do
+            test_instance.open!
+            expect(test_instance.reload.opened?).to be_falsey
+          end
+        else
+          it "opens the notification without skip_validation option when using Mongoid or Dynamoid" do
+            test_instance.open!
+            expect(test_instance.reload.opened?).to be_truthy
+          end
+        end
+
+        it "opens the notification when skip_validation is true" do
+          test_instance.open!(skip_validation: true)
+          expect(test_instance.reload.opened?).to be_truthy
+        end
+      end
     end
 
     describe "#unopened?" do
@@ -833,7 +989,7 @@ shared_examples_for :notification_api do
         end
       end
     end
-      
+
     describe "#opened?" do
       context "when opened_at is blank" do
         it "returns false" do

data/spec/concerns/models/target_spec.rb

@@ -935,6 +935,13 @@ shared_examples_for :target do
       end
     end
 
+    describe "#destroy_all_notifications" do
+      it "is an alias of ActivityNotification::Notification.destroy_all_of" do
+        expect(ActivityNotification::Notification).to receive(:destroy_all_of)
+        test_instance.destroy_all_notifications
+      end
+    end
+
 
     # Methods to be overridden
 

data/spec/controllers/controller_spec_utility.rb

@@ -92,7 +92,7 @@ module ActivityNotification
         def assert_all_schema_confirm(response, status)
           expect(response).to have_http_status(status)
           assert_request_schema_confirm
-          assert_response_schema_confirm
+          assert_response_schema_confirm(status)
         end
       end
     end

data/spec/controllers/notifications_api_controller_shared_examples.rb

@@ -275,6 +275,112 @@ shared_examples_for :notifications_api_controller do
           expect(@notification_2.reload.opened?).to be_truthy
         end
       end
+
+      context 'with ids parameter' do
+        it "opens only specified notifications" do
+          post_with_compatibility :open_all, target_params.merge({ typed_target_param => test_target, ids: [@notification_1.id] }), valid_session
+          expect(@notification_1.reload.opened?).to be_truthy
+          expect(@notification_2.reload.opened?).to be_falsey
+        end
+
+        it "applies other filter options when ids are specified" do
+          post_with_compatibility :open_all, target_params.merge({ 
+            typed_target_param => test_target, 
+            ids: [@notification_1.id], 
+            filtered_by_key: 'non_existent_key' 
+          }), valid_session
+          expect(@notification_1.reload.opened?).to be_falsey
+          expect(@notification_2.reload.opened?).to be_falsey
+        end
+      end
+    end
+  end
+
+  describe "POST #destroy_all" do
+    context "http POST request" do
+      before do
+        @notification = create(:notification, target: test_target)
+        expect(test_target.notifications.count).to eq(1)
+        post_with_compatibility :destroy_all, target_params.merge({ typed_target_param => test_target }), valid_session
+      end
+
+      it "returns 200 as http status code" do
+        expect(response.status).to eq(200)
+      end
+
+      it "destroys all notifications of the target" do
+        expect(test_target.notifications.count).to eq(0)
+      end
+
+      it "returns JSON response" do
+        expect(response_json["count"]).to eq(1)
+        assert_json_with_object_array(response_json["notifications"], [@notification])
+      end
+    end
+
+    context "with filter request parameters" do
+      before do
+        @target_1, @notifiable_1, @group_1, @key_1 = create(:confirmed_user), create(:article), nil,           "key.1"
+        @target_2, @notifiable_2, @group_2, @key_2 = create(:confirmed_user), create(:comment), @notifiable_1, "key.2"
+        @notification_1 = create(:notification, target: test_target, notifiable: @notifiable_1, group: @group_1, key: @key_1)
+        @notification_2 = create(:notification, target: test_target, notifiable: @notifiable_2, group: @group_2, key: @key_2, created_at: @notification_1.created_at + 10.second)
+        expect(test_target.notifications.count).to eq(2)
+      end
+
+      context "with filtered_by_type request parameters" do
+        it "destroys filtered notifications only" do
+          post_with_compatibility :destroy_all, target_params.merge({ typed_target_param => test_target, 'filtered_by_type' => @notifiable_2.to_class_name }), valid_session
+          expect(test_target.notifications.count).to eq(1)
+          expect(test_target.notifications.first).to eq(@notification_1)
+        end
+      end
+  
+      context 'with filtered_by_group_type and :filtered_by_group_id request parameters' do
+        it "destroys filtered notifications only" do
+          post_with_compatibility :destroy_all, target_params.merge({ typed_target_param => test_target, 'filtered_by_group_type' => 'Article', 'filtered_by_group_id' => @group_2.id.to_s }), valid_session
+          expect(test_target.notifications.count).to eq(1)
+          expect(test_target.notifications.first).to eq(@notification_1)
+        end
+      end
+
+      context 'with filtered_by_key request parameters' do
+        it "destroys filtered notifications only" do
+          post_with_compatibility :destroy_all, target_params.merge({ typed_target_param => test_target, 'filtered_by_key' => 'key.2' }), valid_session
+          expect(test_target.notifications.count).to eq(1)
+          expect(test_target.notifications.first).to eq(@notification_1)
+        end
+      end
+
+      context 'with later_than request parameters' do
+        it "destroys filtered notifications only" do
+          post_with_compatibility :destroy_all, target_params.merge({ typed_target_param => test_target, 'later_than' => (@notification_1.created_at.in_time_zone + 5.second).iso8601(3) }), valid_session
+          expect(test_target.notifications.count).to eq(1)
+          expect(test_target.notifications.first).to eq(@notification_1)
+        end
+      end
+
+      context 'with earlier_than request parameters' do
+        it "destroys filtered notifications only" do
+          post_with_compatibility :destroy_all, target_params.merge({ typed_target_param => test_target, 'earlier_than' => (@notification_2.created_at.in_time_zone - 5.second).iso8601(3) }), valid_session
+          expect(test_target.notifications.count).to eq(1)
+          expect(test_target.notifications.first).to eq(@notification_2)
+        end
+      end
+
+      context "with ids request parameters" do
+        it "destroys notifications with specified IDs only" do
+          post_with_compatibility :destroy_all, target_params.merge({ typed_target_param => test_target, 'ids' => [@notification_2.id.to_s] }), valid_session
+          expect(test_target.notifications.count).to eq(1)
+          expect(test_target.notifications.first).to eq(@notification_1)
+        end
+      end
+
+      context "with no filter request parameters" do
+        it "destroys all notifications of the target" do
+          post_with_compatibility :destroy_all, target_params.merge({ typed_target_param => test_target}), valid_session
+          expect(test_target.notifications.count).to eq(0)
+        end
+      end
     end
   end
 
@@ -466,6 +572,13 @@ shared_examples_for :notifications_api_request do
     end
   end
 
+  describe "POST /{target_type}/{target_id}/notifications/destroy_all", type: :request do
+    it "returns response as API references" do
+      post_with_compatibility "#{api_path}/notifications/destroy_all", headers: @headers
+      assert_all_schema_confirm(response, 200)
+    end
+  end
+
   describe "GET /{target_type}/{target_id}/notifications/{id}", type: :request do
     it "returns response as API references" do
       get_with_compatibility "#{api_path}/notifications/#{@notification.id}", headers: @headers