From bcfb215f8c4b7e21e213f101105f035edd71ea72 Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Fri, 16 Jun 2023 18:20:21 +0200
Subject: [PATCH] Ensure caching timestamp is updated when marking
 notifications as read

---
 app/controllers/answer_controller.rb          | 3 ++-
 app/controllers/settings/export_controller.rb | 9 ++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/controllers/answer_controller.rb b/app/controllers/answer_controller.rb
index ac52ab40..2a6e5625 100644
--- a/app/controllers/answer_controller.rb
+++ b/app/controllers/answer_controller.rb
@@ -51,11 +51,12 @@ class AnswerController < ApplicationController
   private
 
   def mark_notifications_as_read
-    Notification.where(recipient_id: current_user.id, new: true)
+    updated = Notification.where(recipient_id: current_user.id, new: true)
                 .and(Notification.where(type: "Notification::QuestionAnswered", target_id: @answer.id)
                 .or(Notification.where(type: "Notification::Commented", target_id: @answer.comments.pluck(:id)))
                 .or(Notification.where(type: "Notification::Smiled", target_id: @answer.smiles.pluck(:id)))
                 .or(Notification.where(type: "Notification::CommentSmiled", target_id: @answer.comment_smiles.pluck(:id))))
                 .update_all(new: false) # rubocop:disable Rails/SkipsModelValidations
+    current_user.touch(:notifications_updated_at) if updated.positive?
   end
 end
diff --git a/app/controllers/settings/export_controller.rb b/app/controllers/settings/export_controller.rb
index 1a8bc0a2..3957e427 100644
--- a/app/controllers/settings/export_controller.rb
+++ b/app/controllers/settings/export_controller.rb
@@ -21,9 +21,12 @@ class Settings::ExportController < ApplicationController
 
   private
 
+  # rubocop:disable Rails/SkipsModelValidations
   def mark_notifications_as_read
-    Notification::DataExported
-      .where(recipient: current_user, new: true)
-      .update_all(new: false) # rubocop:disable Rails/SkipsModelValidations
+    updated = Notification::DataExported
+              .where(recipient: current_user, new: true)
+              .update_all(new: false)
+    current_user.touch(:notifications_updated_at) if updated.positive?
   end
+  # rubocop:enable Rails/SkipsModelValidations
 end