diff way

Author: patrickpatrickpatrick

app/models/call_for_evidence.rb

@@ -48,10 +48,6 @@ def process_associations_after_save(edition)
     schedule_republishing_workers
   end
 
-  def self.base_path
-    "/government/calls-for-evidence/"
-  end
-
   def schedule_republishing_workers
     if opening_at.try(:future?)
       PublishingApiDocumentRepublishingWorker
@@ -135,6 +131,10 @@ def string_for_slug
     title
   end
 
+  def base_path
+    "/government/calls-for-evidence/#{slug}"
+  end
+
   def publishing_api_presenter
     PublishingApi::CallForEvidencePresenter
   end

app/models/case_study.rb

@@ -10,10 +10,6 @@ class CaseStudy < Edition
   include Edition::WorldwideOrganisations
   include Edition::LeadImage
 
-  def self.base_path
-    "/government/case-studies/"
-  end
-
   def rendering_app
     Whitehall::RenderingApp::FRONTEND
   end
@@ -22,6 +18,10 @@ def translatable?
     !non_english_edition?
   end
 
+  def base_path
+    "/government/case-studies/#{slug}"
+  end
+
   def publishing_api_presenter
     PublishingApi::CaseStudyPresenter
   end

app/models/consultation.rb

@@ -58,10 +58,6 @@ def process_associations_after_save(edition)
     schedule_republishing_workers
   end
 
-  def self.base_path
-    "/government/consultations/"
-  end
-
   def schedule_republishing_workers
     if opening_at.try(:future?)
       PublishingApiDocumentRepublishingWorker
@@ -149,6 +145,10 @@ def string_for_slug
     title
   end
 
+  def base_path
+    "/government/consultations/#{slug}"
+  end
+
   def publishing_api_presenter
     PublishingApi::ConsultationPresenter
   end

app/models/detailed_guide.rb

@@ -11,10 +11,6 @@ class DetailedGuide < Edition
   include Edition::RelatedDocuments
   include Edition::TopicalEvents
 
-  def self.base_path
-    "/guidance/"
-  end
-
   has_many :related_mainstreams, foreign_key: "edition_id", dependent: :destroy
 
   validate :related_mainstream_found, if: :related_mainstream_requested?
@@ -108,6 +104,10 @@ def all_nation_applicability_selected?
     newly_created ? false : all_nation_applicability
   end
 
+  def base_path
+    "/guidance/#{slug}"
+  end
+
   def publishing_api_presenter
     PublishingApi::DetailedGuidePresenter
   end

app/models/document.rb

@@ -86,8 +86,10 @@ def first_edition_id
   def similar_slug_exists?
     scope = Document.where(document_type:)
 
-    # return false if slug.nil?
-    return false if slug_without_sequence.blank?
+    # slug is a nullable column, so we can't assume that it exists
+    return false if slug.nil?
+
+    slug_without_sequence = slug.split(sequence_separator).first
 
     scope.where(
       "slug IN (?) OR slug LIKE ?",
@@ -96,13 +98,6 @@ def similar_slug_exists?
     ).count > 1
   end
 
-  def slug_without_sequence
-    # slug is a nullable column, so we can't assume that it exists
-    return if slug.nil?
-
-    slug.split(sequence_separator).first
-  end
-
   delegate :sequence_separator, to: :friendly_id_config
 
   def should_generate_new_friendly_id?

app/models/document_collection.rb

@@ -22,10 +22,6 @@ def process_associations_before_save(new_edition)
 
   add_trait ClonesGroupsTrait
 
-  def self.base_path
-    "/government/collections/"
-  end
-
   def rendering_app
     Whitehall::RenderingApp::FRONTEND
   end
@@ -38,6 +34,10 @@ def locale_can_be_changed?
     true
   end
 
+  def base_path
+    "/government/collections/#{slug}"
+  end
+
   def publishing_api_presenter
     PublishingApi::DocumentCollectionPresenter
   end

app/models/edition.rb

@@ -101,10 +101,6 @@ def self.scheduled_for_publication_as(slug)
     document&.scheduled_edition
   end
 
-  def self.base_path
-    "/government/generic-editions/"
-  end
-
   def skip_main_validation?
     FROZEN_STATES.include?(state)
   end
@@ -400,10 +396,13 @@ def attribute_names
   end
 
   def base_path
-    "#{self.class.base_path}#{url_slug}"
+    url_slug = slug || id.to_param
+    "/government/generic-editions/#{url_slug}"
   end
 
-  delegate :slug_without_sequence, to: :document
+  def base_path_without_sequence
+    base_path.split(document.sequence_separator).first
+  end
 
   def public_path(options = {})
     return if base_path.nil?
@@ -447,10 +446,6 @@ def deleted_associated_documents
 
 private
 
-  def url_slug
-    slug || id.to_param
-  end
-
   def date_for_government
     published_edition_date = first_public_at.try(:to_date)
     draft_edition_date = updated_at.try(:to_date)

app/models/fatality_notice.rb

@@ -25,10 +25,6 @@ def process_associations_after_save(new_edition)
 
   add_trait CasualtiesTrait
 
-  def self.base_path
-    "/government/fatalities/"
-  end
-
   def has_operational_field?
     true
   end
@@ -37,6 +33,10 @@ def rendering_app
     Whitehall::RenderingApp::FRONTEND
   end
 
+  def base_path
+    "/government/fatalities/#{slug}"
+  end
+
   def publishing_api_presenter
     PublishingApi::FatalityNoticePresenter
   end

lib/whitehall/publishing_api.rb

@@ -69,8 +69,8 @@ def self.save_draft_translation(
 
         content.merge!(bulk_publishing: true) if bulk_publishing
 
-        base_path = if model_instance.respond_to?(:slug_without_sequence)
-                      "#{model_instance.class.base_path}#{model_instance.slug_without_sequence}"
+        base_path = if model_instance.respond_to?(:base_path_without_sequence)
+                      model_instance.base_path_without_sequence
                     else
                       content[:base_path]
                     end