Rename primary email to verified

Author: MEspositoE14s

dpc-portal/app/controllers/login_dot_gov_controller.rb

@@ -87,9 +87,9 @@ def update_email(csp_user, new_emails, verified_email)
       add_or_activate_new_email(csp_user, new_emails, existing_emails)
       deactivate_old_email(new_emails, existing_emails)
 
-      # Set their primary email, which should now exist in the user_emails table
+      # Set their verified email, which should now exist in the user_emails table
       verified_email = csp_user.user_emails.find_by(email: verified_email)
-      verified_email.update(primary: true) if verified_email && !verified_email.primary?
+      verified_email.update(verified: true) if verified_email && !verified_email.verified?
     end
   end
 

dpc-portal/app/models/user_email.rb

@@ -5,16 +5,16 @@ class UserEmail < ApplicationRecord
   belongs_to :csp_user
   has_one :user, through: :csp_users
 
-  # If we update this email to primary, make sure the others aren't.
-  before_save :ensure_only_one_primary, if: -> { primary? && primary_changed? }
+  # If we update this email to verified, make sure the others aren't.
+  before_save :ensure_only_one_verified, if: -> { verified? && verified_changed? }
 
   private
 
-  # Sets all of the user's other emails to not primary.
-  def ensure_only_one_primary
+  # Sets all of the user's other emails to not verified.
+  def ensure_only_one_verified
     UserEmail.where(csp_user_id: csp_user_id)
-             .where(primary: true)
+             .where(verified: true)
              .where.not(id: id)
-             .update_all(primary: false)
+             .update_all(verified: false)
   end
 end

dpc-portal/db/migrate/20260527181236_add_primary_to_user_emails.rb

@@ -0,0 +1,11 @@
+class AddVerifiedToUserEmails < ActiveRecord::Migration[8.0]
+  def change
+    add_column :user_emails, :verified, :boolean, default: false, null: false
+
+    # Make sure each csp_user can only have one verified email.
+    add_index :user_emails, :csp_user_id, 
+              unique: true, 
+              where: '"verified" = true', 
+              name: 'index_unique_verified_email_per_csp_user'
+  end
+end

dpc-portal/db/migrate/20260527181236_add_verified_to_user_emails.rb

@@ -252,9 +252,9 @@
     t.datetime "reactivated_at"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.boolean "primary", default: false, null: false
+    t.boolean "verified", default: false, null: false
     t.index ["csp_user_id", "email"], name: "index_user_emails_on_csp_user_id_and_email", unique: true
-    t.index ["csp_user_id"], name: "index_unique_primary_email_per_csp_user", unique: true, where: "(\"primary\" = true)"
+    t.index ["csp_user_id"], name: "index_unique_verified_email_per_csp_user", unique: true, where: "(verified = true)"
     t.index ["csp_user_id"], name: "index_user_emails_on_csp_user_id"
   end
 

dpc-portal/db/schema.rb

@@ -11,34 +11,34 @@
     expect(user_email.csp_user).to eq csp_user
   end
 
-  it 'ensures that creating a new primary email unsets others' do
+  it 'ensures that creating a new verified email unsets others' do
     user = create(:user)
     csp = create(:csp)
     csp_user = create(:csp_user, user:, csp:)
 
-    email_old_primary = create(:user_email, csp_user:, primary: true, email: 'old@email.com')
-    email_new_primary = create(:user_email, csp_user:, primary: true, email: 'new@email.com')
+    email_old_verified = create(:user_email, csp_user:, verified: true, email: 'old@email.com')
+    email_new_verified = create(:user_email, csp_user:, verified: true, email: 'new@email.com')
 
-    expect(email_old_primary.reload.primary).to eq false
-    expect(email_new_primary.reload.primary).to eq true
+    expect(email_old_verified.reload.verified).to eq false
+    expect(email_new_verified.reload.verified).to eq true
   end
 
-  it 'ensures that setting an email to primary unsets others' do
+  it 'ensures that setting an email to verified unsets others' do
     user = create(:user)
     csp = create(:csp)
     csp_user = create(:csp_user, user:, csp:)
 
-    email_old_primary = create(:user_email, csp_user:, primary: true, email: 'old@email.com')
-    email_new_primary = create(:user_email, csp_user:, primary: false, email: 'new@email.com')
-    expect(email_old_primary.primary).to eq true
-    expect(email_new_primary.primary).to eq false
+    email_old_verified = create(:user_email, csp_user:, verified: true, email: 'old@email.com')
+    email_new_verified = create(:user_email, csp_user:, verified: false, email: 'new@email.com')
+    expect(email_old_verified.verified).to eq true
+    expect(email_new_verified.verified).to eq false
 
-    # Should set email1 to not primary
-    email_new_primary.update!(primary: true)
-    email_old_primary.reload
-    email_new_primary.reload
+    # Should set email1 to not verified
+    email_new_verified.update!(verified: true)
+    email_old_verified.reload
+    email_new_verified.reload
 
-    expect(email_old_primary.primary).to eq false
-    expect(email_new_primary.primary).to eq true
+    expect(email_old_verified.verified).to eq false
+    expect(email_new_verified.verified).to eq true
   end
 end

dpc-portal/spec/models/user_email_spec.rb

@@ -204,8 +204,8 @@
         emails = UserEmail.last(2).pluck(:email)
         expect(emails).to match_array(%w[email1@example.com email2@example.com])
         expect(UserEmail.pluck(:active)).to all(be true)
-        expect(UserEmail.find(&:primary?).email).to eq 'email1@example.com'
-        expect(UserEmail.count(&:primary?)).to eq 1
+        expect(UserEmail.find(&:verified?).email).to eq 'email1@example.com'
+        expect(UserEmail.count(&:verified?)).to eq 1
       end
     end
 
@@ -267,7 +267,7 @@
         expect(email.active).to eq true
         expect(email.deactivated_at).to be_nil
         expect(email.reactivated_at).to_not be_nil
-        expect(email.primary).to eq true
+        expect(email.verified).to eq true
       end
     end
   end