Store locale on DIY Intake and use in generated link

Co-authored-by: Ben Golder <bgolder@codeforamerica.org>

app/controllers/diy/personal_info_controller.rb

@@ -22,6 +22,7 @@ def form_params
       super.merge(
         source: current_diy_intake.source || source,
         referrer: current_diy_intake.referrer || referrer,
+        locale: I18n.locale,
       )
     end
   end

app/controllers/questions/already_filed_controller.rb

@@ -17,7 +17,7 @@ def form_params
       super.merge(
         source: current_intake.source || source,
         referrer: current_intake.referrer || referrer,
-        locale: current_intake.locale || I18n.locale,
+        locale: I18n.locale,
         )
     end
 

app/forms/diy_personal_info_form.rb

@@ -1,5 +1,5 @@
 class DiyPersonalInfoForm < DiyForm
-  set_attributes_for :diy_intake, :state_of_residence, :preferred_name, :source, :referrer
+  set_attributes_for :diy_intake, :state_of_residence, :preferred_name, :source, :referrer, :locale
 
   validates :state_of_residence, inclusion: { in: States.keys, message: I18n.t("forms.validators.state_of_residence_inclusion") }
   validates :preferred_name, presence: { message: I18n.t("forms.validators.preferred_name_presence") }

app/models/diy_intake.rb

@@ -4,6 +4,7 @@
 #
 #  id                 :bigint           not null, primary key
 #  email_address      :string
+#  locale             :string
 #  preferred_name     :string
 #  referrer           :string
 #  source             :string
@@ -42,7 +43,7 @@ def issue_token
   end
 
   def start_filing_url
-    Rails.application.routes.url_helpers.diy_start_filing_url(:token => token)
+    Rails.application.routes.url_helpers.diy_start_filing_url(token: token, locale: locale)
   end
 
   def duplicate_diy_intakes

db/migrate/20200610212912_add_locale_to_diy_intakes.rb

@@ -0,0 +1,5 @@
+class AddLocaleToDiyIntakes < ActiveRecord::Migration[6.0]
+  def change
+    add_column :diy_intakes, :locale, :string
+  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: 2020_06_10_203523) do
+ActiveRecord::Schema.define(version: 2020_06_10_212912) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -72,6 +72,7 @@
   create_table "diy_intakes", force: :cascade do |t|
     t.datetime "created_at", precision: 6, null: false
     t.string "email_address"
+    t.string "locale"
     t.string "preferred_name"
     t.string "referrer"
     t.bigint "requester_id"

spec/controllers/diy/personal_info_controller_spec.rb

@@ -28,8 +28,30 @@
         expect(diy_intake.state_of_residence).to eq "CO"
         expect(diy_intake.preferred_name).to eq "Shep"
         expect(diy_intake.source).to eq "source_from_session"
+        expect(diy_intake.locale).to eq "en"
         expect(diy_intake.referrer).to eq "referrer_from_session"
       end
     end
+
+    context "with different locale" do
+      let(:params) do
+        {
+          diy_personal_info_form: {
+            state_of_residence: "CO",
+            preferred_name: "Shep"
+          },
+          locale: "es"
+        }
+      end
+
+      it "saves the locale on the intake" do
+        expect {
+          post :update, params: params
+        }.to change(DiyIntake, :count).by(1)
+
+        diy_intake = DiyIntake.last
+        expect(diy_intake.locale).to eq "es"
+      end
+    end
   end
 end

spec/factories/diy_intakes.rb

@@ -4,6 +4,7 @@
 #
 #  id                 :bigint           not null, primary key
 #  email_address      :string
+#  locale             :string
 #  preferred_name     :string
 #  referrer           :string
 #  source             :string

spec/models/diy_intake_spec.rb

@@ -4,6 +4,7 @@
 #
 #  id                 :bigint           not null, primary key
 #  email_address      :string
+#  locale             :string
 #  preferred_name     :string
 #  referrer           :string
 #  source             :string

spec/services/zendesk_diy_intake_service_spec.rb

@@ -13,6 +13,7 @@
       email_address: email_address,
       preferred_name: preferred_name,
       state_of_residence: state_of_residence,
+      locale: :en
     )
   end
   let(:service) { described_class.new(diy_intake) }
@@ -55,7 +56,6 @@
 
     before do
       diy_intake.requester_id = requester_id
-      I18n.locale = :en
     end
 
     it "calls create_ticket with the right arguments and saves the ticket_id" do