refactor(AttachmentsController): Only use Attachment.by_file_type scope

We never used the not_file_type scope, but used the
by_file_type scope with a inverted collection instead.

Also use Attachment.file_types(from_extensions:) instead
of inline Marcel::MimeType.for conversion.

Author: tvdeyen

app/controllers/alchemy/admin/attachments_controller.rb

@@ -85,15 +85,11 @@ def search_filter_params
           params[:q] ||= ActionController::Parameters.new
 
           if params[:only].present?
-            params[:q][:by_file_type] ||= Array(params[:only]).map do |extension|
-              Marcel::MimeType.for(extension:)
-            end
+            params[:q][:by_file_type] ||= Attachment.file_types(from_extensions: params[:only])
           end
 
           if params[:except].present?
-            params[:q][:by_file_type] ||= Attachment.file_types - params[:except].map do |extension|
-              Marcel::MimeType.for(extension:)
-            end
+            params[:q][:by_file_type] ||= Attachment.file_types - Attachment.file_types(from_extensions: params[:except])
           end
 
           params.except(*COMMON_SEARCH_FILTER_EXCLUDES + [:attachment]).permit(
@@ -108,9 +104,7 @@ def search_filter_params
 
       def permitted_ransack_search_fields
         super + [
-          {by_file_type: []},
-          :not_file_type,
-          {not_file_type: []}
+          {by_file_type: []}
         ]
       end
 

app/models/alchemy/attachment.rb

@@ -35,10 +35,6 @@ class Attachment < BaseRecord
       Alchemy.storage_adapter.by_file_type_scope(file_type)
     end
 
-    scope :not_file_type, ->(*file_type) do
-      Alchemy.storage_adapter.not_file_type_scope(file_type)
-    end
-
     scope :recent, -> { where("#{table_name}.created_at > ?", Time.current - 24.hours).order(:created_at) }
     scope :without_tag, -> { left_outer_joins(:taggings).where(gutentag_taggings: {id: nil}) }
 
@@ -85,7 +81,7 @@ def allowed_filetypes
       end
 
       def ransackable_scopes(_auth_object = nil)
-        %i[by_file_type not_file_type recent last_upload without_tag deletable]
+        %i[by_file_type recent last_upload without_tag deletable]
       end
     end
 

spec/controllers/alchemy/admin/attachments_controller_spec.rb

@@ -107,29 +107,6 @@ module Alchemy
             expect(assigns(:attachments).to_a).to_not eq([png])
           end
         end
-      end
-
-      describe "not_file_type filter" do
-        let!(:png) { create(:alchemy_attachment) }
-
-        let!(:jpg) do
-          create :alchemy_attachment,
-            file: fixture_file_upload("image3.jpeg")
-        end
-
-        it "loads all but attachments with matching content type" do
-          get :index, params: {q: {not_file_type: "image/jpeg"}}
-          expect(assigns(:attachments).to_a).to_not eq([jpg])
-          expect(assigns(:attachments).to_a).to eq([png])
-        end
-
-        context "with multiple content types" do
-          it "loads all but attachments with matching content type" do
-            get :index, params: {q: {not_file_type: ["image/jpeg"]}}
-            expect(assigns(:attachments).to_a).to_not eq([jpg])
-            expect(assigns(:attachments).to_a).to eq([png])
-          end
-        end
 
         context "with except param" do
           it "populates by_file_type query" do

spec/models/alchemy/attachment_spec.rb

@@ -47,8 +47,8 @@ module Alchemy
     end
 
     describe ".ransackable_scopes" do
-      it "delegates to storage adapter" do
-        expect(described_class.ransackable_scopes).to eq %i[by_file_type not_file_type recent last_upload without_tag deletable]
+      it do
+        expect(described_class.ransackable_scopes).to eq %i[by_file_type recent last_upload without_tag deletable]
       end
     end