govuk_content_models 37.0.0 → 38.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 509f173b9c1d06101cb2b41fb74ae031a30fd99e
-  data.tar.gz: f2e8f1137985b74e33009062e68404774cc08be9
+  metadata.gz: 5df2ae51cb9c82fd594961e0d80a96d6ebe6bc0c
+  data.tar.gz: 48f4278dd4f2cea25927987c2e73beaf078274d1
 SHA512:
-  metadata.gz: 19d98c962dcb6fcaf9bc02f4c083ede71233ef2fb2b94a350cca2165b9edab0933b67e9990194ce6008d48e1fbe26a33f99a95ee5bb60116349427edf0a592a7
-  data.tar.gz: 3c873f461815c6b99b35675f6daf0446ffb64cbb0484f63768c0af40ab0b9d72a4d048567be3619efb1d813d279fe8a84fbaed5b74969395e13c80ee6a701cfb
+  metadata.gz: 086b090dfd1932c064b6ae360b84df33aead4ad44bd2ee4c4a107726c18db158553e872a65061d65544e7c89e7598b1b3f81caee933ab2d25967691c4ae7ce1d
+  data.tar.gz: 477ea838b3c2522868a69729af1ed696348890498233745563388d5ec77368d209e2d2cb4357b51c40cefc796b28f5b55a3acf0c985e049e4e589bcc3576e2ad

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # CHANGELOG
 
