Fix typos and undo refactor

Fix typos

Undo refactor as it's out of scope for this ticket

Author: Obsiye

app/services/dgu/collections_service.rb

@@ -1,14 +1,17 @@
 module Dgu
   class CollectionsService
+    COLLECTIONS_LOCATION = Rails.configuration.x.generated_collections_location
+    COLLECTION_PAGES = Rails.configuration.x.collection_pages.deep_dup
+
     attr_reader :collection, :page_name, :collection_pages
 
     def initialize(collection, page_name = nil)
       unless collection?(collection)
-        raise Dgu::CollectionNotFound, "Collection #{collection} does not exist"
+        raise Dgu::CollectionNotFound
       end
 
       @collection = collection
-      @collection_pages = collection_pages_config[collection].map do |collection_page|
+      @collection_pages = COLLECTION_PAGES[collection].map do |collection_page|
         {
           url: "/collections/#{@collection}/#{collection_page[:slug]}",
           slug: collection_page[:slug],
@@ -28,12 +31,18 @@ def page
     end
 
     def image_path
-      "/v2/collections/badge-#{collection}.png"
+      "/images/collections/#{collection}.jpg"
     end
 
     def collections_slugs
-      @collections_slugs ||= collection_pages_config.keys.map do |collection_slug|
-        Struct.new(:slug, :title).new(collection_slug.to_s, collection_slug.to_s.tr("-", " ").humanize)
+      Dir.entries(Rails.root.join(COLLECTIONS_LOCATION)).sort
+      .reject { |files|
+        [".", ".."].include?(files)
+      }.map do |collection|
+        Struct.new(:slug, :title).new(
+          collection,
+          collection.gsub("-", " ").humanize,
+        )
       end
     end
 
@@ -63,22 +72,24 @@ def title
 
   private
 
-    def collection_pages_config
-      @collection_pages_config ||= YAML.load_file(Rails.root.join("config/collections.yml")).with_indifferent_access
-    end
-
     def pages
-      @pages ||= collection_pages_config[@collection].map { |page| page[:slug] }
+      Dir.entries(Rails.root.join(COLLECTIONS_LOCATION, @collection)).sort
+      .reject { |entry|
+        [".", ".."].include?(entry)
+      }
+      .map do |page_file_name|
+        page_file_name.gsub(".html.erb", "")
+      end
     end
 
     def page?(page = nil)
       return true if page.blank?
 
-      pages.include?(page)
+      Rails.root.join(COLLECTIONS_LOCATION, @collection, "#{page}.html.erb").exist?
     end
 
     def collection?(collection)
-      collections_slugs.map(&:slug).include?(collection)
+      Rails.root.join(COLLECTIONS_LOCATION, collection).exist?
     end
 
     def current_page_index

config/application.rb

@@ -14,6 +14,7 @@
 # require "action_cable/engine"
 require "sprockets/railtie"
 require "rails/test_unit/railtie"
+require_relative "./collections"
 
 # Require the gems listed in Gemfile, including any gems
 # you've limited to :test, :development, or :production.
@@ -43,6 +44,8 @@ class Application < Rails::Application
     config.x.markdown_data_manual_location = "app/content/data-manual"
     config.x.markdown_content_pages_location = "app/content/content-pages"
 
+    config.x.collection_pages = Collections::COLLECTIONS.with_indifferent_access
+
     config.ssl_options = { hsts: { expires: 1.week } }
 
     config.action_dispatch.default_headers = {

config/collections.rb

@@ -0,0 +1,89 @@
+module Collections
+  COLLECTIONS = {
+    "business-and-economy": [
+      { "title": "UK trade", "slug": "uk-trade" },
+      { "title": "Inflation", "slug": "inflation" },
+      { "title": "Bank of England interest rates", "slug": "bank-of-england-interest-rates" },
+      { "title": "Get company information", "slug": "get-company-information" },
+      { "title": "Get charity information", "slug": "get-charity-information" },
+      { "title": "Food hygiene ratings", "slug": "food-hygiene-ratings" },
+      { "title": "Fuel and oil prices", "slug": "fuel-and-oil-prices" },
+      { "title": "Energy prices", "slug": "energy-prices" },
+      { "title": "Electricity", "slug": "electricity" },
+      { "title": "Agricultural commodity prices", "slug": "agricultural-commodity-prices" },
+    ],
+    "environment": [
+      { "title": "Weather", "slug": "weather" },
+      { "title": "Air quality", "slug": "air-quality" },
+      { "title": "Water quality", "slug": "water-quality" },
+      { "title": "Long-term flood risk", "slug": "long-term-flood-risk" },
+      { "title": "Flood alerts", "slug": "flood-alerts" },
+      { "title": "Storm overflows", "slug": "storm-overflows" },
+      { "title": "Main rivers", "slug": "main-rivers" },
+      { "title": "Coastal erosion", "slug": "coastal-erosion" },
+      { "title": "Climate projections", "slug": "climate-projections" },
+      { "title": "Environmental public registers", "slug": "public-registers" },
+      { "title": "LIDAR mapping", "slug": "lidar" },
+      { "title": "Aerial photography mapping", "slug": "aerial-photography" },
+      { "title": "Landfill sites", "slug": "landfill-sites" },
+      { "title": "Road noise", "slug": "road-noise" },
+      { "title": "Rail noise", "slug": "rail-noise" },
+      { "title": "Forest and woodlands", "slug": "forest-and-woodlands" },
+      { "title": "Non-woodland trees", "slug": "non-woodland-trees" },
+      { "title": "Sites of Special Scientific Interest", "slug": "sites-of-special-scientific-interest" },
+    ],
+    "government": [
+      { "title": "Election results", "slug": "election-results" },
+      { "title": "Service assessment reports", "slug": "service-assessment-reports" },
+      { "title": "Local government finance", "slug": "local-government-finance" },
+      { "title": "Council Tax statistics", "slug": "council-tax-statistics" },
+      { "title": "Contracts finder", "slug": "contracts-finder" },
+      { "title": "Transparency data", "slug": "transparency-data" },
+    ],
+    "land-and-property": [
+      { "title": "UK house prices", "slug": "uk-house-prices" },
+      { "title": "Property price paid", "slug": "property-price-paid" },
+      { "title": "Land and property ownership", "slug": "land-and-property-ownership" },
+      { "title": "Planning data", "slug": "planning-data" },
+      { "title": "Addresses", "slug": "addresses" },
+      { "title": "Dwelling stock (including vacancies)", "slug": "dwelling-stock" },
+      { "title": "Rents, lettings and tenancies", "slug": "rents-lettings-and-tenancies" },
+      { "title": "English Housing Survey", "slug": "english-housing-survey" },
+      { "title": "Housing supply", "slug": "housing-supply" },
+      { "title": "Energy performance of buildings", "slug": "energy-performance-of-buildings" },
+      { "title": "Fire statistics", "slug": "fire-statistics" },
+    ],
+    "people": [
+      { "title": "Births", "slug": "births" },
+      { "title": "Deaths", "slug": "deaths" },
+      { "title": "Public health dashboard", "slug": "public-health-dashboard" },
+      { "title": "Population estimates", "slug": "population-estimates" },
+      { "title": "Immigration", "slug": "immigration" },
+      { "title": "Social mobility", "slug": "social-mobility" },
+      { "title": "Deprivation", "slug": "deprivation" },
+      { "title": "Homelessness", "slug": "homelessness" },
+      { "title": "Police recorded crime and outcomes", "slug": "police-recorded-crime-and-outcomes" },
+      { "title": "Courts management", "slug": "courts-management" },
+      { "title": "Early years and childcare inspections and outcomes", "slug": "early-years-and-childcare-inspections-and-outcomes" },
+      { "title": "State-funded schools inspections and outcomes", "slug": "state-funded-schools-inspections-and-outcomes" },
+      { "title": "Pupil attendance", "slug": "pupil-attendance" },
+      { "title": "Compare school performance", "slug": "compare-school-performance" },
+      { "title": "Vocational qualifications", "slug": "vocational-qualifications" },
+      { "title": "Museum and gallery visits", "slug": "museum-and-gallery-visits" },
+      { "title": "Family food statistics", "slug": "family-food-statistics" },
+    ],
+    "transport": [
+      { "title": "Road traffic", "slug": "road-traffic" },
+      { "title": "Road safety", "slug": "road-safety" },
+      { "title": "Road conditions", "slug": "road-conditions" },
+      { "title": "Real-time and historic train information", "slug": "real-time-and-historic-train-information" },
+      { "title": "Bus statistics", "slug": "bus-statistics" },
+      { "title": "MOT test results", "slug": "mot-results" },
+      { "title": "Driving tests", "slug": "driving-tests" },
+      { "title": "Fishing vessels", "slug": "fishing-vessels" },
+      { "title": "National Travel Survey", "slug": "national-travel-survey" },
+      { "title": "Transport connectivity", "slug": "transport-connectivity" },
+      { "title": "Maritime and shipping", "slug": "maritime-and-shipping" },
+    ],
+  }.freeze
+end

config/collections.yml

@@ -21,7 +21,6 @@
 require "webmock/rspec"
 require "rake"
 
-
 # Requires supporting ruby files with custom matchers and macros, etc, in
 # spec/support/ and its subdirectories. Files matching `spec/**/*_spec.rb` are
 # run as spec files by default. This means that files in spec/support that end