fix copying sponsorship to work

Author: sorah

app/controllers/sponsorship_asset_files_controller.rb

@@ -38,11 +38,10 @@ def initiate_update
 
   private def set_asset_file
     @asset_file = SponsorshipAssetFile
-      .where(id: params[:id])
-      .merge(
-        SponsorshipAssetFile
-          .where(sponsorship_id: nil, id: session[:asset_file_ids] || [])
-          .or(SponsorshipAssetFile.where(sponsorship_id: [current_sponsorship&.id].compact))
+      .available_for_user(
+        params[:id],
+        session_asset_file_ids: session[:asset_file_ids],
+        available_sponsorship_ids: [current_sponsorship&.id].compact,
       )
       .first!
   end

app/controllers/sponsorships_controller.rb

@@ -41,12 +41,24 @@ def create
     return render(plain: '404', status: 404) unless @conference.verify_invite_code(params[:invite_code])
     return render(:closed, status: 403) if !@conference&.application_open? && !current_staff
 
-    @sponsorship = Sponsorship.new(sponsorship_params)
-    return render(status: 403, plain: '403') if sponsorship_params[:asset_file_id].present? && (!session[:asset_file_ids] || !session[:asset_file_ids].include?(@sponsorship.asset_file&.id))
-
-    if sponsorship_params[:asset_file_id_to_copy].present? && !@sponsorship.asset_file
-      src_asset = SponsorshipAssetFile.where(sponsorship_id: current_available_sponsorships.map(&:id), id: sponsorship_params[:asset_file_id_to_copy]).first
-      @sponsorship.asset_file = src_asset.copy_to!(@conference)
+    @sponsorship = Sponsorship.new(sponsorship_params.except(:asset_file_id))
+
+    if sponsorship_params[:asset_file_id].present? 
+      asset_src = SponsorshipAssetFile
+        .available_for_user(
+          sponsorship_params[:asset_file_id],
+          session_asset_file_ids: session[:asset_file_ids],
+          available_sponsorship_ids: current_available_sponsorships&.pluck(:id) || [],
+        )
+        .first
+      return render(plain: '404 asset not found', status: 404) unless asset_src
+      if asset_src.sponsorship_id.present?
+        new_asset = asset_src.copy_to!(@conference)
+        (session[:asset_file_ids] ||= []) << new_asset.id
+        @sponsorship.asset_file = new_asset
+      else
+        @sponsorship.asset_file = asset_src
+      end
     end
 
     @sponsorship.locale = I18n.locale
@@ -126,14 +138,6 @@ def copied_sponsorship_attributes
     return {} unless session[:sponsorship_ids].include?(params[:sponsorship_id_to_copy].to_i)
     src = Sponsorship.find_by(id: params[:sponsorship_id_to_copy])
     return {} unless src
-    {
-      name: src.name,
-      url: src.url,
-      profile: src.profile,
-      asset_file_id_to_copy: src.asset_file_id,
-      contact_attributes: src.contact.attributes.except('id', 'kind'),
-      alternate_billing_contact_attributes: src.alternate_billing_contact&.attributes&.except('id', 'kind')&.merge(_keep: '1'),
-      billing_request_attributes: src.billing_request&.attributes&.except('id', 'kind'),
-    }.compact
+    src.attributes_for_copy
   end
 end

app/models/sponsorship.rb

@@ -25,13 +25,6 @@ def asset_file_id=(other)
     self.asset_file = SponsorshipAssetFile.find_by(id: other.to_i)
   end
 
-  # XXX: this can only hold a value, because authorization is mandatory in a controller
-  def asset_file_id_to_copy; @asset_file_id_to_copy; end
-  def asset_file_id_to_copy=(id)
-    raise "asset_file_id_to_copy= cannot be used for a persisted record" if id && self.persisted?
-    @asset_file_id_to_copy = id
-  end
-
   has_many :staff_notes, class_name: 'SponsorshipStaffNote', dependent: :destroy
 
   has_one :exhibition
@@ -211,6 +204,18 @@ def to_h_for_history
     end
   end
 
+  def attributes_for_copy
+    {
+      name: self.name,
+      url: self.url,
+      profile: self.profile,
+      asset_file_id: self.asset_file_id,
+      contact_attributes: self.contact.attributes.except('id', 'kind'),
+      alternate_billing_contact_attributes: self.alternate_billing_contact&.attributes&.except('id', 'kind')&.merge(_keep: '1'),
+      billing_request_attributes: self.billing_request&.attributes&.except('id', 'kind'),
+    }.compact
+  end
+
   def total_number_of_attendees
     if active?
       (plan&.number_of_guests || 0) + (number_of_additional_attendees || 0)

app/models/sponsorship_asset_file.rb

@@ -8,6 +8,15 @@ class SponsorshipAssetFile < ApplicationRecord
   ROLE = ENV['S3_FILES_ROLE']
 
   belongs_to :sponsorship, optional: true
+
+  scope :available_for_user, ->(id, session_asset_file_ids: [], available_sponsorship_ids: []) do
+    where(id:)
+      .merge(
+        SponsorshipAssetFile.where(sponsorship_id: available_sponsorship_ids)
+          .or(SponsorshipAssetFile.where(sponsorship_id: nil, id: session_asset_file_ids || []))
+      )
+  end
+
   validates :handle, presence: true
 
   validate :validate_ownership_not_changed

app/views/sponsorships/_form.html.haml

@@ -201,11 +201,16 @@
 
     .form-group.sponsorships_form_asset_file{data: {session_endpoint: sponsorship.asset_file&.persisted? ? initiate_update_user_conference_sponsorship_asset_file_path(conference, sponsorship.asset_file) : user_conference_sponsorship_asset_files_path, session_endpoint_method: 'POST'}}
       = form.hidden_field :asset_file_id
-      = form.hidden_field :asset_file_id_to_copy unless sponsorship.persisted?
       .sponsorships_form_asset_file_form (Loading)
 
-    - if sponsorship.persisted? && sponsorship.asset_file
-      %small.form-text= link_to t('.download_logo'), user_conference_sponsorship_asset_file_path(conference, sponsorship.asset_file)
+    - if sponsorship.asset_file
+      :ruby
+        asset_file_url = user_conference_sponsorship_asset_file_path(conference, sponsorship.asset_file)
+        unless sponsorship.persisted? # possibly copying from another sponsorship
+          asset_file = SponsorshipAssetFile.includes(:sponsorship).find(sponsorship.asset_file_id)
+          asset_file_url = user_conference_sponsorship_asset_file_path(asset_file.sponsorship.conference, asset_file)
+        end
+      %small.form-text= link_to t('.download_logo'), asset_file_url
 
     %div.py-3.sponsorships_form_asset_file_form__warning.d-none{data: {warning_kind: 'zip_asset'}}
       .card