Revert "Override old "documents" fields with new "attachments" fields"

alphagov · Mar 6, 2020 · af063d9 · af063d9
1 parent 8526c5f
commit af063d9
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 82 deletions.
diff --git a/app/presenters/consultation_presenter.rb b/app/presenters/consultation_presenter.rb
@@ -5,7 +5,6 @@ class ConsultationPresenter < ContentItemPresenter
   include ContentItem::Political
   include ContentItem::Shareable
   include ContentItem::TitleAndContext
-  include ContentItem::FeaturedAttachmentsMigration
 
   def opening_date_time
     content_item["details"]["opening_date"]
@@ -136,23 +135,14 @@ def ways_to_respond
   end
 
   def final_outcome_documents_list
-    @final_outcome_documents_list ||= choose_field(
-      new_field_name: "final_outcome_attachments",
-      old_field_name: "final_outcome_documents",
-    )
+    content_item["details"]["final_outcome_documents"] || []
   end
 
   def public_feedback_documents_list
-    @public_feedback_documents_list ||= choose_field(
-      new_field_name: "public_feedback_attachments",
-      old_field_name: "public_feedback_documents",
-    )
+    content_item["details"]["public_feedback_documents"] || []
   end
 
   def documents_list
-    @documents_list ||= choose_field(
-      new_field_name: "featured_attachments",
-      old_field_name: "documents",
-    )
+    content_item["details"]["documents"] || []
   end
 end
diff --git a/app/presenters/content_item/featured_attachments_migration.rb b/app/presenters/content_item/featured_attachments_migration.rb
diff --git a/app/presenters/publication_presenter.rb b/app/presenters/publication_presenter.rb
@@ -3,7 +3,6 @@ class PublicationPresenter < ContentItemPresenter
   include ContentItem::NationalApplicability
   include ContentItem::NationalStatisticsLogo
   include ContentItem::Political
-  include ContentItem::FeaturedAttachmentsMigration
 
   def details
     content_item["details"]["body"]
@@ -28,9 +27,6 @@ def dataset?
 private
 
   def documents_list
-    @documents_list ||= choose_field(
-      new_field_name: "featured_attachments",
-      old_field_name: "documents",
-    )
+    content_item["details"]["documents"]
   end
 end
diff --git a/test/presenters/content_item/featured_attachments_migration.rb b/test/presenters/content_item/featured_attachments_migration.rb