govuk_content_models 38.0.0 → 39.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5df2ae51cb9c82fd594961e0d80a96d6ebe6bc0c
-  data.tar.gz: 48f4278dd4f2cea25927987c2e73beaf078274d1
+  metadata.gz: 57de0bfc9ffd58f24eea2a4f1bb0b21e13971ad5
+  data.tar.gz: 2802a90194fefafe9fa6944628aed782b6a44708
 SHA512:
-  metadata.gz: 086b090dfd1932c064b6ae360b84df33aead4ad44bd2ee4c4a107726c18db158553e872a65061d65544e7c89e7598b1b3f81caee933ab2d25967691c4ae7ce1d
-  data.tar.gz: 477ea838b3c2522868a69729af1ed696348890498233745563388d5ec77368d209e2d2cb4357b51c40cefc796b28f5b55a3acf0c985e049e4e589bcc3576e2ad
+  metadata.gz: cb545e782d6933007549e905217de3fb32df9b956f63d555560c42022223281f4bad8cd2d13580b45e98ec8b82ee20372c66a071dd76b030f86fdaf9c36ef212
+  data.tar.gz: 9f2f24e465e2af95a6b261c589ee16db0080bd43a9b97ea0cb5d46a72a63782f9a1e13980123a7f40300eb9462787cd163f3b31fc9260c127ef24a7342bf64f3

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 39.0.0
+
+- Removed LocalAuthority model as this information is now obtained from Local Links Manager [#391](https://github.com/alphagov/govuk_content_models/pull/391)
+
 ## 38.0.0
 
 - Removed LocalInteraction model as this information is now obtained from Local

data/app/models/local_service.rb

@@ -1,5 +1,4 @@
 require "csv"
-require "local_authority"
 require "safe_html"
 
 class LocalService
@@ -18,23 +17,4 @@ class LocalService
   def self.find_by_lgsl_code(lgsl_code)
     LocalService.where(lgsl_code: lgsl_code).first
   end
-
-  def preferred_provider(snac_or_snac_list)
-    snac_list = [*snac_or_snac_list]
-    providers = LocalAuthority.for_snacs(snac_list)
-    select_tier(providers)
-  end
-
-  def provided_by
-    LocalAuthority.any_in(tier: providing_tier)
-  end
-
-private
-
-  def select_tier(authorities)
-    by_tier = Hash[authorities.map {|a| [a.tier, a]}]
-    tier = providing_tier.find { |t| by_tier.has_key?(t) }
-    tier && by_tier[tier]
-  end
-
 end

data/app/models/local_transaction_edition.rb

@@ -30,11 +30,6 @@ class LocalTransactionEdition < Edition
     LocalService.find_by_lgsl_code(lgsl_code)
   end
 
-  def service_provided_by?(snac)
-    authority = LocalAuthority.find_by_snac(snac)
-    authority && service.provided_by.include?(authority)
-  end
-
   def whole_body
     self.introduction
   end

data/lib/govuk_content_models/test_helpers/local_services.rb

@@ -1,16 +1,5 @@
 module LocalServicesHelper
-  def make_authority(tier, options)
-    authority = FactoryGirl.create(:local_authority,
-                                   snac: options[:snac], tier: tier)
-    authority
-  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, 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 = "38.0.0"
+  VERSION = "39.0.0"
 end

data/test/models/local_service_test.rb

@@ -3,85 +3,4 @@ require "govuk_content_models/test_helpers/local_services"
 
 class LocalServiceTest < ActiveSupport::TestCase
   include LocalServicesHelper
-
-  def create_service_for_tiers(*tiers)
-    @service = LocalService.create!(
-      lgsl_code:      @lgsl_code,
-      providing_tier: tiers.map(&:to_s)
-    )
-  end
-
-  def setup
-    LocalAuthority.delete_all
-    @lgsl_code = 123
-    @snac_code = "AA00"
-    @county_council = FactoryGirl.create(
-      :local_authority,
-      tier: "county",
-      snac: "AA00"
-    )
-    @district_council = FactoryGirl.create(
-      :local_authority,
-      tier: "district",
-      snac: "AA"
-    )
-    @unitary_authority = FactoryGirl.create(
-      :local_authority,
-      tier: "unitary",
-      snac: "BB00"
-    )
-  end
-
-  test "should not list a county as providing a service for districts" do
-    service = create_service_for_tiers(:district, :unitary)
-
-    refute_includes service.provided_by.map(&:snac), @county_council.snac
-  end
-
-  test "should not list a district as providing a service for counties" do
-    service = create_service_for_tiers(:county, :unitary)
-
-    refute_includes service.provided_by.map(&:snac), @district_council.snac
-  end
-
-  test "should list a county 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 district as providing a service for districts and unitaries" do
-    service = create_service_for_tiers(:district, :unitary)
-
-    assert_includes service.provided_by.map(&:snac), @district_council.snac
-  end
-
-  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), @unitary_authority.snac
-  end
-
-  test "should list a UA as providing a service for districts and unitaries" do
-    service = create_service_for_tiers(:county, :unitary)
-
-    assert_includes service.provided_by.map(&:snac), @unitary_authority.snac
-  end
-
-  test "should list only districts and UAs as providers" do
-    service = create_service_for_tiers(:district, :unitary)
-    providers = service.provided_by
-    assert_equal 2, providers.length
-    assert_includes providers.map(&:snac), @district_council.snac
-    assert_includes providers.map(&:snac), @unitary_authority.snac
-  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)
-    providers = service.provided_by
-    assert_includes providers.map(&:snac), @district_council.snac
-    assert_includes providers.map(&:snac), @unitary_authority.snac
-    assert_includes providers.map(&:snac), @county_council.snac
-  end
 end

