Skip to content

A platform for community discussion. Free, open, simple.

FIX: Prevent anniversary badge date drift

Jake Goldsboroughcb0fbef39d7b
diff --git a/app/jobs/scheduled/grant_anniversary_badges.rb b/app/jobs/scheduled/grant_anniversary_badges.rb
index 06e35cb3684..598e5d58026 100644
--- a/app/jobs/scheduled/grant_anniversary_badges.rb
+++ b/app/jobs/scheduled/grant_anniversary_badges.rb
@@ -12,11 +12,11 @@ module Jobs
end_date = start_date + 1.year
sql = BadgeQueries.anniversaries(start_date, end_date)
- user_ids = DB.query_single(sql)
+ grants = DB.query(sql).to_h { |grant| [grant.user_id, grant.granted_at] }
User
- .where(id: user_ids)
- .find_each { |user| BadgeGranter.grant(badge, user, created_at: end_date) }
+ .where(id: grants.keys)
+ .find_each { |user| BadgeGranter.grant(badge, user, created_at: grants[user.id]) }
end
end
end
diff --git a/lib/badge_queries.rb b/lib/badge_queries.rb
index 42a9f677479..0ba2612e166 100644
--- a/lib/badge_queries.rb
+++ b/lib/badge_queries.rb
@@ -280,12 +280,33 @@ module BadgeQueries
end
def self.anniversaries(start_date, end_date)
+ end_year = end_date.year
start_date = start_date.iso8601(6)
end_date = end_date.iso8601(6)
<<~SQL
- SELECT u.id
- FROM users AS u
+ WITH anniversary_candidates AS (
+ SELECT u.*,
+ #{end_year} - EXTRACT(YEAR FROM u.created_at)::integer AS anniversary_year
+ FROM users AS u
+ ),
+ anniversary_years AS (
+ SELECT u.*,
+ CASE
+ WHEN u.created_at + make_interval(years => u.anniversary_year) <= '#{end_date}'
+ THEN u.anniversary_year
+ ELSE u.anniversary_year - 1
+ END AS current_anniversary_year
+ FROM anniversary_candidates AS u
+ ),
+ users_with_anniversaries AS (
+ SELECT u.*,
+ u.created_at + make_interval(years => u.current_anniversary_year) AS anniversary_at,
+ u.created_at + make_interval(years => u.current_anniversary_year + 1) AS next_anniversary_at
+ FROM anniversary_years AS u
+ )
+ SELECT u.id AS user_id, u.anniversary_at AS granted_at
+ FROM users_with_anniversaries AS u
JOIN posts AS p ON p.user_id = u.id
JOIN topics AS t ON p.topic_id = t.id
WHERE u.id > 0
@@ -300,9 +321,9 @@ module BadgeQueries
AND t.visible
AND t.archetype <> 'private_message'
AND t.deleted_at IS NULL
- AND NOT EXISTS (SELECT 1 FROM user_badges AS ub WHERE ub.user_id = u.id AND ub.badge_id = #{Badge::Anniversary} AND ub.granted_at BETWEEN '#{start_date}' AND '#{end_date}')
+ AND NOT EXISTS (SELECT 1 FROM user_badges AS ub WHERE ub.user_id = u.id AND ub.badge_id = #{Badge::Anniversary} AND ub.granted_at >= u.anniversary_at AND ub.granted_at < u.next_anniversary_at)
AND NOT EXISTS (SELECT 1 FROM anonymous_users AS au WHERE au.user_id = u.id)
- GROUP BY u.id
+ GROUP BY u.id, u.anniversary_at
HAVING COUNT(p.id) > 0
SQL
end
diff --git a/spec/jobs/grant_anniversary_badges_spec.rb b/spec/jobs/grant_anniversary_badges_spec.rb
index ac446045eba..0b79ddc124d 100644
--- a/spec/jobs/grant_anniversary_badges_spec.rb
+++ b/spec/jobs/grant_anniversary_badges_spec.rb
@@ -147,6 +147,22 @@ RSpec.describe Jobs::GrantAnniversaryBadges do
expect(badge.count).to eq(2)
end
+ it "realigns a delayed grant with the user's join-date anniversary" do
+ previous_grant_at = Time.zone.parse("2023-05-21 18:00")
+ current_run_at = Time.zone.parse("2024-05-21 12:00")
+ anniversary_at = Time.zone.parse("2024-05-20 18:00")
+ user = Fabricate(:user, created_at: anniversary_at - 2.years)
+ badge = Badge.find(Badge::Anniversary)
+ Fabricate(:post, user: user, created_at: current_run_at - 1.month)
+ Fabricate(:user_badge, user: user, badge: badge, granted_at: previous_grant_at)
+
+ freeze_time(current_run_at) { granter.execute({}) }
+
+ expect(user.user_badges.where(badge: badge).order(:granted_at).pluck(:granted_at)).to eq(
+ [previous_grant_at, anniversary_at],
+ )
+ end
+
it "supports date ranges" do
user = Fabricate(:user, created_at: 3.years.ago)
Fabricate(:post, user: user, created_at: 750.days.ago)