Add browse to search (#329)

app/controllers/browse_search_controller.rb

@@ -0,0 +1,44 @@
+class BrowseSearchController < SearchFeedsController
+  CATEGORY_MAP = {
+    arts: "Arts",
+    business: "Business",
+    comedy: "Comedy",
+    education: "Education",
+    fiction: "Fiction",
+    government: "Government",
+    history: "History",
+    health_and_fitness: "Health &amp; Fitness",
+    kids_and_family: "Kids &amp; Family",
+    leisure: "Leisure",
+    music: "Music",
+    news: "News",
+    religion_and_spirituality: "Religion &amp; Spirituality",
+    science: "Science",
+    society_and_culture: "Society &amp; Culture",
+    sports: "Sports",
+    technology: "Technology",
+    true_crime: "True Crime",
+  }.freeze
+  ALLOWED_CATEGORIES = CATEGORY_MAP.keys
+
+  before_action :ensure_category_allowed, only: :show
+
+  def show
+    @categories = CATEGORY_MAP
+
+    search_results = retrieve_search_results(params[:category])
+    if search_results.empty?
+      @no_results_found = true
+    else
+      @already_subscribed = current_user.feeds.pluck(:external_id) if current_user
+      @pagy, @items = pagy_array(search_results)
+    end
+    render "search_feeds/index"
+  end
+
+  def ensure_category_allowed
+    category = params[:category]
+
+    redirect_to search_path unless ALLOWED_CATEGORIES.include?(category.to_sym)
+  end
+end

app/controllers/search_feeds_controller.rb

@@ -2,10 +2,11 @@ class SearchFeedsController < ApplicationController
   include Pagy::Backend
 
   def index
+    @categories = BrowseSearchController::CATEGORY_MAP
     @query = permitted_params[:query]
     return unless @query
 
-    search_results = retrieve_search_results
+    search_results = retrieve_search_results(@query)
     if search_results.empty?
       @no_results_found = true
     else
@@ -16,8 +17,8 @@ def index
 
   private
 
-  def retrieve_search_results
-    service = FeedSearcherService.new(permitted_params[:query]).call
+  def retrieve_search_results(param)
+    service = FeedSearcherService.new(param).call
 
     if service.success?
       service.payload

app/models/interaction.rb

@@ -40,7 +40,8 @@ def toggle_from_listen_it_later!(episode_id, user_id)
 
     def bookmarked_second(episode_id, user_id)
       find_interaction(episode_id, user_id)
-      @interaction&.bookmarked_at_second || nil
+      output = @interaction&.bookmarked_at_second || nil
+      output&.zero? ? nil : output
     end
 
     def bookmarked_at_pretty_time(episode_id, user_id)

app/views/search_feeds/index.html.erb

@@ -14,10 +14,17 @@
             <div class="column"></div>
             <div class="column"></div>
         </div>
+        <div class="columns">
+            <div class="column is-half">
+                <div class="buttons">
+                    <% @categories.each do |cat| %>
+                        <a class="button is-warning is-small" href="<%= browse_search_path(cat[0]) %>"><%= cat[1].downcase.html_safe %></a>
+                    <% end %>
+                </div>
+            </div>
+        </div>
     </div>
     <hr>
-    <div class="container">
-    </div>
 </section>
 
 <div class="container">

config/routes.rb

@@ -36,6 +36,7 @@
   resources :listen_it_later_episodes, only: [:index, :update], param: :episode_id, path: :later
   resources :bookmark_episodes, only: [:update], param: :episode_id, path: :bookmark
   resources :random_episodes, only: [:show], param: :feed_slug, path: :random_episodes
+  resources :browse_search, only: [:show], param: :category, path: :browse
   resources :unsubscriptions, only: [:destroy], param: :feed_id
 
   put 'preferences' => 'preferences#update', as: 'preferences'