use guardian_address_street1 for old guardian_address

app/controllers/appearance_releases_controller.rb

@@ -78,7 +78,7 @@ class AppearanceReleasesController < ApplicationController
   end
 
   def appearance_release_params
-    params.require(:appearance_release).permit(:contract, :guardian_address_old, :guardian_first_name, :guardian_last_name, :guardian_phone, :guardian_photo, :guardian_email, :minor,
+    params.require(:appearance_release).permit(:contract, :guardian_address_street1, :guardian_first_name, :guardian_last_name, :guardian_phone, :guardian_photo, :guardian_email, :minor,
                                                :person_address, :person_first_name, :person_last_name, :person_phone, :person_email, :person_photo,
                                                :applicable_medium_id, :applicable_medium_text,
                                                :territory_id, :territory_text,

app/models/appearance_release.rb

@@ -85,19 +85,6 @@ class AppearanceRelease < ApplicationRecord
 
   searchable_on %i[person_first_name person_last_name person_address person_email person_phone]
 
-  def guardian_address
-    return self.guardian_address_old if self.guardian_address_old.present?
-
-    Address.new(
-        self.guardian_address_street1,
-        self.guardian_address_street2,
-        self.guardian_address_city,
-        self.guardian_address_state,
-        self.guardian_address_zip,
-        self.guardian_address_country
-    ).to_s(format: :full)
-  end
-
   # All releases must respond to the following messages
   def name
     person_name

app/views/appearance_releases/_form.html.erb

@@ -23,7 +23,7 @@
         <%= form.phone_field :guardian_phone, wrapper_class: "col-sm-6" %>
       </div>
       <div class="form-row">
-        <%= form.text_field :guardian_address_old, wrapper_class: "col-sm-6" %>
+        <%= form.text_field :guardian_address_street1, wrapper_class: "col-sm-6" %>
       </div>
     </div>
   <% end %>

config/locales/en.yml

@@ -336,7 +336,6 @@ en:
         person_last_name: Last name
         person_name: Name
         person_phone: Phone number
-        guardian_address_old: Guardian address
         guardian_address_city: Guardian city
         guardian_address_country: Guardian country
         guardian_address_state: Guardian state

config/locales/es.yml

@@ -116,7 +116,6 @@ es:
     label:
       appearance_release:
         guardian_address: Dirección del tutor legal
-        guardian_address_old: Dirección del tutor legal
         guardian_name: Nómbre del tutor legal
         guardian_phone: Número de teléfono del tutor legal
         minor: El firmante es un menor

db/migrate/20200616124214_destructure_guardian_address_column_in_appearance_releases.rb

@@ -1,11 +1,10 @@
-class AddGuardianAddressComponentsToAppearanceReleases < ActiveRecord::Migration[6.0]
+class DestructureGuardianAddressColumnInAppearanceReleases < ActiveRecord::Migration[6.0]
   def change
-    add_column :appearance_releases, :guardian_address_street1, :string
+    rename_column :appearance_releases, :guardian_address, :guardian_address_street1
     add_column :appearance_releases, :guardian_address_street2, :string
     add_column :appearance_releases, :guardian_address_city, :string
     add_column :appearance_releases, :guardian_address_state, :string
     add_column :appearance_releases, :guardian_address_zip, :string
     add_column :appearance_releases, :guardian_address_country, :string
-
   end
 end

db/migrate/20200616124214_rename_appearance_release_guardian_address_column.rb

@@ -1,5 +0,0 @@
-class RenameAppearanceReleaseGuardianAddressColumn < ActiveRecord::Migration[6.0]
-  def change
-    rename_column :appearance_releases, :guardian_address, :guardian_address_old
-  end
-end

spec/controllers/public/appearance_releases_controller_spec.rb

@@ -121,7 +121,6 @@ describe Public::AppearanceReleasesController do
   def minor_appearance_release_params(with_guardian_photo = true)
     minor_type = with_guardian_photo ? :minor_with_guardian_photo : :minor
     attributes_for(:appearance_release, minor_type)
-        .except(:guardian_address_old)
         .merge(signature_param, guardian_address_params)
   end
 

spec/factories/appearance_releases.rb

@@ -53,7 +53,7 @@ FactoryBot.define do
       # guardian_address_state "State"
       # guardian_address_zip "ZIP"
       # guardian_address_country "Country"
-      guardian_address_old "St1 St2 City State ZIP Country"
+      guardian_address_street1 "St1 St2 City State ZIP Country"
       guardian_photo do
         path = Rails.root.join("spec", "fixtures", "files", "pratt.jpg")
         Rack::Test::UploadedFile.new(path, "image/jpeg")

spec/models/contract_template_preview_spec.rb

@@ -54,7 +54,6 @@ describe ContractTemplatePreview do
         'person_phone' => '00 111 222 333 4444',
         'updated_at' => nil,
         'minor' => true,
-        'guardian_address_old' => nil,
         'guardian_address_street1' => 'Street 3',
         'guardian_address_street2' => 'Street 4',
         'guardian_address_city' => 'City-2',