FIX: Fixes topic creation double-ups

app/jobs/yearly_review.rb

@@ -625,10 +625,13 @@ def most_bookmarked_topic_sql
     end
 
     def review_topic_exists?(review_year)
-      TopicCustomField
-        .find_by(name: ::YearlyReview::POST_CUSTOM_FIELD, value: review_year.to_s)
-        &.topic
-        .present?
+      TopicCustomField.joins(:topic).exists?(
+        name: ::YearlyReview::POST_CUSTOM_FIELD,
+        value: review_year.to_s,
+        topic: {
+          deleted_at: nil,
+        },
+      )
     end
   end
 end

spec/jobs/yearly_review_spec.rb

@@ -64,6 +64,17 @@ class Helper
         @yearly_review_topic.update!(title: "This is a test for yearly review")
         expect { Jobs::YearlyReview.new.execute({}) }.not_to change { Topic.count }
       end
+
+      it "doesn't publish the review topic again if it already exists and a previous version was deleted" do
+        @yearly_review_topic.trash!
+        expect { Jobs::YearlyReview.new.execute({}) }.to change { Topic.count }
+        expect { Jobs::YearlyReview.new.execute({}) }.not_to change { Topic.count }
+      end
+
+      it "doesn't publish the review topic again if it already exists and has been moved to another category" do
+        @yearly_review_topic.update!(category: Fabricate(:category))
+        expect { Jobs::YearlyReview.new.execute({}) }.not_to change { Topic.count }
+      end
     end
   end