creating postal address model and removing attribute from users

Author: lilwillifo

app/controllers/users_controller.rb

@@ -97,7 +97,7 @@ def user_params
       :github_handle, :twitter_handle, :irc_handle,
       :name, :email, :homepage, :location, :bio,
       :tech_expertise_list, :tech_interest_list,
-      :tshirt_size, :tshirt_cut, :postal_address, :timezone,
+      :tshirt_size, :tshirt_cut, :timezone,
       :country,
       :hide_email,
       :is_company, :company_name, :company_info,

app/models/postal_address.rb

@@ -0,0 +1,4 @@
+class PostalAddress < ApplicationRecord
+  belongs_to :user
+  validates_presence_of :address_line_1, :city, :postal_code, :country
+end

app/models/user.rb

@@ -65,6 +65,7 @@ def student
   has_many :applications, through: :teams
   has_many :todos, dependent: :destroy
   has_many :comments, dependent: :destroy
+  has_one :postal_address, dependent: :destroy
 
   validates :github_handle, presence: true, uniqueness: { case_sensitive: false }
   validates :homepage, format: { with: URL_PREFIX_PATTERN }, allow_blank: true
@@ -73,6 +74,7 @@ def student
   validates :name, :email, :country, :location, presence: true, unless: :github_import
 
   accepts_nested_attributes_for :roles, allow_destroy: true
+  accepts_nested_attributes_for :postal_address, allow_destroy: true
 
   before_save :normalize_location
   after_create :complete_from_github

db/migrate/20181107171037_create_postal_addresses.rb

@@ -0,0 +1,15 @@
+class CreatePostalAddresses < ActiveRecord::Migration[5.1]
+  def change
+    create_table :postal_addresses do |t|
+      t.string :address_line_1
+      t.string :address_line_2
+      t.string :city
+      t.string :state_or_province
+      t.string :postal_code
+      t.string :country
+      
+      t.references :user, foreign_key: true
+      t.timestamps
+    end
+  end
+end

db/migrate/20181107172409_remove_postal_address_from_users.rb

@@ -0,0 +1,5 @@
+class RemovePostalAddressFromUsers < ActiveRecord::Migration[5.1]
+  def change
+    remove_column :users, :postal_address, :text
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20180714153306) do
+ActiveRecord::Schema.define(version: 20181107172409) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -173,6 +173,19 @@
     t.index ["user_id"], name: "index_notes_on_user_id"
   end
 
+  create_table "postal_addresses", force: :cascade do |t|
+    t.string "address_line_1"
+    t.string "address_line_2"
+    t.string "city"
+    t.string "state_or_province"
+    t.string "postal_code"
+    t.string "country"
+    t.bigint "user_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["user_id"], name: "index_postal_addresses_on_user_id"
+  end
+
   create_table "projects", id: :serial, force: :cascade do |t|
     t.string "name", limit: 255
     t.datetime "created_at"
@@ -296,7 +309,6 @@
     t.string "twitter_handle", limit: 255
     t.string "irc_handle", limit: 255
     t.string "tshirt_size", limit: 255
-    t.text "postal_address"
     t.string "timezone", limit: 255
     t.string "interested_in", limit: 255, default: [], array: true
     t.boolean "hide_email"
@@ -339,5 +351,6 @@
     t.index ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true
   end
 
+  add_foreign_key "postal_addresses", "users"
   add_foreign_key "teams", "projects"
 end

spec/models/postal_address_spec.rb

@@ -6,9 +6,9 @@
   end
 
   describe 'validations' do
-    it { should_validate_presence_of(:address_line_1)}
-    it { should_validate_presence_of(:city)}
-    it { should_validate_presence_of(:postal_code)}
-    it { should_validate_presence_of(:country)}
+    it { is_expected.to validate_presence_of(:address_line_1)}
+    it { is_expected.to validate_presence_of(:city)}
+    it { is_expected.to validate_presence_of(:postal_code)}
+    it { is_expected.to validate_presence_of(:country)}
   end
 end