use person_address_street1 for old person_address

app/controllers/appearance_releases_controller.rb

@@ -79,7 +79,7 @@ class AppearanceReleasesController < ApplicationController
 
   def appearance_release_params
     params.require(:appearance_release).permit(:contract, :guardian_address, :guardian_first_name, :guardian_last_name, :guardian_phone, :guardian_photo, :guardian_email, :minor,
-                                               :person_address_old, :person_first_name, :person_last_name, :person_phone, :person_email, :person_photo,
+                                               :person_address_street1, :person_first_name, :person_last_name, :person_phone, :person_email, :person_photo,
                                                :applicable_medium_id, :applicable_medium_text,
                                                :territory_id, :territory_text,
                                                :term_id, :term_text, :person_date_of_birth,

app/models/appearance_release.rb

@@ -20,11 +20,11 @@ class AppearanceRelease < ApplicationRecord
               class_name: 'Address',
               mapping: [
                 %w[person_address_street1 street1],
-                  %w[person_address_street2 street2],
+                %w[person_address_street2 street2],
-                  %w[person_address_city city],
+                %w[person_address_city city],
-                  %w[person_address_state state],
+                %w[person_address_state state],
-                  %w[person_address_zip zip],
+                %w[person_address_zip zip],
-                  %w[person_address_country country]
+                %w[person_address_country country]
               ]
 
   # These validations apply to all releases
@@ -85,7 +85,6 @@ class AppearanceRelease < ApplicationRecord
   searchable_on %i[
     person_first_name
     person_last_name
-    person_address_old
     person_address_street1
     person_address_street2
     person_address_city
@@ -96,19 +95,6 @@ class AppearanceRelease < ApplicationRecord
     person_phone
   ]
 
-  def person_address
-    return self.person_address_old if self.person_address_old.present?
-
-    Address.new(
-        self.person_address_street1,
-        self.person_address_street2,
-        self.person_address_city,
-        self.person_address_state,
-        self.person_address_zip,
-        self.person_address_country
-    ).to_s(format: :full)
-  end
-
   # All releases must respond to the following messages
   def name
     person_name

app/models/sample_appearance_release.rb

@@ -8,8 +8,7 @@ class SampleAppearanceRelease < AppearanceRelease
 
   def default_attrs
     {
-      person_address_old: "Street Address, City, State Zipcode",
+      person_address_street1: "Street Address, City, State Zipcode",
-      person_address_street1: "St1",
       person_address_street2: "St2",
       person_address_city: "City",
       person_address_state: "State",

app/views/appearance_releases/_form.html.erb

@@ -13,7 +13,7 @@
     <div class="form-row">
       <%= form.email_field :person_email, wrapper_class: "col-sm-6" %>
       <%= form.date_field :person_date_of_birth, wrapper_class: "col-sm-6", placeholder: Date.current %>
-      <%= form.text_field :person_address_old, wrapper_class: "col-sm-6" %>
+      <%= form.text_field :person_address_street1, wrapper_class: "col-sm-6" %>
     </div>
 
     <div class="<%= class_string("collapse" => !appearance_release.minor?) %>" data-ujs-target="guardian-fields">

config/locales/en.yml

@@ -329,7 +329,6 @@ en:
         person_title: Title
       appearance_release:
         minor: Is the person a minor?
-        person_address_old: Address
         person_address: Address
         person_address_city: City
         person_address_country: Country

config/locales/es.yml

@@ -125,7 +125,6 @@ es:
         person_address_street2: Address (Line 2) (ES)
         minor: El firmante es un menor
         person_address: Dirección
-        person_address_old: Dirección
         person_email: Dirección de correo electrónico
         person_name: Nómbre
         person_phone: Número de teléfono

db/migrate/20200615133602_destructure_person_address_column_in_appearance_releases.rb

@@ -1,6 +1,6 @@
-class AddAddressComponentFieldsToAppearanceReleases < ActiveRecord::Migration[6.0]
+class DestructurePersonAddressColumnInAppearanceReleases < ActiveRecord::Migration[6.0]
   def change
-    add_column :appearance_releases, :person_address_street1, :string
+    rename_column :appearance_releases, :person_address, :person_address_street1
     add_column :appearance_releases, :person_address_street2, :string
     add_column :appearance_releases, :person_address_city, :string
     add_column :appearance_releases, :person_address_state, :string

db/migrate/20200615133602_rename_appearance_release_person_address_column.rb

@@ -1,5 +0,0 @@
-class RenameAppearanceReleasePersonAddressColumn < ActiveRecord::Migration[6.0]
-  def change
-    rename_column :appearance_releases, :person_address, :person_address_old
-  end
-end

spec/models/contract_template_preview_spec.rb

@@ -50,7 +50,6 @@ describe ContractTemplatePreview do
         'id' => nil,
         'person_first_name' => 'Dummy',
         'person_last_name' => 'Person',
-        'person_address_old' => nil,
         'person_address_street1' => 'Street 1',
         'person_address_street2' => 'Street 2',
         'person_address_city' => 'City',

spec/models/excel_reports/video_reports/nat_geo_legal_binder_logs/appearance_release_log_sheet_spec.rb

@@ -29,7 +29,7 @@ module ExcelReports
                                       restriction: Restriction.last,
                                       person_first_name: "John", 
                                       person_last_name: "Doe", 
-                                      person_address_old: "123 Main Street, New York, NY 10000")
+                                      person_address_street1: "123 Main Street, New York, NY 10000")
                    )
             )
             allow(sheet).to receive(:add_row)