Upstream sync

app/models/medical_release.rb

@@ -14,15 +14,37 @@ class MedicalRelease < ApplicationRecord
 
   NUMBER_OF_CUSTOM_FIELDS = 15
 
-  composed_of :person_address, 
+  composed_of :person_address,
               class_name: "Address",
-              mapping: [ 
-                %w(person_address_street1 street1), 
-                %w(person_address_street2 street2), 
-                %w(person_address_city city), 
-                %w(person_address_state state), 
-                %w(person_address_zip zip), 
-                %w(person_address_country country) 
+              mapping: [
+                %w[person_address_street1 street1],
+                %w[person_address_street2 street2],
+                %w[person_address_city city],
+                %w[person_address_state state],
+                %w[person_address_zip zip],
+                %w[person_address_country country]
+              ]
+
+  composed_of :guardian_address,
+              class_name: 'Address',
+              mapping: [
+                %w[guardian_address_street1 street1],
+                %w[guardian_address_street2 street2],
+                %w[guardian_address_city city],
+                %w[guardian_address_state state],
+                %w[guardian_address_zip zip],
+                %w[guardian_address_country country]
+              ]
+
+  composed_of :guardian_2_address,
+              class_name: 'Address',
+              mapping: [
+                %w[guardian_2_address_street1 street1],
+                %w[guardian_2_address_street2 street2],
+                %w[guardian_2_address_city city],
+                %w[guardian_2_address_state state],
+                %w[guardian_2_address_zip zip],
+                %w[guardian_2_address_country country]
               ]
 
   def self.face_photo_acceptable_content_types
@@ -32,6 +54,7 @@ class MedicalRelease < ApplicationRecord
   # These validations apply to all releases
   validates :person_first_name, :person_last_name, presence: true
   validates :person_email, email: true, allow_blank: true
+  validate :valid_answers
 
   acts_as_taggable_on :internal_tags, :tags
 
@@ -76,4 +99,15 @@ class MedicalRelease < ApplicationRecord
   def contract_file_name
     "#{project.name.parameterize}_#{contract_template.release_type}_#{(signed_at || created_at).strftime("%Y.%m.%d")}_#{release_number}_#{filename_suffix.parameterize}"
   end
+
+  private
+
+  def valid_answers
+    (1..ContractTemplate::NUMBER_OF_CUSTOM_FIELDS).each do |index|
+      if contract_template && contract_template["question_#{index}_text"].present? &&
+         public_send("question_#{index}_answer").blank?
+        errors.add("question_#{index}", I18n.t('medical_releases.custom_validation_errors.question_answer_is_required'))
+      end
+    end
+  end
 end