govuk_content_models 6.1.0 → 6.3.0

data/app/models/business_support_edition.rb

@@ -45,7 +45,14 @@ class BusinessSupportEdition < Edition
   @fields_to_clone = [:body, :min_value, :max_value, :max_employees, :organiser,
       :eligibility, :evaluation, :additional_information, :continuation_link,
       :will_continue_on, :contact_details, :short_description,
-      :business_support_identifier]
+      :business_support_identifier, :priority, :business_sizes,
+      :locations, :purposes, :sectors, :stages, :support_types,
+      :start_date, :end_date]
+
+  scope :for_facets, lambda { |facets|
+    where({ "$and" => facets_criteria(facets) }).order_by([:priority, :desc], [:title, :asc])
+  }
+
 
   def whole_body
     [short_description, body].join("\n\n")
@@ -66,4 +73,13 @@ class BusinessSupportEdition < Edition
       errors.add(:business_support_identifier, :taken)
     end
   end
+
+  def self.facets_criteria(facets)
+    criteria = []
+    facets.each do |facet_name, values|
+      slugs = values.split(",")
+      criteria << { facet_name => { "$in" => slugs } } unless slugs.empty?
+    end
+    criteria
+  end
 end

data/lib/govuk_content_models/version.rb

@@ -1,4 +1,4 @@
 module GovukContentModels
   # Changing this causes Jenkins to tag and release the gem into the wild
-  VERSION = "6.1.0"
+  VERSION = "6.3.0"
 end

data/test/models/business_support_edition_test.rb

@@ -166,7 +166,17 @@ class BusinessSupportEditionTest < ActiveSupport::TestCase
                                  :additional_information => "Additional info to be cloned",
                                  :will_continue_on => "Continuation text to be cloned",
                                  :continuation_link => "http://www.gov.uk",
-                                 :contact_details => "Contact details to be cloned")
+                                 :contact_details => "Contact details to be cloned",
+                                 :priority => 2,
+                                 :business_sizes => ['up-to-249'],
+                                 :locations => ['london'],
+                                 :purposes => ['start-up'],
+                                 :sectors => ['agriculture','manufacturing'],
+                                 :stages => ['grow-and-sustain'],
+                                 :support_types => ['grant','loan'],
+                                 :start_date => 1.year.ago(Date.today),
+                                 :end_date => 1.year.since(Date.today))
+
     new_support = support.build_clone
 
     assert_equal support.business_support_identifier, new_support.business_support_identifier
@@ -182,5 +192,52 @@ class BusinessSupportEditionTest < ActiveSupport::TestCase
     assert_equal support.will_continue_on, new_support.will_continue_on
     assert_equal support.continuation_link, new_support.continuation_link
     assert_equal support.contact_details, new_support.contact_details
+
+    assert_equal support.priority, new_support.priority
+    assert_equal support.business_sizes, new_support.business_sizes
+    assert_equal support.locations, new_support.locations
+    assert_equal support.purposes, new_support.purposes
+    assert_equal support.sectors, new_support.sectors
+    assert_equal support.stages, new_support.stages
+    assert_equal support.support_types, new_support.support_types
+    assert_equal support.start_date, new_support.start_date
+    assert_equal support.end_date, new_support.end_date
+  end
+
+  context "for facets" do
+    setup do
+      @e1 = FactoryGirl.create(:business_support_edition,
+                              :business_sizes => ['1', 'up-to-1000000'],
+                              :locations => ['narnia'], :purposes => ['world-domination'],
+                              :sectors => ['agriculture', 'healthcare'],
+                              :stages => ['pivoting'], :support_types => ['award', 'grant', 'loan'])
+      @e2 = FactoryGirl.create(:business_support_edition,
+                              :business_sizes => ['1', 'up-to-1000000'],
+                              :locations => ['hades', 'narnia'], :purposes => ['business-growth-and-expansion'],
+                              :sectors => ['education', 'healthcare'],
+                              :stages => ['start-up', 'pivoting'], :support_types => ['grant', 'loan', 'equity'])
+      @e3 = FactoryGirl.create(:business_support_edition,
+                              :business_sizes => ['up-to-249', 'up-to-1000000'],
+                              :locations => ['hades', 'chicken-town'], :purposes => ['making-the-most-of-the-internet'],
+                              :sectors => ['utilities'], :stages => ['start-up'], :support_types => ['grant'])
+    end
+
+    should "only return editions matching the facet values provided" do
+      editions = BusinessSupportEdition.for_facets({:purposes => 'business-growth-and-expansion', :support_types => 'equity'})
+      assert_equal [@e2], editions
+      editions = BusinessSupportEdition.for_facets({:business_sizes => '1,up-to-1000000', :locations => 'narnia'})
+      assert_equal [@e1, @e2], editions
+    end
+    should "support searching with all the facet values" do
+      editions = BusinessSupportEdition.for_facets({:business_sizes => 'up-to-1000000', :locations => 'narnia,hades,chicken-town',
+                                                    :purposes => 'business-growth-and-expansion,making-the-most-of-the-internet,world-domination',
+                                                    :sectors => 'agriculture,healthcare,utilities', :stages => 'pivoting,start-up',
+                                                    :support_types => 'award,grant,loan'})
+      assert_equal [@e1, @e2, @e3], editions
+    end
+    should "return nothing where no facet values match" do
+      editions = BusinessSupportEdition.for_facets({:business_sizes => 'up-to-a-bizillion', :locations => 'ecclefechan'})
+      assert_empty editions
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_content_models
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 6.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-29 00:00:00.000000000 Z
+date: 2014-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext
@@ -454,7 +454,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3811890245827365006
+      hash: 1683068425110248072
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -463,7 +463,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3811890245827365006
+      hash: 1683068425110248072
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23