reworked do_save_draft & do_draft_delete to not depend on current_user + renamed the latter to do_delete_draft

Author: Oaphi

app/controllers/concerns/draft_management.rb

@@ -7,10 +7,11 @@ module DraftManagement
   DRAFT_MAX_AGE = 86_400 * 7
 
   # saving by-field is kept for backwards compatibility with old drafts
+  # @param user [User] user to save the draft for
   # @param path [String] draft path to save
   # @return [String] top level field key
-  def do_save_draft(path)
-    base_key = "saved_post.#{current_user.id}.#{path}"
+  def do_save_draft(user, path)
+    base_key = "saved_post.#{user.id}.#{path}"
 
     TOP_LEVEL_DRAFTABLE_FIELDS.each do |key|
       next unless params.key?(key)
@@ -32,20 +33,21 @@ def do_save_draft(path)
       RequestContext.redis.expire(key_name, DRAFT_MAX_AGE)
     end
 
-    saved_at_key = "saved_post_at.#{current_user.id}.#{path}"
+    saved_at_key = "saved_post_at.#{user.id}.#{path}"
     RequestContext.redis.set(saved_at_key, DateTime.now.iso8601)
     RequestContext.redis.expire(saved_at_key, DRAFT_MAX_AGE)
 
     base_key
   end
 
   # Attempts to delete a draft for a given path
+  # @param user [User] user to delete the draft for
   # @param path [String] draft path to delete
   # @return [Boolean] status of the operation
-  def do_draft_delete(path)
+  def do_delete_draft(user, path)
     keys = DRAFTABLE_FIELDS.map do |key|
       pfx = key == :saved_at ? 'saved_post_at' : 'saved_post'
-      base = "#{pfx}.#{current_user.id}.#{path}"
+      base = "#{pfx}.#{user.id}.#{path}"
       NESTED_DRAFTABLE_FIELDS.include?(key) ? base : "#{base}.#{key}"
     end
 

app/controllers/posts_controller.rb

@@ -113,7 +113,7 @@ def create
         Rails.cache.delete "community_user/#{current_user.community_user.id}/metric/#{key}"
       end
 
-      do_draft_delete(URI(request.referer || '').path)
+      do_delete_draft(current_user, URI(request.referer || '').path)
 
       redirect_to helpers.generic_show_link(@post)
     else
@@ -263,7 +263,7 @@ def update
               PostHistory.redact(@post, current_user)
             end
             Rails.cache.delete "community_user/#{current_user.community_user.id}/metric/E"
-            do_draft_delete(URI(request.referer || '').path)
+            do_delete_draft(current_user, URI(request.referer || '').path)
             redirect_to post_path(@post)
           end
 
@@ -302,7 +302,7 @@ def update
             message += " on '#{@post.parent.title}'"
           end
           @post.user.create_notification message, suggested_edit_url(edit, host: @post.community.host)
-          do_draft_delete(URI(request.referer || '').path)
+          do_delete_draft(current_user, URI(request.referer || '').path)
           redirect_to post_path(@post)
         else
           @post.errors.copy!(edit.errors)
@@ -634,12 +634,12 @@ def feature
   end
 
   def save_draft
-    base_key = do_save_draft(params[:path])
+    base_key = do_save_draft(current_user, params[:path])
     render json: { status: 'success', success: true, key: base_key }
   end
 
   def delete_draft
-    do_draft_delete(params[:path])
+    do_delete_draft(current_user, params[:path])
     render json: { status: 'success', success: true }
   end
 

app/controllers/tags_controller.rb

@@ -98,7 +98,7 @@ def create
 
     @tag = Tag.new(create_params)
     if @tag.save
-      do_draft_delete(URI(request.referer || '').path)
+      do_delete_draft(current_user, URI(request.referer || '').path)
       redirect_to tag_path(id: @category.id, tag_id: @tag.id)
     else
       render :new, status: :bad_request
@@ -118,7 +118,7 @@ def update
                               .except(:name)
 
     if @tag.update(update_params)
-      do_draft_delete(URI(request.referer || '').path)
+      do_delete_draft(current_user, URI(request.referer || '').path)
       redirect_to tag_path(id: @category.id, tag_id: @tag.id)
     else
       render :edit, status: :bad_request