Fix topics filtering by provider

app/controllers/application_controller.rb

@@ -15,7 +15,7 @@ def current_provider
     @current_provider ||= begin
       provider_scope.find(cookies.signed[:current_provider_id])
     rescue ActiveRecord::RecordNotFound
-      provider_scope.first
+      provider_scope.first || NullProvider.new
     end
   end
   helper_method :current_provider

app/controllers/topics_controller.rb

@@ -89,13 +89,7 @@ def set_topic
   end
 
   def scope
-    @scope ||= if Current.user.is_admin?
-      Topic.includes(:provider).all
-    elsif current_provider.present?
-      current_provider.topics
-    else
-      Current.user.topics
-    end.includes(:language)
+    @scope ||= current_provider.topics.includes(:language)
   end
 
   def topic_tags_params
@@ -105,7 +99,7 @@ def topic_tags_params
   def search_params
     return {} unless params[:search].present?
 
-    params.require(:search).permit(:query, :state, :provider_id, :language_id, :year, :month, :order, tag_list: [])
+    params.require(:search).permit(:query, :state, :language_id, :year, :month, :order, tag_list: [])
   end
   helper_method :search_params
 

app/models/concerns/searcheable.rb

@@ -16,10 +16,6 @@ def by_month(month)
       where("extract(month from created_at) = ?", month)
     end
 
-    def by_provider(provider_id)
-      where(provider_id: provider_id)
-    end
-
     def by_language(language_id)
       where(language_id: language_id)
     end
@@ -43,7 +39,6 @@ def sort_order(order_from_params)
     scope :search_with_params, ->(params) do
       self
         .then { |scope| params[:state].present? ? scope.by_state(params[:state]) : scope }
-        .then { |scope| params[:provider_id].present? ? scope.by_provider(params[:provider_id]) : scope }
         .then { |scope| params[:language_id].present? ? scope.by_language(params[:language_id]): scope }
         .then { |scope| params[:year].present? ? scope.by_year(params[:year]) : scope }
         .then { |scope| params[:month].present? ? scope.by_month(params[:month]) : scope }

app/models/null_provider.rb

@@ -0,0 +1,5 @@
+class NullProvider
+  def topics = Topic.none
+
+  def present? = false
+end

app/models/user.rb

@@ -30,8 +30,4 @@ class User < ApplicationRecord
       .then { |scope| params[:is_admin].present? ? scope.where(is_admin: params[:is_admin]) : scope }
       .then { |scope| scope.order(created_at: params[:order]&.to_sym || :desc) }
   end
-
-  def topics
-    Topic.where(provider_id: providers.pluck(:id))
-  end
 end