diff --git a/app/models/system_notification.rb b/app/models/system_notification.rb index 6f901b3fd..f05a66fce 100644 --- a/app/models/system_notification.rb +++ b/app/models/system_notification.rb @@ -17,4 +17,8 @@ class SystemNotification < ApplicationRecord scope :is_top, lambda { where(is_top: true) } + def read_member?(user_id) + self.system_notification_histories.where(user_id: user_id).present? ? true : false + end + end diff --git a/app/views/settings/show.json.jbuilder b/app/views/settings/show.json.jbuilder index 1147ffde2..0e6e1606b 100644 --- a/app/views/settings/show.json.jbuilder +++ b/app/views/settings/show.json.jbuilder @@ -60,6 +60,7 @@ json.setting do if @top_system_notification.present? json.system_notification do json.(@top_system_notification, :id, :subject, :sub_subject, :content) + json.is_read @top_system_notification.read_member?(current_user&.id) end else json.system_notification nil