From 3905f8f992bf30bf44622a21127a9ee1cd85b42b Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Tue, 8 May 2018 17:53:18 -0400
Subject: [PATCH] FIX: `upsert` was less safe under concurrency

---
 lib/topic_assigner.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/topic_assigner.rb b/lib/topic_assigner.rb
index 53a4bcc..94c19e3 100644
--- a/lib/topic_assigner.rb
+++ b/lib/topic_assigner.rb
@@ -114,7 +114,9 @@ SQL
   end
 
   def assign(assign_to, silent: false)
-    @topic.upsert_custom_fields(assigned_to_id: assign_to.id, assigned_by_id: @assigned_by.id)
+    @topic.custom_fields["assigned_to_id"] = assign_to.id
+    @topic.custom_fields["assigned_by_id"] = @assigned_by.id
+    @topic.save!
 
     first_post = @topic.posts.find_by(post_number: 1)
     first_post.publish_change_to_clients!(:revised, reload_topic: true)
@@ -179,7 +181,9 @@ SQL
 
   def unassign(silent: false)
     if assigned_to_id = @topic.custom_fields["assigned_to_id"]
-      @topic.upsert_custom_fields(assigned_to_id: nil, assigned_by_id: nil)
+      @topic.custom_fields["assigned_to_id"] = nil
+      @topic.custom_fields["assigned_by_id"] = nil
+      @topic.save!
 
       post = @topic.posts.where(post_number: 1).first
       return unless post.present?