Add counter_cache to the activity_object belongs_to association in th…

…e notification model

Rails/SkipsModelValidations: Avoid using increment! because it skips
validations.

app/models/socializer/activity_object.rb

@@ -125,11 +125,6 @@ def liked_by
       people
     end
 
-    # Increments the unread_notifications_count by 1 and saves the record
-    def increment_unread_notifications_count
-      increment!(:unread_notifications_count)
-    end
-
     # Reset unread_notifications_count to 0
     def reset_unread_notifications
       update!(unread_notifications_count: 0) if unread_notifications_count > 0

app/models/socializer/notification.rb

@@ -13,7 +13,8 @@ class Notification < ApplicationRecord
 
     # Relationships
     belongs_to :activity, inverse_of: :notifications
-    belongs_to :activity_object, inverse_of: :notifications # Person, Group, ...
+    belongs_to :activity_object, inverse_of: :notifications,
+                                 counter_cache: :unread_notifications_count
 
     # Validations
     validates :activity_id, presence: true
@@ -23,8 +24,6 @@ class Notification < ApplicationRecord
     scope :newest_first, -> { order(created_at: :desc) }
 
     # Callbacks
-    # Increment the number of unread notifications
-    after_commit { activity_object.increment_unread_notifications_count }
 
     # Class methods - Public
 

spec/models/socializer/activity_object_spec.rb

@@ -135,19 +135,6 @@ module Socializer
       end
     end
 
-    context "#increment_unread_notifications_count" do
-      let(:activity_object) do
-        create(:activity_object)
-      end
-
-      before do
-        activity_object.increment_unread_notifications_count
-        activity_object.reload
-      end
-
-      it { expect(activity_object.unread_notifications_count).to eq(1) }
-    end
-
     context "#reset_unread_notifications" do
       let(:activity_object) do
         create(:activity_object, unread_notifications_count: 10)

spec/models/socializer/notification_spec.rb

@@ -19,7 +19,9 @@ module Socializer
       it { is_expected.to belong_to(:activity).inverse_of(:notifications) }
 
       it do
-        is_expected.to belong_to(:activity_object).inverse_of(:notifications)
+        is_expected.to belong_to(:activity_object)
+          .inverse_of(:notifications)
+          .counter_cache(:unread_notifications_count)
       end
     end