Upstream sync

app/models/appearance_release.rb

@@ -12,9 +12,7 @@ class AppearanceRelease < ApplicationRecord
   include Taggable
   include PersonName
   include GuardianPhotoable
-  include SecondGuardianPhotoable
   include GuardianName
-  include SecondGuardianName
 
   has_one_attached :person_photo
 
@@ -40,17 +38,6 @@ class AppearanceRelease < ApplicationRecord
                 %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]
-              ]
-
 
   # These validations apply to all releases
   validates :person_email, email: true, allow_blank: true
@@ -145,10 +132,6 @@ class AppearanceRelease < ApplicationRecord
     true
   end
 
-  def second_guardian_present?
-    self.guardian_2_first_name.present?
-  end
-
   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

app/models/concerns/second_guardian_name.rb

@@ -1,20 +0,0 @@
-module SecondGuardianName
-  extend ActiveSupport::Concern
-  
-  included do
-    def guardian_2_name
-      "#{guardian_2_first_name} #{guardian_2_last_name}".titleize
-    end
-
-    def guardian_2_name=(value)
-      if value.include?(' ')
-        split = value.split(" ", 2)
-        self.guardian_2_first_name = split.first
-        self.guardian_2_last_name = split.last
-      else
-        self.guardian_2_first_name = value
-        self.guardian_2_last_name = "(Not Given)"
-      end
-    end
-  end
-end

app/models/concerns/second_guardian_photoable.rb

@@ -1,9 +0,0 @@
-module SecondGuardianPhotoable
-  extend ActiveSupport::Concern
-
-  included do
-    has_one_attached :guardian_2_photo
-
-    validates :guardian_2_photo, content_type: ["image/png", "image/jpeg"]
-  end
-end

app/models/medical_release.rb

@@ -8,6 +8,8 @@ class MedicalRelease < ApplicationRecord
   include Syncable
   include PersonName
 
+  NUMBER_OF_CUSTOM_FIELDS = 15
+
   composed_of :person_address, 
               class_name: "Address",
               mapping: [