[User] Store first and last name separately in DB

app/controllers/logins_controller.rb

@@ -157,7 +157,7 @@ def complete
     if @login.complete? && @login.user_session.present?
       if @referral_link.present?
         redirect_to referral_link_path(@referral_link)
-      elsif (@user.full_name.blank? || @user.phone_number.blank?) && !@login.for_application?
+      elsif ((@user.first_name.blank? && @user.full_name.blank?) || @user.phone_number.blank?) && !@login.for_application?
         redirect_to edit_user_path(@user.slug, return_to: @login.return_to)
       elsif @login.authenticated_with_backup_code && @user.backup_codes.active.empty?
         redirect_to security_user_path(@user), flash: { warning: "You've just used your last backup code, and we recommend generating more." }

app/controllers/stripe_cards_controller.rb

@@ -188,7 +188,7 @@ def suggested(field)
     when :phone_number
       current_user.phone_number
     when :name
-      current_user.full_name
+      current_user.name
     when :line1
       current_user&.stripe_cardholder&.stripe_billing_address_line1 ||
         ecr&.last&.shipping_address_street_one

app/controllers/users_controller.rb

@@ -259,6 +259,11 @@ def update
     authorize @user
 
     @user.assign_attributes(user_params)
+    if params[:user][:full_name].present? && params[:user][:first_name].blank? && params[:user][:last_name].blank?
+      parsed = UserService::ParseName.new(full_name: params[:user][:full_name]).run
+      @user.first_name = parsed.first_name
+      @user.last_name = parsed.last_name
+    end
 
     if @user.use_two_factor_authentication_changed?
       return unless enforce_sudo_mode # rubocop:disable Style/SoleNestedConditional
@@ -315,7 +320,7 @@ def update
     if @user.save
       confetti! if !@user.seasonal_themes_enabled_before_last_save && @user.seasonal_themes_enabled? # confetti if the user enables seasonal themes
 
-      if @user.full_name_before_last_save.blank?
+      if @user.first_name_before_last_save.blank? && @user.full_name_before_last_save.blank?
         flash[:success] = "Profile created!"
         redirect_to(return_to || root_path)
       else
