From a86371e772f28ea27130e5025b1b2ec9fdd86671 Mon Sep 17 00:00:00 2001 From: Lucas Hiago Date: Thu, 9 Jan 2020 19:22:09 -0300 Subject: [PATCH] Remove TouchJob and do it Inline (#5410) --- app/jobs/users/touch_job.rb | 12 ------------ app/models/reaction.rb | 2 +- spec/jobs/users/touch_job_spec.rb | 18 ------------------ spec/models/reaction_spec.rb | 3 +-- 4 files changed, 2 insertions(+), 33 deletions(-) delete mode 100644 app/jobs/users/touch_job.rb delete mode 100644 spec/jobs/users/touch_job_spec.rb diff --git a/app/jobs/users/touch_job.rb b/app/jobs/users/touch_job.rb deleted file mode 100644 index 9c126e92b..000000000 --- a/app/jobs/users/touch_job.rb +++ /dev/null @@ -1,12 +0,0 @@ -module Users - class TouchJob < ApplicationJob - queue_as :touch_user - - def perform(user_id) - user = User.find_by(id: user_id) - return unless user - - user.touch - end - end -end diff --git a/app/models/reaction.rb b/app/models/reaction.rb index 023b1ec51..e1776a79c 100644 --- a/app/models/reaction.rb +++ b/app/models/reaction.rb @@ -81,7 +81,7 @@ class Reaction < ApplicationRecord private def touch_user - Users::TouchJob.perform_later(user_id) + user.touch end def update_reactable diff --git a/spec/jobs/users/touch_job_spec.rb b/spec/jobs/users/touch_job_spec.rb deleted file mode 100644 index 832bac3bd..000000000 --- a/spec/jobs/users/touch_job_spec.rb +++ /dev/null @@ -1,18 +0,0 @@ -require "rails_helper" - -RSpec.describe Users::TouchJob, type: :job do - describe "#perform_later" do - it "enqueues the job" do - expect do - described_class.perform_later(3) - end.to have_enqueued_job.with(3).on_queue("touch_user") - end - - it "touches a user" do - timestamp = 1.day.ago - user = create(:user, updated_at: timestamp, last_followed_at: timestamp) - described_class.perform_now(user.id) - expect(user.reload.updated_at).to be > timestamp - end - end -end diff --git a/spec/models/reaction_spec.rb b/spec/models/reaction_spec.rb index a27f0b5bf..a31762bf3 100644 --- a/spec/models/reaction_spec.rb +++ b/spec/models/reaction_spec.rb @@ -118,8 +118,7 @@ RSpec.describe Reaction, type: :model do expect do reaction.save end.to( - have_enqueued_job(Users::TouchJob).with(user.id).exactly(:once). - and(have_enqueued_job(Reactions::UpdateReactableJob).exactly(:once)). + have_enqueued_job(Reactions::UpdateReactableJob).exactly(:once). and(have_enqueued_job(Reactions::BustReactableCacheJob).exactly(:once)). and(have_enqueued_job(Reactions::BustHomepageCacheJob).exactly(:once)), )