Customized version of funder template not being used

[briri]

Please complete the following fields as applicable:

Expected behaviour:
The user is given the customized version of the funder template (if one is available for the research org they select)

Actual behaviour:
The user is sometimes given the base funder templates.

Steps to reproduce:
This may be specific to the deployment and its Ruby/Rails versions.

• As an org admin, login and customize a funder template
• Publish your customization
• Create a new plan (select the customizing org as the research org and then select the funder)

[briri]

The issue is with the way we were gathering available templates. If a customization was found for a particular template we were replacing it within the same array we are iterating over.

# Load the funder's template(s)
templates = Template.valid.publicly_visible.where(published: true, org_id: funder_id).to_a

unless org_id.blank?
  # Swap out any organisational cusotmizations of a funder template
  templates.each do |tmplt|
    customization = Template.valid.find_by(published: true, org_id: org_id, customization_of: tmplt.dmptemplate_id)
    if customization.present? && tmplt.created_at < customization.created_at
      templates.delete(tmplt)
      templates << customization
    end
  end
end

In the scenario we discovered, templates was being loaded with 2 published templates initially. The 1st one is customized, so we remove that one (position 0) from the array and add the customization onto the end (position 1 in this case because we removed the original 0). The iterator then moves on to check if the customization has a customization and finds that it does not. So the original template in position 1 gets skipped.

[sjDCC]

All working fine on our end