+## 38.0.0
+
+- Removed LocalInteraction model as this information is now obtained from Local
+Links Manager [#389](https://github.com/alphagov/govuk_content_models/pull/389)
+
+## 37.0.0
+
+- Removed old style (organ donor registration) promotion code [#387](https://github.com/alphagov/govuk_content_models/pull/387)
+
 ## 36.0.0
 
 - Remove fields from LocalAuthority

data/app/models/local_authority.rb

@@ -1,12 +1,9 @@
 require "csv"
-require "local_interaction"
 require "safe_html"
 
 class LocalAuthority
   include Mongoid::Document
 
-  embeds_many :local_interactions
-
   field :name,               type: String
   field :snac,               type: String
   field :local_directgov_id, type: Integer
@@ -22,31 +19,4 @@ class LocalAuthority
     for_snacs([snac]).first
   end
 
-  def provides_service?(lgsl_code, lgil_code = nil)
-    interactions_for(lgsl_code, lgil_code).any?
-  end
-
-  def interactions_for(lgsl_code, lgil_code = nil)
-    interactions = local_interactions.where(lgsl_code: lgsl_code)
-    if lgil_code
-      interactions.where(lgil_code: lgil_code)
-    else
-      interactions
-    end
-  end
-
-  def preferred_interaction_for(lgsl_code, lgil_code = nil)
-    interactions = local_interactions.where(lgsl_code: lgsl_code)
-    if lgil_code
-      interactions.where(lgil_code: lgil_code).first
-    else
-      interactions.excludes(
-        lgil_code: LocalInteraction::LGIL_CODE_PROVIDING_INFORMATION
-      ).order_by(lgil_code: :asc).first ||
-      interactions.where(
-        lgil_code: LocalInteraction::LGIL_CODE_PROVIDING_INFORMATION
-      ).first
-    end
-  end
-
 end

data/app/models/local_service.rb

@@ -19,11 +19,6 @@ class LocalService
     LocalService.where(lgsl_code: lgsl_code).first
   end
 
-  def preferred_interaction(snac_or_snac_list, lgil_override = nil)
-    provider = preferred_provider(snac_or_snac_list)
-    provider && provider.preferred_interaction_for(lgsl_code, lgil_override)
-  end
-
   def preferred_provider(snac_or_snac_list)
     snac_list = [*snac_or_snac_list]
     providers = LocalAuthority.for_snacs(snac_list)
@@ -31,8 +26,7 @@ class LocalService
   end
 
   def provided_by
-    LocalAuthority.where("local_interactions.lgsl_code" => lgsl_code)
-                  .any_in(tier: providing_tier)
+    LocalAuthority.any_in(tier: providing_tier)
   end
 
 private

data/app/models/local_transaction_edition.rb

@@ -32,7 +32,7 @@ class LocalTransactionEdition < Edition
 
   def service_provided_by?(snac)
     authority = LocalAuthority.find_by_snac(snac)
-    authority && authority.provides_service?(lgsl_code)
+    authority && service.provided_by.include?(authority)
   end
 
   def whole_body

data/lib/govuk_content_models/test_helpers/factories.rb

@@ -216,13 +216,6 @@ FactoryGirl.define do
     tier "county"
   end
 
-  factory :local_interaction do
-    association :local_authority
-    url "http://some.council.gov/do.html"
-    sequence(:lgsl_code) {|n| 120 + n }
-    lgil_code 0
-  end
-
   factory :place_edition, parent: :edition, class: 'PlaceEdition'  do
     title "Far far away"
     introduction "Test introduction"

data/lib/govuk_content_models/test_helpers/local_services.rb

@@ -2,23 +2,15 @@ module LocalServicesHelper
   def make_authority(tier, options)
     authority = FactoryGirl.create(:local_authority,
                                    snac: options[:snac], tier: tier)
-    add_service_interaction(authority, options[:lgsl]) if options[:lgsl]
     authority
   end
 
-  def add_service_interaction(existing_authority, lgsl_code)
-    FactoryGirl.create(:local_interaction, local_authority: existing_authority,
-                       lgsl_code: lgsl_code)
-  end
-
   def make_service(lgsl_code, providing_tier)
     LocalService.create!(lgsl_code: lgsl_code, providing_tier: providing_tier)
   end
 
-  def make_authority_providing(lgsl_code)
-    council = FactoryGirl.create(:local_authority, snac: "00AA", tier: "county")
-    FactoryGirl.create(:local_interaction, local_authority: council,
-                       lgsl_code: lgsl_code)
+  def make_authority_providing(_lgsl_code, tier = 'county')
+    council = FactoryGirl.create(:local_authority, snac: "00AA", tier: tier)
     council
   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 = "37.0.0"
+  VERSION = "38.0.0"
 end

data/test/models/local_authority_test.rb

@@ -21,87 +21,4 @@ describe LocalAuthority do
     assert_equal "county", authority.tier
     assert_equal "http://example.gov/", authority.homepage_url
   end
-
-  describe "validating local_interactions" do
-    before :each do
-      @authority = FactoryGirl.create(:local_authority)
-    end
-
-    it "should require a lgsl_code and lgil_code" do
-      li = @authority.local_interactions.build
-      refute li.valid?
-      assert_equal ["can't be blank"], li.errors[:lgsl_code]
-      assert_equal ["can't be blank"], li.errors[:lgil_code]
-    end
-
-    it "should not allow duplicate lgsl/lgil pairs" do
-      li1 = @authority.local_interactions.create!(:lgsl_code => 42, :lgil_code => 8, :url => "http://www.example.com/one")
-      li2 = @authority.local_interactions.build(:lgsl_code => 42, :lgil_code => 8, :url => "http://www.example.com/two")
-
-      refute li2.valid?
-      assert_equal ["is already taken"], li2.errors[:lgil_code]
-
-      li2.lgil_code = 3
-      assert li2.valid?
-    end
-
-    it "should only validate uniqueness within the authority" do
-      authority2 = FactoryGirl.create(:local_authority)
-      li1 = @authority.local_interactions.create!(:lgsl_code => 42, :lgil_code => 8, :url => "http://www.example.com/one")
-      li2 = authority2.local_interactions.build(:lgsl_code => 42, :lgil_code => 8, :url => "http://www.example.com/two")
-
-      assert li2.valid?
-    end
-  end
-
-  describe "preferred_interaction_for" do
-    before :each do
-      @authority = FactoryGirl.create(:local_authority)
-      @lgsl_code = "142"
-    end
-
-    describe "with no LIGL specified" do
-      it "should return the lowest LGIL that's not 8" do
-        @interaction1 = FactoryGirl.create(:local_interaction, :local_authority => @authority, :lgsl_code => @lgsl_code,
-                                           :lgil_code => 12)
-        @interaction2 = FactoryGirl.create(:local_interaction, :local_authority => @authority, :lgsl_code => @lgsl_code,
-                                           :lgil_code => LocalInteraction::LGIL_CODE_PROVIDING_INFORMATION)
-        @interaction3 = FactoryGirl.create(:local_interaction, :local_authority => @authority, :lgsl_code => @lgsl_code,
-                                           :lgil_code => 9)
-
-        assert_equal @interaction3, @authority.preferred_interaction_for(@lgsl_code)
-      end
-
-      it "should return LGIL 8 if there are no others" do
-        @interaction2 = FactoryGirl.create(:local_interaction, :local_authority => @authority, :lgsl_code => @lgsl_code,
-                                           :lgil_code => LocalInteraction::LGIL_CODE_PROVIDING_INFORMATION)
-
-        assert_equal @interaction2, @authority.preferred_interaction_for(@lgsl_code)
-      end
-    end
-
-    describe "with an LGIL specified" do
-      it "should return the interaction for the specified LGIL" do
-        @interaction1 = FactoryGirl.create(:local_interaction, :local_authority => @authority, :lgsl_code => @lgsl_code,
-                                           :lgil_code => 12)
-        @interaction2 = FactoryGirl.create(:local_interaction, :local_authority => @authority, :lgsl_code => @lgsl_code,
-                                           :lgil_code => LocalInteraction::LGIL_CODE_PROVIDING_INFORMATION)
-        @interaction3 = FactoryGirl.create(:local_interaction, :local_authority => @authority, :lgsl_code => @lgsl_code,
-                                           :lgil_code => 9)
-
-        assert_equal @interaction2, @authority.preferred_interaction_for(@lgsl_code, 8)
-      end
-
-      it "should return nil if there is no interaction with the specified LGIL" do
-        @interaction1 = FactoryGirl.create(:local_interaction, :local_authority => @authority, :lgsl_code => @lgsl_code,
-                                           :lgil_code => 12)
-        @interaction2 = FactoryGirl.create(:local_interaction, :local_authority => @authority, :lgsl_code => @lgsl_code,
-                                           :lgil_code => LocalInteraction::LGIL_CODE_PROVIDING_INFORMATION)
-        @interaction3 = FactoryGirl.create(:local_interaction, :local_authority => @authority, :lgsl_code => @lgsl_code,
-                                           :lgil_code => 9)
-
-        assert_equal nil, @authority.preferred_interaction_for(@lgsl_code, 3)
-      end
-    end
-  end
 end

data/test/models/local_service_test.rb

@@ -20,141 +20,52 @@ class LocalServiceTest < ActiveSupport::TestCase
       tier: "county",
       snac: "AA00"
     )
-    FactoryGirl.create(
-      :local_interaction,
-      local_authority: @county_council,
-      lgsl_code:       @lgsl_code,
-      url:             "http://some.county.council.gov/do-123.html"
-    )
     @district_council = FactoryGirl.create(
       :local_authority,
       tier: "district",
       snac: "AA"
     )
-    FactoryGirl.create(
-      :local_interaction,
-      local_authority: @district_council,
-      lgsl_code:       @lgsl_code,
-      url:             "http://some.district.council.gov/do-123.html"
-    )
     @unitary_authority = FactoryGirl.create(
       :local_authority,
       tier: "unitary",
       snac: "BB00"
     )
-    FactoryGirl.create(
-      :local_interaction,
-      local_authority: @unitary_authority,
-      lgsl_code:       @lgsl_code,
-      url:             "http://some.unitary.council.gov/do-123.html"
-    )
   end
 
-  test "should return county URL for county/UA service in county" do
-    service = create_service_for_tiers(:county, :unitary)
-    councils = [@county_council.snac, @district_council.snac]
-    assert_equal "http://some.county.council.gov/do-123.html",
-                 service.preferred_interaction(councils).url
-  end
+  test "should not list a county as providing a service for districts" do
+    service = create_service_for_tiers(:district, :unitary)
 
-  test "should return UA URL for county/UA service in UA" do
-    service = create_service_for_tiers(:county, :unitary)
-    councils = [@unitary_authority.snac]
-    assert_equal "http://some.unitary.council.gov/do-123.html",
-                 service.preferred_interaction(councils).url
+    refute_includes service.provided_by.map(&:snac), @county_council.snac
   end
 
-  test "should return nil for county/UA service in district" do
+  test "should not list a district as providing a service for counties" do
     service = create_service_for_tiers(:county, :unitary)
-    councils = [@district_council.snac]
-    assert_nil service.preferred_interaction(councils)
-  end
 
-  test "should allow overriding returned LGIL" do
-    FactoryGirl.create(:local_interaction,
-      local_authority: @county_council,
-      lgsl_code:       @lgsl_code,
-      lgil_code:       12,
-      url:             "http://some.county.council.gov/do-456.html"
-    )
-    service = create_service_for_tiers(:county, :unitary)
-    councils = [@county_council.snac, @district_council.snac]
-    assert_equal "http://some.county.council.gov/do-456.html",
-                 service.preferred_interaction(councils, 12).url
+    refute_includes service.provided_by.map(&:snac), @district_council.snac
   end
 
-  test "should not list a county (in a UA) as providing a service it does not provide" do
+  test "should list a county as providing a service for counties and unitaries" do
     service = create_service_for_tiers(:county, :unitary)
-    other_service = service.lgsl_code.to_i + 1
-    FactoryGirl.create(
-      :local_interaction,
-      local_authority: @county_council,
-      lgsl_code:       other_service
-    )
-    authority = FactoryGirl.create(
-      :local_authority,
-      tier: "county",
-      snac: "CC00"
-    )
-    FactoryGirl.create(
-      :local_interaction,
-      local_authority: authority,
-      lgsl_code:       other_service
-    )
 
-    refute_includes service.provided_by.map(&:snac), "CC00"
+    assert_includes service.provided_by.map(&:snac), @county_council.snac
   end
 
-  test "should not list a UA as providing a service it does not provide" do
-    service = create_service_for_tiers(:county, :unitary)
-    other_service = service.lgsl_code.to_i + 1
-    FactoryGirl.create(
-      :local_interaction,
-      local_authority: @county_council,
-      lgsl_code:       other_service
-    )
-    authority = FactoryGirl.create(
-      :local_authority,
-      tier: "unitary",
-      snac: "CC01"
-    )
-    FactoryGirl.create(
-      :local_interaction,
-      local_authority: authority,
-      lgsl_code:       other_service
-    )
+  test "should list a district as providing a service for districts and unitaries" do
+    service = create_service_for_tiers(:district, :unitary)
 
-    refute_includes service.provided_by.map(&:snac), "CC01"
+    assert_includes service.provided_by.map(&:snac), @district_council.snac
   end
 
-  test "should list a county (in a UA) that provides a service" do
+  test "should list a UA as providing a service for counties and unitaries" do
     service = create_service_for_tiers(:county, :unitary)
-    assert_includes service.provided_by.map(&:snac), @county_council.snac
-  end
 
-  test "should list a UA that provides a service" do
-    service = create_service_for_tiers(:county, :unitary)
     assert_includes service.provided_by.map(&:snac), @unitary_authority.snac
   end
 
-  test "should return district URL for district/UA service in county/district" do
-    service = create_service_for_tiers(:district, :unitary)
-    councils = [@county_council.snac, @district_council.snac]
-    assert_equal "http://some.district.council.gov/do-123.html",
-                 service.preferred_interaction(councils).url
-  end
-
-  test "should return UA URL for district/UA service in UA" do
-    service = create_service_for_tiers(:district, :unitary)
-    councils = [@unitary_authority.snac]
-    assert_match "http://some.unitary.council.gov/do-123.html",
-                 service.preferred_interaction(councils).url
-  end
+  test "should list a UA as providing a service for districts and unitaries" do
+    service = create_service_for_tiers(:county, :unitary)
 
-  test "should return nil for district/UA service in county" do
-    service = create_service_for_tiers(:district, :unitary)
-    councils = [@county_council.snac]
-    assert_nil service.preferred_interaction(councils)
+    assert_includes service.provided_by.map(&:snac), @unitary_authority.snac
   end
 
   test "should list only districts and UAs as providers" do
@@ -165,29 +76,6 @@ class LocalServiceTest < ActiveSupport::TestCase
     assert_includes providers.map(&:snac), @unitary_authority.snac
   end
 
-  test "should return district URL for both-tier service in county/district" do
-    service = create_service_for_tiers("district", "unitary", "county")
-    councils = [@county_council.snac, @district_council.snac]
-    url = service.preferred_interaction(councils).url
-    assert_equal "http://some.district.council.gov/do-123.html", url
-  end
-
-  test "should return UA URL for both-tier service in UA" do
-    service = create_service_for_tiers("district", "unitary", "county")
-    councils = [@unitary_authority.snac]
-    url = service.preferred_interaction(councils).url
-    assert_equal "http://some.unitary.council.gov/do-123.html", url
-  end
-
-  # This shouldn't really ever happen and suggests that the data
-  # is incorrect somehow, but we might as well fall back to county council
-  test "should return county URL for both-tier service in county" do
-    service = create_service_for_tiers("district", "unitary", "county")
-    councils = [@county_council.snac]
-    url = service.preferred_interaction(councils).url
-    assert_equal "http://some.county.council.gov/do-123.html", url
-  end
-
   test "should list all authorities providing a both-tier service" do
     service = create_service_for_tiers("district", "unitary", "county")
     make_authority("county", snac: "CC00", lgsl: 124)

data/test/models/local_transaction_edition_test.rb

@@ -11,25 +11,37 @@ class LocalTransactionEditionTest < ActiveSupport::TestCase
     @artefact = FactoryGirl.create(:artefact)
   end
 
-  test "should report that an authority provides a service" do
+  test "should report that an authority provides a service if the snac references a real authority in the same tier" do
     bins_transaction = LocalTransactionEdition.new(
       lgsl_code:     BINS,
       title:         "Transaction",
       slug:          "slug",
       panopticon_id: @artefact.id
     )
-    county_council = make_authority_providing(BINS)
+    make_service(BINS, %w(county unitary))
+    county_council = make_authority('county', snac: '00PP')
     assert bins_transaction.service_provided_by?(county_council.snac)
   end
 
-  test "should report that an authority does not provide a service" do
+  test "should report that an authority does not provide a service if the snac does not reference a real authority" do
     bins_transaction = LocalTransactionEdition.new(
       lgsl_code:     BINS,
       title:         "Transaction",
       slug:          "slug",
       panopticon_id: @artefact.id
     )
-    county_council = make_authority_providing(HOUSING_BENEFIT)
+    refute bins_transaction.service_provided_by?('No-Such-SNAC')
+  end
+
+  test "should report that an authority does not provide a service if the snac references a real authority in the wrong tier" do
+    bins_transaction = LocalTransactionEdition.new(
+      lgsl_code:     BINS,
+      title:         "Transaction",
+      slug:          "slug",
+      panopticon_id: @artefact.id
+    )
+    make_service(BINS, %w(district unitary))
+    county_council = make_authority('county', snac: '00ZZ')
     refute bins_transaction.service_provided_by?(county_council.snac)
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_content_models
 version: !ruby/object:Gem::Version
-  version: 37.0.0
+  version: 38.0.0
 platform: ruby
 authors:
 - Paul Battley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-27 00:00:00.000000000 Z
+date: 2016-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext
@@ -342,7 +342,6 @@ files:
 - app/models/help_page_edition.rb
 - app/models/licence_edition.rb
 - app/models/local_authority.rb
-- app/models/local_interaction.rb
 - app/models/local_service.rb
 - app/models/local_transaction_edition.rb
 - app/models/overview_dashboard.rb

data/app/models/local_interaction.rb

@@ -1,17 +0,0 @@
-require "csv"
-require "safe_html"
-
-class LocalInteraction
-  include Mongoid::Document
-
-  LGIL_CODE_PROVIDING_INFORMATION = 8
-
-  field :lgsl_code, type: Integer
-  field :lgil_code, type: Integer
-  field :url,       type: String
-
-  embedded_in :local_authority
-
-  validates_presence_of :url, :lgil_code, :lgsl_code
-  validates_uniqueness_of :lgil_code, :scope => :lgsl_code
-end