@@ -422,6 +427,8 @@ def set_onboarding
   def user_params
     attributes = [
       # account
+      :first_name,
+      :last_name,
       :full_name,
       :preferred_name,
       :phone_number,

app/helpers/stripe_cards_helper.rb

@@ -30,7 +30,7 @@ def suggested(field)
     when :phone_number
       current_user.phone_number
     when :name
-      current_user.full_name
+      current_user.name
     when :line1
       current_user&.stripe_cards&.physical&.last&.stripe_shipping_address_line1 ||
         current_user&.stripe_cardholder&.stripe_billing_address_line1 ||

app/models/user.rb

@@ -12,8 +12,10 @@
 #  comment_notifications         :integer          default("all_threads"), not null
 #  creation_method               :integer
 #  email                         :text             not null
+#  first_name                    :string
 #  full_name                     :string
 #  joined_as_teenager            :boolean
+#  last_name                     :string
 #  locked_at                     :datetime
 #  monthly_donation_summary      :boolean          default(TRUE)
 #  monthly_follower_summary      :boolean          default(TRUE)
@@ -44,6 +46,12 @@
 #  index_users_on_slug        (slug) UNIQUE
 #
 class User < ApplicationRecord
+  # Character regex for name validation (supports international characters)
+  NAME_CHARACTERS_REGEX = /\A[a-zA-ZàáâäãåąčćęèéêëėįìíîïłńòóôöõøùúûüųūÿýżźñçčšžÀÁÂÄÃÅĄĆČĖĘÈÉÊËÌÍÎÏĮŁŃÒÓÔÖÕØÙÚÛÜŲŪŸÝŻŹÑßÇŒÆČŠŽ∂ð.,' -]+\z/
+
+  # Full name format regex (must have first and last name - at least two words)
+  FULL_NAME_FORMAT_REGEX = /\A[a-zA-ZàáâäãåąčćęèéêëėįìíîïłńòóôöõøùúûüųūÿýżźñçčšžÀÁÂÄÃÅĄĆČĖĘÈÉÊËÌÍÎÏĮŁŃÒÓÔÖÕØÙÚÛÜŲŪŸÝŻŹÑßÇŒÆČŠŽ∂ð.,'-]+ [a-zA-ZàáâäãåąčćęèéêëėįìíîïłńòóôöõøùúûüųūÿýżźñçčšžÀÁÂÄÃÅĄĆČĖĘÈÉÊËÌÍÎÏĮŁŃÒÓÔÖÕØÙÚÛÜŲŪŸÝŻŹÑßÇŒÆČŠŽ∂ð.,' -]+\z/
+
   has_paper_trail skip: [:birthday] # ciphertext columns will still be tracked
 
   include Hashid::Rails
@@ -64,7 +72,7 @@ class User < ApplicationRecord
   tracked owner: proc{ |controller, record| record }, recipient: proc { |controller, record| record }, only: [:create, :update]
 
   include PgSearch::Model
-  pg_search_scope :search_name, against: [:id, :full_name, :email, :phone_number], associated_against: { email_updates: :original }, using: { tsearch: { prefix: true, dictionary: "english" } }
+  pg_search_scope :search_name, against: [:id, :first_name, :last_name, :full_name, :email, :phone_number], associated_against: { email_updates: :original }, using: { tsearch: { prefix: true, dictionary: "english" } }
 
   friendly_id :slug_candidates, use: :slugged
   scope :admin, -> { where(access_level: [:admin, :superadmin]) }
@@ -173,6 +181,7 @@ class User < ApplicationRecord
   before_update(if: :will_save_change_to_birthday?) { self.joined_as_teenager = was_teenager_on_join? }
 
   before_create :format_number
+  before_save :sync_full_name_from_split_names, if: -> { first_name_changed? || last_name_changed? }
   before_save :on_phone_number_update
   validate :second_factor_present_for_2fa
 
@@ -190,10 +199,24 @@ class User < ApplicationRecord
   validates_presence_of :birthday, if: -> { birthday_ciphertext_in_database.present? }
 
   validates :full_name, format: {
-    with: /\A[a-zA-ZàáâäãåąčćęèéêëėįìíîïłńòóôöõøùúûüųūÿýżźñçčšžÀÁÂÄÃÅĄĆČĖĘÈÉÊËÌÍÎÏĮŁŃÒÓÔÖÕØÙÚÛÜŲŪŸÝŻŹÑßÇŒÆČŠŽ∂ð.,'-]+ [a-zA-ZàáâäãåąčćęèéêëėįìíîïłńòóôöõøùúûüųūÿýżźñçčšžÀÁÂÄÃÅĄĆČĖĘÈÉÊËÌÍÎÏĮŁŃÒÓÔÖÕØÙÚÛÜŲŪŸÝŻŹÑßÇŒÆČŠŽ∂ð.,' -]+\z/,
+    with: FULL_NAME_FORMAT_REGEX,
     message: "must contain your first and last name, and can't contain special characters.", allow_blank: true,
+  }, unless: -> { first_name_in_database.present? || last_name_in_database.present? }
+
+  validates :first_name, presence: true, if: -> { first_name_in_database.present? || last_name_in_database.present? }
+  validates :first_name, format: {
+    with: NAME_CHARACTERS_REGEX,
+    message: "must contain only letters and can't contain special characters.", allow_blank: true,
   }
 
+  validates :last_name, format: {
+    with: NAME_CHARACTERS_REGEX,
+    message: "must contain only letters and can't contain special characters.", allow_blank: true,
+  }
+
+  normalizes :first_name, with: ->(name) { name.strip.presence }
+  normalizes :last_name, with: ->(name) { name.strip.presence }
+
   validates :email, uniqueness: true, presence: true
   validates_email_format_of :email
   normalizes :email, with: ->(email) { email.strip.downcase }
@@ -288,31 +311,51 @@ def remove_admin!
   end
 
   def first_name(legal: false)
-    @first_name ||= (namae(legal:)&.given || namae(legal:)&.particle)&.split(" ")&.first
+    # Return the stored first_name as-is. The database stores the complete first name
+    # (which may include particles like "von" from Namae parsing).
+    # For legal names, fall back to parsing full_name if first_name is not set.
+    read_attribute(:first_name) || (legal ? (namae(legal:)&.given || namae(legal:)&.particle)&.join(" ") : nil)
   end
 
   def last_name(legal: false)
-    @last_name ||= namae(legal:)&.family&.split(" ")&.last
+    # Return the stored last_name as-is. The database stores the complete last name
+    # (which may include suffixes like "Jr." from Namae parsing).
+    # For legal names, fall back to parsing full_name if last_name is not set.
+    read_attribute(:last_name) || (legal ? namae(legal:)&.family : nil)
+  end
+
+  def reconstructed_full_name
+    parts = [self[:first_name], self[:last_name]].compact_blank
+    parts.empty? ? nil : parts.join(" ")
   end
 
   def initial_name
     @initial_name ||= if name.strip.split(" ").count == 1
                         name
                       else
-                        "#{(first_name || last_name)[0..20]} #{(last_name || first_name)[0, 1]}"
+                        first = (self[:first_name]&.split(" ")&.first || self[:last_name]&.split(" ")&.first || name)[0..20]
+                        last_source = self[:last_name] || self[:first_name] || ""
+                        last = (last_source.split(" ").first || "")[0, 1]
+                        last.blank? ? first : "#{first} #{last}"
                       end
   end
 
   def safe_name
-    # stripe requires names to be 24 chars or less, and must include a last name
+    # stripe requires cardholder names to be 24 chars or less
     return name unless name.length > 24
-    return full_name unless full_name.length > 24
+
+    reconstructed = reconstructed_full_name
+    return reconstructed if reconstructed && reconstructed.length <= 24
+
+    # fall back to the legacy full_name which may contain a suffix that was
+    # stripped during migration but is still shorter than the preferred name
+    return full_name if full_name && full_name.length <= 24
 
     initial_name
   end
 
   def name
-    preferred_name.presence || full_name.presence || email_handle
+    preferred_name.presence || reconstructed_full_name || full_name.presence || email_handle
   end
 
   def possessive_name
@@ -377,11 +420,11 @@ def unlock!
 
   def onboarding?
     # in_database to prevent a blank name update attempt from triggering onboarding.
-    full_name_in_database.blank?
+    first_name_in_database.blank? && full_name_in_database.blank?
   end
 
   def was_onboarding?
-    full_name_before_last_save.blank? && full_name_previously_changed?
+    first_name_before_last_save.blank? && full_name_before_last_save.blank? && (first_name_previously_changed? || full_name_previously_changed?)
   end
 
   def active_mailbox_address
@@ -625,6 +668,10 @@ def to_combobox_display
 
   private
 
+  def sync_full_name_from_split_names
+    self.full_name = reconstructed_full_name if reconstructed_full_name.present?
+  end
+
   def accessible_events(roles:)
     event_ids = User::PermissionsOverview.new(user: self).role_by_event_id.select { |_, role| role.in?(roles) }.keys
     Event.where(id: event_ids)

app/services/user_service/parse_name.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require "namae"
+
+module UserService
+  # Parses a full name into first and last name components using the Namae gem.
+  # Handles complex names with particles (von, de, etc.) and suffixes (Jr., Sr., III, etc.)
+  class ParseName
+    attr_reader :given_name, :particle, :family_name, :suffix
+
+    def initialize(full_name:)
+      @full_name = full_name
+      @given_name = nil
+      @particle = nil
+      @family_name = nil
+      @suffix = nil
+    end
+
+    # Parse the full name and extract components
+    def run
+      return self if @full_name.blank?
+
+      parsed = Namae.parse(@full_name).first
+      return self if parsed.nil?
+
+      @given_name = parsed.given
+      @particle = parsed.particle
+      @family_name = parsed.family
+      @suffix = parsed.suffix
+
+      self
+    end
+
+    # Returns the formatted first name (given name + particle if present).
+    # Stores what should go in the database first_name column.
+    # Example: "von Braun" for "Wernher von Braun"
+    def first_name
+      return nil if @given_name.nil? && @family_name.nil?
+
+      parts = [@given_name, @particle].compact_blank
+      return @family_name if parts.empty?
+
+      parts.join(" ").presence
+    end
+
+    # Returns the formatted last name (family name + suffix if present).
+    # Stores what should go in the database last_name column.
+    # Example: "King Jr." for "Martin Luther King Jr."
+    def last_name
+      parts = [@family_name, @suffix].compact_blank
+      parts.empty? ? nil : parts.join(" ").presence
+    end
+
+  end
+end

app/views/api/v4/users/_user.json.jbuilder

@@ -10,6 +10,8 @@ json.name user.initial_name
 # those which we'd like to expose less of:
 expand_pii(override_if: user == current_user || local_assigns[:show_email]) do
   json.email user.email
+  json.first_name user.first_name
+  json.last_name user.last_name
 end
 
 expand_pii(override_if: user == current_user) do

app/views/stripe_cards/_form.html.erb

@@ -49,7 +49,7 @@
     <h2 class="grid__fill">Shipping info</h2>
     <div class="field">
       <%= form.label :stripe_shipping_name, "Shipping name" %>
-      <%= form.text_field :stripe_shipping_name, value: current_user&.full_name, disabled: @event&.demo_mode? %>
+      <%= form.text_field :stripe_shipping_name, value: current_user&.name, disabled: @event&.demo_mode? %>
     </div>
     <div class="field">
       <%= form.label :stripe_shipping_address_line1, "Address (line 1)" %>

app/views/users/edit.html.erb

@@ -34,15 +34,25 @@
           <%= form_errors @user, "profile", "We couldn't update your" %>
           <div class="md:flex gap-2">
             <div class="field flex-1">
-              <%= form.label :full_name %>
-              <%= form.text_field :full_name, required: true, placeholder: "Fiona Hackworth III", style: "max-width:100%", pattern: '^\S+.+' %>
-              <% @user.errors.full_messages_for(:full_name).each do |message| %>
+              <%= form.label :first_name %>
+              <%= form.text_field :first_name, required: true, placeholder: "Fiona", style: "max-width:100%" %>
+              <% @user.errors.full_messages_for(:first_name).each do |message| %>
                 <div class="primary"><%= message %></div>
               <% end %>
             </div>
+            <div class="field flex-1">
+              <%= form.label :last_name, "Last name (optional)" %>
+              <%= form.text_field :last_name, style: "max-width:100%", placeholder: "Hackworth" %>
+              <% @user.errors.full_messages_for(:last_name).each do |message| %>
+                <div class="primary"><%= message %></div>
+              <% end %>
+            </div>
+          </div>
+
+          <div class="md:flex gap-2">
             <div class="field flex-1">
               <%= form.label :preferred_name, "Preferred name (optional)" %>
-              <%= form.text_field :preferred_name, style: "max-width:100%", placeholder: @user.full_name.presence || "FiFi Hacks", maxlength: 30 %>
+              <%= form.text_field :preferred_name, style: "max-width:100%", placeholder: "FiFi Hacks", maxlength: 30 %>
             </div>
           </div>
 
@@ -137,16 +147,24 @@
         <% end %>
 
         <div class="field">
-          <%= form.label :full_name %>
-          <%= form.text_field :full_name, required: true, placeholder: "Fiona Hackworth III", pattern: '^\S+.+', disabled: %>
-          <% @user.errors.full_messages_for(:full_name).each do |message| %>
+          <%= form.label :first_name %>
+          <%= form.text_field :first_name, required: true, placeholder: "Fiona", disabled: %>
+          <% @user.errors.full_messages_for(:first_name).each do |message| %>
+            <div class="primary"><%= message %></div>
+          <% end %>
+        </div>
+        <div class="field">
+          <%= form.label :last_name %>
+          <p class="h5 muted mt0 mb1">Optional - you can have just a first name if you prefer.</p>
+          <%= form.text_field :last_name, placeholder: "Hackworth", disabled: %>
+          <% @user.errors.full_messages_for(:last_name).each do |message| %>
             <div class="primary"><%= message %></div>
           <% end %>
         </div>
         <div class="field">
           <%= form.label :preferred_name %>
           <p class="h5 muted mt0 mb1">If you go by a different name.</p>
-          <%= form.text_field :preferred_name, placeholder: @user.full_name.presence || "FiFi Hacks", maxlength: 30, disabled: %>
+          <%= form.text_field :preferred_name, placeholder: "FiFi Hacks", maxlength: 30, disabled: %>
         </div>
 
         <div class="field">

db/migrate/20260301000001_add_first_and_last_names_to_users.rb

@@ -0,0 +1,6 @@
+class AddFirstAndLastNamesToUsers < ActiveRecord::Migration[8.0]
+  def change
+    add_column :users, :first_name, :string
+    add_column :users, :last_name, :string
+  end
+end

db/migrate/20260301000002_populate_first_and_last_names.rb

@@ -0,0 +1,29 @@
+class PopulateFirstAndLastNames < ActiveRecord::Migration[8.0]
+  BATCH_SIZE = 500
+
+  def up
+    require "namae"
+
+    updates = []
+
+    User.where.not(full_name: nil).select(:id, :full_name).find_each do |user|
+      namae = Namae.parse(user.full_name).first
+      updates << {
+        id: user.id,
+        first_name: [namae&.given, namae&.particle].compact_blank.join(" ").presence || namae&.family,
+        last_name: [namae&.family, namae&.suffix].compact_blank.join(" ").presence,
+      }
+
+      if updates.size >= BATCH_SIZE
+        User.upsert_all(updates, update_only: [:first_name, :last_name], unique_by: :id)
+        updates.clear
+      end
+    end
+
+    User.upsert_all(updates, update_only: [:first_name, :last_name], unique_by: :id) if updates.any?
+  end
+
+  def down
+    User.update_all(first_name: nil, last_name: nil)
+  end
+end

db/schema.rb

@@ -2653,8 +2653,10 @@
     t.integer "creation_method"
     t.string "discord_id"
     t.text "email", null: false
+    t.string "first_name"
     t.string "full_name"
     t.boolean "joined_as_teenager"
+    t.string "last_name"
     t.datetime "locked_at", precision: nil
     t.boolean "monthly_donation_summary", default: true
     t.boolean "monthly_follower_summary", default: true