WIP

Author: lauraghiorghisor-tw

app/models/attachment_data.rb

@@ -173,16 +173,22 @@ def attachable_url
     return nil if significant_attachable.blank?
 
     if significant_attachable.is_a?(Edition)
-      attachable_in_pre_publication_state = Edition::PRE_PUBLICATION_STATES.include?(significant_attachable.state)
-      attachable_in_pre_publication_state ? significant_attachable.public_url(draft: true) : significant_attachable.public_url
+      url_for(significant_attachable)
     elsif significant_attachable.respond_to?(:parent_attachable) && significant_attachable.parent_attachable.is_a?(Edition)
-      parent_attachable_in_pre_publication_state = Edition::PRE_PUBLICATION_STATES.include?(significant_attachable.parent_attachable.state)
-      parent_attachable_in_pre_publication_state ? significant_attachable.parent_attachable.public_url(draft: true) : significant_attachable.parent_attachable.public_url
+      url_for(significant_attachable.parent_attachable)
     elsif significant_attachable.is_a?(PolicyGroup)
       significant_attachable.public_url
     end
   end
 
+  def url_for(edition)
+    if Edition::PRE_PUBLICATION_STATES.include?(edition.state)
+      edition.public_url(draft: true)
+    elsif edition.publicly_visible?
+      edition.public_url
+    end
+  end
+
   def access_limitation
     return [] unless access_limited?
 
@@ -193,7 +199,7 @@ def keep_existing_file?
     to_replace_id.present? && keep_or_replace != "replace"
   end
 
-private
+  private
 
   def filtered_attachments(include_deleted_attachables: false)
     if include_deleted_attachables

test/unit/app/models/attachment_data_test.rb

@@ -475,6 +475,7 @@ class AttachmentDataTest < ActiveSupport::TestCase
         assert_equal edition.public_url(draft: true), attachment_data.attachable_url
       end
 
+      # TODO - This is for published and withdrawn
       it "returns live url for published edition" do
         # Works because visible_to?(user) returns true because !draft
         edition = create(:published_standard_edition, :with_file_attachment)
@@ -483,6 +484,7 @@ class AttachmentDataTest < ActiveSupport::TestCase
         assert_equal edition.public_url, attachment_data.attachable_url
       end
 
+      # Cover unpublished edition?
       it "returns nil for deleted edition" do
         edition = create(:draft_standard_edition, :with_file_attachment)
         attachment_data = edition.attachments.first.attachment_data