Merge pull request #17918 from yrudman/do-not-duplicate-same-notifica…

…tion

Do not duplicate same notification if user belongs to several groups

app/models/notification_type.rb

@@ -27,7 +27,7 @@ def subscriber_ids(subject, initiator)
         subject.tenant
       elsif initiator.kind_of?(User)
         initiator.current_tenant
-      end.try(:user_ids)
+      end.try(:user_ids).try(:uniq)
     when AUDIENCE_SUPERADMIN
       User.superadmins.pluck(:id)
     when AUDIENCE_NONE

spec/models/notification_spec.rb

@@ -36,6 +36,11 @@
         expect(user.unseen_notifications.count).to eq(1)
       end
 
+      it 'creates single record in notification_recipients table if recipent user belongs to several groups' do
+        user.miq_groups << FactoryGirl.create(:miq_group, :tenant => tenant)
+        expect(subject.recipients).to match_array([user])
+      end
+
       context 'asynchronous notifications' do
         before { stub_settings(:server => {:asynchronous_notifications => async}) }
         context 'enabled' do

spec/models/notification_type_spec.rb

@@ -13,7 +13,7 @@
     end
   end
 
-  describe '#subscribers' do
+  describe '#subscribers_ids' do
     let(:user1) { FactoryGirl.create(:user) }
     let(:tenant2) { FactoryGirl.create(:tenant) }
     let!(:user2) { FactoryGirl.create(:user_with_group, :tenant => tenant2) }
@@ -38,6 +38,10 @@
       it 'returns the users in the tenant same tenant as concerned vm' do
         is_expected.to match_array([user2.id])
       end
+      it "returns single id if user belongs to different group" do
+        user2.miq_groups << FactoryGirl.create(:miq_group, :tenant => tenant2)
+        is_expected.to match_array([user2.id])
+      end
     end
   end
 end