Merge pull request #9746 from alphagov/remove_sti_name

Refactoring: Reduce usages of sti_name to minimum
alphagov · Dec 17, 2024 · a9e0be4 · a9e0be4
2 parents a416b7c + deaa70c
commit a9e0be4
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 18 deletions.
diff --git a/app/models/announcement.rb b/app/models/announcement.rb
@@ -8,10 +8,6 @@ class Announcement < Edition
   include Edition::WorldLocations
   include Edition::TopicalEvents
 
-  def self.sti_names
-    ([self] + descendants).map(&:sti_name)
-  end
-
   def self.published_with_eager_loading(ids)
     published.with_translations.includes([:document, { organisations: :translations }]).where(id: ids)
   end

diff --git a/app/models/concerns/edition/publishing.rb b/app/models/concerns/edition/publishing.rb
@@ -19,7 +19,7 @@ def by_major_change_published_at
 
     def unpublished_as(slug)
       document = Document.at_slug(document_type, slug)
-      document && document.latest_edition && document.latest_edition.unpublishing
+      document&.latest_edition&.unpublishing
     end
   end
 

diff --git a/app/models/edition.rb b/app/models/edition.rb
@@ -101,7 +101,7 @@ def self.concrete_descendant_search_format_types
 
   def self.scheduled_for_publication_as(slug)
     document = Document.at_slug(document_type, slug)
-    document && document.scheduled_edition
+    document&.scheduled_edition
   end
 
   def skip_main_validation?

diff --git a/app/models/publicationesque.rb b/app/models/publicationesque.rb
@@ -16,10 +16,6 @@ class Publicationesque < Edition
 
   include ::Attachable
 
-  def self.sti_names
-    ([self] + descendants).map(&:sti_name)
-  end
-
   def self.published_with_eager_loading(ids)
     published.with_translations.includes([:document, { organisations: :translations }]).where(id: ids)
   end

diff --git a/test/unit/app/models/edition/identifiable_test.rb b/test/unit/app/models/edition/identifiable_test.rb
@@ -43,14 +43,6 @@ class Edition::IdentifiableTest < ActiveSupport::TestCase
     assert_equal publication.document.slug, news_article.document.slug
   end
 
-  test "should allow the same slug to be used for a news article and a speech" do
-    same_title = "same-title"
-    news_article = create(:news_article, title: same_title)
-    speech = create(:speech, title: same_title)
-
-    assert_equal news_article.document.slug, speech.document.slug
-  end
-
   test "should return the edition of the correct type when matching slugs for other types exist" do
     same_title = "same-title"
     news_article = create(:published_news_article, title: same_title)