From ab12a443a2ef964c0adb5c926e6fa6c2edb15def Mon Sep 17 00:00:00 2001 From: Claire Date: Mon, 6 May 2024 11:51:47 +0200 Subject: [PATCH] Further refactor --- app/controllers/api/v1/push/subscriptions_controller.rb | 4 ++-- app/lib/access_token_extension.rb | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/controllers/api/v1/push/subscriptions_controller.rb b/app/controllers/api/v1/push/subscriptions_controller.rb index 7cef732abe..e1ad89ee3e 100644 --- a/app/controllers/api/v1/push/subscriptions_controller.rb +++ b/app/controllers/api/v1/push/subscriptions_controller.rb @@ -43,11 +43,11 @@ class Api::V1::Push::SubscriptionsController < Api::BaseController private def destroy_web_push_subscriptions! - Web::PushSubscription.where(access_token_id: doorkeeper_token.id).destroy_all + doorkeeper_token.web_push_subscriptions.destroy_all end def set_push_subscription - @push_subscription = Web::PushSubscription.find_by(access_token_id: doorkeeper_token.id) + @push_subscription = doorkeeper_token.web_push_subscriptions.first end def check_push_subscription diff --git a/app/lib/access_token_extension.rb b/app/lib/access_token_extension.rb index f51bde4927..4e9585dd1e 100644 --- a/app/lib/access_token_extension.rb +++ b/app/lib/access_token_extension.rb @@ -6,6 +6,8 @@ module AccessTokenExtension included do include Redisable + has_many :web_push_subscriptions, class_name: 'Web::PushSubscription', inverse_of: :access_token + after_commit :push_to_streaming_api end