Fix sorting Topics and add system tests

Author: Oli0li

app/models/concerns/searcheable.rb

@@ -33,16 +33,18 @@ def sort_order(order_from_params)
 
       order_from_params
     end
+  end
 
-    def search_with_params(params)
+  included do
+    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 }
         .then { |scope| params[:query].present? ? scope.search(params[:query]) : scope }
-        .then { |scope| scope.order(created_at: sort_order(params[:order])) }
+        .then { |scope| params[:order].present? ? scope.order(created_at: sort_order(params[:order].to_sym)) : scope }
     end
   end
 end

spec/system/topic_search_spec.rb

@@ -0,0 +1,112 @@
+require "rails_helper"
+
+RSpec.describe "Topics search", type: :system do
+  let(:admin) { create(:user, :admin, email: "[email protected]") }
+  let(:english) { create(:language, name: "English") }
+  let(:spanish) { create(:language, name: "Spanish") }
+  let!(:spanish_active_topic) { create(:topic, language: spanish, title: "Tratamiento del resfriado", created_at: Date.new(2025, 02, 03)) }
+  let!(:english_active_topic) { create(:topic, language: english, title: "How to treat colds", description: "All the latest information about nasopharyngitis", created_at: Date.new(2025, 03, 04)) }
+  let!(:english_archived_topic) { create(:topic, :archived, language: english, title: "Obsolete", created_at: Date.new(2023, 02, 01)) }
+
+  before do
+    login_as(admin)
+    click_link("Topics")
+  end
+
+  it "shows all topics" do
+    expect(page).to have_text(english_active_topic.title)
+    expect(page).to have_text(spanish_active_topic.title)
+    expect(page).to have_text(english_archived_topic.title)
+  end
+
+  context "when searching by title" do
+    it "only displays topics matching the search" do
+      fill_in "search_query", with: "tratamiento"
+
+      expect(page).to have_text(spanish_active_topic.title)
+      expect(page).not_to have_text(english_active_topic.title)
+      expect(page).not_to have_text(english_archived_topic.title)
+    end
+  end
+
+  context "when searching by description" do
+    it "only displays topics matching the search" do
+      fill_in "search_query", with: "pharyn"
+
+      expect(page).to have_text(english_active_topic.title)
+      expect(page).not_to have_text(spanish_active_topic.title)
+      expect(page).not_to have_text(english_archived_topic.title)
+    end
+  end
+
+  context "when searching by language" do
+    it "only displays topics matching the search" do
+      select "Spanish", from: "search_language_id"
+
+      expect(page).to have_text(spanish_active_topic.title)
+      expect(page).not_to have_text(english_active_topic.title)
+      expect(page).not_to have_text(english_archived_topic.title)
+
+      select "English", from: "search_language_id"
+
+      expect(page).to have_text(english_active_topic.title)
+      expect(page).to have_text(english_archived_topic.title)
+      expect(page).not_to have_text(spanish_active_topic.title)
+    end
+  end
+
+  context "when searching by year" do
+    it "only displays topics matching the search" do
+      select "2025", from: "search_year"
+
+      expect(page).to have_text(spanish_active_topic.title)
+      expect(page).to have_text(english_active_topic.title)
+      expect(page).not_to have_text(english_archived_topic.title)
+
+      select "2023", from: "search_year"
+
+      expect(page).to have_text(english_archived_topic.title)
+      expect(page).not_to have_text(spanish_active_topic.title)
+      expect(page).not_to have_text(english_active_topic.title)
+    end
+  end
+
+  context "when searching by month" do
+    it "only displays topics matching the search" do
+      select "2", from: "search_month"
+
+      expect(page).to have_text(spanish_active_topic.title)
+      expect(page).to have_text(english_archived_topic.title)
+      expect(page).not_to have_text(english_active_topic.title)
+
+      select "3", from: "search_month"
+
+      expect(page).to have_text(english_active_topic.title)
+      expect(page).not_to have_text(english_archived_topic.title)
+      expect(page).not_to have_text(spanish_active_topic.title)
+    end
+  end
+
+  context "when searching by state" do
+    it "only displays topics matching the search" do
+      select "active", from: "search_state"
+
+      expect(page).to have_text(spanish_active_topic.title)
+      expect(page).to have_text(english_active_topic.title)
+      expect(page).not_to have_text(english_archived_topic.title)
+
+      select "archived", from: "search_state"
+
+      expect(page).to have_text(english_archived_topic.title)
+      expect(page).not_to have_text(spanish_active_topic.title)
+      expect(page).not_to have_text(english_active_topic.title)
+    end
+  end
+
+  context "when sorting" do
+    it "displays users in the selected order" do
+      select "asc", from: "search_order"
+      expect(page).to have_text(/#{english_archived_topic.title}.+#{spanish_active_topic.title}.+#{english_active_topic.title}/m)
+    end
+  end
+end