From 039ac2e8560d55e6a7370bc738a083f5c4047e53 Mon Sep 17 00:00:00 2001
From: Molly Struve <mollylbs@gmail.com>
Date: Thu, 5 Mar 2020 13:41:09 -0500
Subject: [PATCH] Remove Shipping Fields from Users (#6477) [deploy]

---
 app/labor/mailchimp_bot.rb                         |  5 +----
 app/models/user.rb                                 |  3 ---
 .../20200304220534_remove_user_shipping_fields.rb  | 14 ++++++++++++++
 db/schema.rb                                       | 10 +---------
 spec/labor/mailchimp_bot_spec.rb                   |  5 +----
 5 files changed, 17 insertions(+), 20 deletions(-)
 create mode 100644 db/migrate/20200304220534_remove_user_shipping_fields.rb

diff --git a/app/labor/mailchimp_bot.rb b/app/labor/mailchimp_bot.rb
index 2307389a9..d3389fe03 100644
--- a/app/labor/mailchimp_bot.rb
+++ b/app/labor/mailchimp_bot.rb
@@ -32,10 +32,7 @@ class MailchimpBot
             ARTICLES: user.articles.size,
             COMMENTS: user.comments.size,
             ONBOARD_PK: user.onboarding_package_requested.to_s,
-            EXPERIENCE: user.experience_level || 666,
-            COUNTRY: user.shipping_country.to_s,
-            STATE: user.shipping_state.to_s,
-            POSTAL_ZIP: user.shipping_postal_code.to_s
+            EXPERIENCE: user.experience_level || 666
           }
         },
       )
diff --git a/app/models/user.rb b/app/models/user.rb
index 22e24ce06..22ffe3291 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -138,9 +138,6 @@ class User < ApplicationRecord
   validates :config_navbar,
             inclusion: { in: %w[default static],
                          message: "%<value>s is not a valid navbar value" }
-  validates :shipping_country,
-            length: { in: 2..2 },
-            allow_blank: true
   validates :website_url, :employer_name, :employer_url,
             length: { maximum: 100 }
   validates :employment_title, :education, :location,
diff --git a/db/migrate/20200304220534_remove_user_shipping_fields.rb b/db/migrate/20200304220534_remove_user_shipping_fields.rb
new file mode 100644
index 000000000..bbfb14d64
--- /dev/null
+++ b/db/migrate/20200304220534_remove_user_shipping_fields.rb
@@ -0,0 +1,14 @@
+class RemoveUserShippingFields < ActiveRecord::Migration[5.2]
+  def change
+    safety_assured {
+      remove_column :users, :shipping_name, :string
+      remove_column :users, :shipping_company, :string
+      remove_column :users, :shipping_address, :string
+      remove_column :users, :shipping_address_line_2, :string
+      remove_column :users, :shipping_city, :string
+      remove_column :users, :shipping_state, :string
+      remove_column :users, :shipping_country, :string
+      remove_column :users, :shipping_postal_code, :string
+    }
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index c910bb949..c4ac47d4c 100644
--- a/db/schema.rb
+++ b/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: 2020_03_04_164719) do
+ActiveRecord::Schema.define(version: 2020_03_04_220534) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -1223,14 +1223,6 @@ ActiveRecord::Schema.define(version: 2020_03_04_164719) do
     t.boolean "saw_onboarding", default: true
     t.integer "score", default: 0
     t.string "secret"
-    t.string "shipping_address"
-    t.string "shipping_address_line_2"
-    t.string "shipping_city"
-    t.string "shipping_company"
-    t.string "shipping_country"
-    t.string "shipping_name"
-    t.string "shipping_postal_code"
-    t.string "shipping_state"
     t.boolean "shipping_validated", default: false
     t.datetime "shipping_validated_at"
     t.string "shirt_gender"
diff --git a/spec/labor/mailchimp_bot_spec.rb b/spec/labor/mailchimp_bot_spec.rb
index dd2206617..bb3ca6971 100644
--- a/spec/labor/mailchimp_bot_spec.rb
+++ b/spec/labor/mailchimp_bot_spec.rb
@@ -47,10 +47,7 @@ RSpec.describe MailchimpBot, type: :labor do
           ARTICLES: user.articles.size,
           COMMENTS: user.comments.size,
           ONBOARD_PK: user.onboarding_package_requested.to_s,
-          EXPERIENCE: user.experience_level || 666,
-          COUNTRY: user.shipping_country.to_s,
-          STATE: user.shipping_state.to_s,
-          POSTAL_ZIP: user.shipping_postal_code.to_s
+          EXPERIENCE: user.experience_level || 666
         }
       }
     }