unsubscribe from search results directly from browse page

closes #43

Author: ajb

app/helpers/opportunities_helper.rb

@@ -6,6 +6,21 @@ def filtered?
     @opportunities.filterer.params[:department_id].present?
   end
 
+  def existing_saved_search
+    current_user &&
+    filtered? &&
+    current_user.saved_searches.detect do |saved_search|
+      normalize_search_params(saved_search.search_params) ==
+        normalize_search_params(current_filter_params)
+    end
+  end
+
+  def normalize_search_params(search_params)
+    search_params.stringify_keys.select do |_, v|
+      v.present?
+    end
+  end
+
   def current_filter_params
     pick(@opportunities.filterer.params, *SavedSearch::PERMITTED_SEARCH_PARAMS)
   end

app/views/opportunities/_filter_form.html.erb

@@ -24,7 +24,11 @@
   <ul class='sidebar_sub_actions'>
     <li>
       <% if signed_in? %>
-        <a href='<%= saved_searches_path(current_filter_params) %>' data-method='post'><%= t('email_me') %></a>
+        <% if existing_saved_search %>
+          <a href='<%= saved_search_path(existing_saved_search) %>' data-method='delete'><%= t('unsubscribe_from_search') %></a>
+        <% else %>
+          <a href='<%= saved_searches_path(current_filter_params) %>' data-method='post'><%= t('email_me') %></a>
+        <% end %>
       <% else %>
         <a href='<%= new_user_session_path %>'><%= t('email_me') %></a>
       <% end %>

config/locales/en.yml

@@ -192,6 +192,7 @@ en:
     other: Answer %{count} questions
   unapprove: Un-approve
   unsubscribe: Unsubscribe
+  unsubscribe_from_search: Unsubscribe from these search results
   users:
     registrations:
       confirm:

spec/features/opportunities/index_spec.rb

@@ -27,12 +27,20 @@
   context 'when signed in' do
     before { login_as vendor }
 
-    it 'saved a search' do
+    it 'saves a search' do
       visit opportunities_path
+
+      # No links without filter
+      expect(page).to_not have_link t('unsubscribe_from_search')
+      expect(page).to_not have_link t('email_me')
+
       fill_in :opportunity_filters_text, with: 'nothingmatchesthis'
       find('.opportunity_filters button').click
       expect { click_link t('email_me') }.
         to change { vendor.saved_searches.count }.by(1)
+
+      expect { click_link t('unsubscribe_from_search') }.
+        to change { vendor.saved_searches.count }.by(-1)
     end
   end
 end