data/test/models/local_transaction_edition_test.rb

@@ -11,40 +11,6 @@ class LocalTransactionEditionTest < ActiveSupport::TestCase
     @artefact = FactoryGirl.create(:artefact)
   end
 
-  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
-    )
-    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 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
-    )
-    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
-
   test "should be a transaction search format" do
     bins_transaction = LocalTransactionEdition.new(
       lgsl_code:     BINS,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_content_models
 version: !ruby/object:Gem::Version
-  version: 38.0.0
+  version: 39.0.0
 platform: ruby
 authors:
 - Paul Battley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-08 00:00:00.000000000 Z
+date: 2016-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext
@@ -341,7 +341,6 @@ files:
 - app/models/guide_edition.rb
 - app/models/help_page_edition.rb
 - app/models/licence_edition.rb
-- app/models/local_authority.rb
 - app/models/local_service.rb
 - app/models/local_transaction_edition.rb
 - app/models/overview_dashboard.rb
@@ -422,7 +421,6 @@ files:
 - test/models/edition_test.rb
 - test/models/help_page_edition_test.rb
 - test/models/licence_edition_test.rb
-- test/models/local_authority_test.rb
 - test/models/local_service_test.rb
 - test/models/local_transaction_edition_test.rb
 - test/models/overview_dashboard_test.rb
@@ -496,7 +494,6 @@ test_files:
 - test/models/edition_test.rb
 - test/models/help_page_edition_test.rb
 - test/models/licence_edition_test.rb
-- test/models/local_authority_test.rb
 - test/models/local_service_test.rb
 - test/models/local_transaction_edition_test.rb
 - test/models/overview_dashboard_test.rb

data/app/models/local_authority.rb

@@ -1,22 +0,0 @@
-require "csv"
-require "safe_html"
-
-class LocalAuthority
-  include Mongoid::Document
-
-  field :name,               type: String
-  field :snac,               type: String
-  field :local_directgov_id, type: Integer
-  field :tier,               type: String
-  field :homepage_url,       type: String
-
-  validates_uniqueness_of :snac
-  validates_presence_of   :snac, :local_directgov_id, :name, :tier
-
-  scope :for_snacs, ->(snacs) { any_in(snac: snacs) }
-
-  def self.find_by_snac(snac)
-    for_snacs([snac]).first
-  end
-
-end

data/test/models/local_authority_test.rb

@@ -1,24 +0,0 @@
-require_relative "../test_helper"
-
-describe LocalAuthority do
-  before :each do
-    LocalAuthority.delete_all
-  end
-
-  it "should create an authority with correct field types" do
-    # Although it may seem overboard, this test is helpful to confirm
-    # the correct field types are being used on the model
-    LocalAuthority.create!(
-                  name: "Example",
-                  snac: "AA00",
-                  local_directgov_id: 1,
-                  tier: "county",
-                  homepage_url: 'http://example.gov/')
-    authority = LocalAuthority.first
-    assert_equal "Example", authority.name
-    assert_equal "AA00", authority.snac
-    assert_equal 1, authority.local_directgov_id
-    assert_equal "county", authority.tier
-    assert_equal "http://example.gov/", authority.homepage_url
-  end
-end