Merge pull request #3633 from alphagov/revert-3626-simplify-email-ale…

…rt-title-builder

Revert "Remove unused pluralisation logic from email alert title builder"

app/lib/email_alert_title_builder.rb

@@ -18,13 +18,19 @@ def call
   attr_reader :filter, :subscription_list_title_prefix, :facets
 
   def prefix
-    if selected_facets.empty?
+    if facets.size == 1 && subscription_list_title_prefix.is_a?(Hash)
+      subscription_list_title_prefix[plural_or_single].to_s.strip
+    elsif selected_facets.empty?
       subscription_list_title_prefix.to_s.strip
     elsif subscription_list_title_prefix.present?
       "#{subscription_list_title_prefix.strip} with"
     end
   end
 
+  def plural_or_single
+    filter.fetch(facets.first["facet_id"], []).length == 1 ? "singular" : "plural"
+  end
+
   def suffix
     return singular_suffix if facets.size == 1
 

app/lib/search/query.rb

@@ -1,5 +1,5 @@
-# Facade that speaks to Search API. Combines a content item with
-# search results from Search API.
+# Facade that speaks to rummager. Combines a content item with
+# search results from rummager.
 module Search
   class Query
     SITE_SEARCH_FINDER_BASE_PATH = "/search/all".freeze

features/fixtures/bad_input_email_signup.json

@@ -68,6 +68,10 @@
     "filter": {
       "document_type": "cma_case"
     },
-    "subscription_list_title_prefix": "CMA cases"
+    "subscription_list_title_prefix": {
+      "singular": "CMA cases with the following case type: ",
+      "plural": "CMA cases with the following case types: ",
+      "many": "Competition and Markets Authority (CMA) cases: "
+    }
   }
 }

features/fixtures/cma_cases_signup_content_item.json

@@ -141,6 +141,10 @@
     "filter": {
       "format": "cma_case"
     },
-    "subscription_list_title_prefix": "CMA cases"
+    "subscription_list_title_prefix": {
+      "singular": "CMA cases with the following case type: ",
+      "plural": "CMA cases with the following case types: ",
+      "many": "Competition and Markets Authority (CMA) cases: "
+    }
   }
 }

spec/lib/email_alert_title_builder_spec.rb

@@ -38,9 +38,10 @@
     it { is_expected.to eq(subscription_list_title_prefix) }
   end
 
-  context "when there is one facet with a string subscription_list_title_prefix" do
-    let(:subscription_list_title_prefix) { "Prefix" }
-
+  context "when there is one facet" do
+    let(:subscription_list_title_prefix) do
+      { "singular" => "Prefix:", "plural" => "Prefixes:" }
+    end
     let(:facets) do
       [
         {
@@ -67,19 +68,19 @@
     context "when no choice is selected" do
       let(:filter) { {} }
 
-      it { is_expected.to eq("Prefix") }
+      it { is_expected.to eq("Prefixes:") }
     end
 
     context "when one choice is selected" do
       let(:filter) { { "facet_id" => %w[key_one] } }
 
-      it { is_expected.to eq("Prefix with topic name one") }
+      it { is_expected.to eq("Prefix: topic name one") }
     end
 
     context "when two choices are selected" do
       let(:filter) { { "facet_id" => %w[key_one key_two] } }
 
-      it { is_expected.to eq("Prefix with topic name one and topic name two") }
+      it { is_expected.to eq("Prefixes: topic name one and topic name two") }
     end
   end