From a1c590c7f1c3951739709bd939d5ea6a0241f41d Mon Sep 17 00:00:00 2001
From: phil-l-brockwell <phil.l.brockwell@gmail.com>
Date: Wed, 20 Nov 2024 10:56:18 +0000
Subject: [PATCH] Remove clean? ambiguity from FileUploader

---
 app/uploaders/file_uploader.rb | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/app/uploaders/file_uploader.rb b/app/uploaders/file_uploader.rb
index 0ac94f3fe..f40169df2 100644
--- a/app/uploaders/file_uploader.rb
+++ b/app/uploaders/file_uploader.rb
@@ -5,16 +5,11 @@ class FileUploader < CarrierWave::Uploader::Base
   storage :custom
 
   def store_dir
-    base_dir = (model.respond_to?(:clean?) && model.clean?) ? "permanent" : "tmp"
     "uploads/#{base_dir}/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
   end
 
   def read
-    if model.respond_to?(:clean?) && model.clean?
-      read_from_permanent_storage
-    else
-      super
-    end
+    clean? ? read_from_permanent_storage : super
   end
 
   def extension_allowlist
@@ -26,19 +21,11 @@ def filename
   end
 
   def fog_credentials
-    if fog_directory.include?("clean")
-      clean_bucket_credentials
-    else
-      tmp_bucket_credentials
-    end
+    clean? ? clean_bucket_credentials : tmp_bucket_credentials
   end
 
   def fog_directory
-    if model.respond_to?(:clean?) && model.clean?
-      ENV["AWS_S3_PERMANENT_BUCKET"]
-    else
-      ENV["AWS_S3_TMP_BUCKET"]
-    end
+    clean? ? ENV["AWS_S3_PERMANENT_BUCKET"] : ENV["AWS_S3_TMP_BUCKET"]
   end
 
   def permanent_path
@@ -47,6 +34,14 @@ def permanent_path
 
   private
 
+  def base_dir
+    clean? ? "permanent" : "tmp"
+  end
+
+  def clean?
+    model.respond_to?(:clean?) && model.clean?
+  end
+
   def read_from_permanent_storage
     if Rails.env.production? || ENV["ENABLE_VIRUS_SCANNER_BUCKETS"] == "true"
       permanent_file = CarrierWave::Storage::Fog::File.new(self, permanent_storage, store_path)