Merge pull request #1872 from codetriage/schneems/fix-inactive-emails

Fix errors in inactive emails

Author: schneems

app/jobs/background_inactive_email_job.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 class BackgroundInactiveEmailJob < UserBasedJob
-  def perform(user, repos_by_need_ids:)
+  def perform(user, min_issue_count:, min_subscriber_count:)
     return false if user.repo_subscriptions.present?
 
-    UserMailer.poke_inactive(user: user, repos_by_need_ids: repos_by_need_ids).deliver_now
+    UserMailer.poke_inactive(user: user, min_issue_count: min_issue_count, min_subscriber_count: min_subscriber_count).deliver_now
   end
 end

app/mailers/user_mailer.rb

@@ -80,7 +80,7 @@ def poke_inactive(user:, min_issue_count:, min_subscriber_count:)
     languages = @user.favorite_languages&.sort || []
 
     query = Repo.active
-    query = repo.where(language: languages) if !languages.empty?
+    query = query.where(language: languages) if !languages.empty?
     query = query
       .where("issues_count >= ?", min_issue_count)
       .where("subscribers_count >= ?", min_subscriber_count)

lib/tasks/schedule.rake

@@ -56,8 +56,8 @@ namespace :schedule do
     next unless Date.today.tuesday?
 
     # TODO Ensure not archived, ensure not removed from github
-    perc_90_issues_count = ActiveRecord::Base.connection.select_one("SELECT PERCENTILE_CONT(0.90) WITHIN GROUP(ORDER BY issues_count) FROM repos;")["percentile_cont"]
-    perc_90_subscriber_count = ActiveRecord::Base.connection.select_one("SELECT PERCENTILE_CONT(0.90) WITHIN GROUP(ORDER BY subscribers_count) FROM repos;")["percentile_cont"]
+    perc_90_issues_count = ActiveRecord::Base.connection.select_one("SELECT PERCENTILE_CONT(0.90) WITHIN GROUP(ORDER BY issues_count) FROM repos;")["percentile_cont"].to_i
+    perc_90_subscriber_count = ActiveRecord::Base.connection.select_one("SELECT PERCENTILE_CONT(0.90) WITHIN GROUP(ORDER BY subscribers_count) FROM repos;")["percentile_cont"].to_i
 
     User.inactive.find_each(batch_size: 100) do |user|
       BackgroundInactiveEmailJob.perform_later(

test/jobs/background_inactive_email_job_test.rb

@@ -3,7 +3,32 @@
 require "test_helper"
 
 class BackgroundInactiveEmailJobTest < ActiveJob::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
+  include ActionMailer::TestHelper
+
+  test "sends poke_inactive email for user without subscriptions" do
+    user = users(:mockstar)
+    assert_predicate user.repo_subscriptions, :blank?
+
+    assert_emails 1 do
+      BackgroundInactiveEmailJob.perform_now(
+        user,
+        min_issue_count: 0,
+        min_subscriber_count: 0
+      )
+    end
+  end
+
+  test "does not send email when user has active repo subscriptions" do
+    user = users(:schneems)
+    assert_predicate user.repo_subscriptions, :present?
+
+    assert_emails 0 do
+      result = BackgroundInactiveEmailJob.perform_now(
+        user,
+        min_issue_count: 0,
+        min_subscriber_count: 0
+      )
+      assert_equal false, result
+    end
+  end
 end