Split name column in customers table

app/controllers/admin/customers_controller.rb

@@ -99,7 +99,7 @@ def ams_prefix_whitelist
 
     def customer_params
       params.require(:customer).permit(
-        :enterprise_id, :name, :email, :code, :tag_list,
+        :enterprise_id, :first_name, :last_name, :email, :code, :tag_list,
         ship_address_attributes: PermittedAttributes::Address.attributes,
         bill_address_attributes: PermittedAttributes::Address.attributes,
       )

app/controllers/spree/admin/search_controller.rb

@@ -21,7 +21,8 @@ def customers
         @customers = []
         if spree_current_user.enterprises.pluck(:id).include? search_params[:distributor_id].to_i
           @customers = Customer.
-            ransack(m: 'or', email_start: search_params[:q], name_start: search_params[:q]).
+            ransack(m: 'or', email_start: search_params[:q], first_name_start: search_params[:q],
+                    last_name_start: search_params[:q]).
             result.
             where(enterprise_id: search_params[:distributor_id].to_i)
         end

app/models/customer.rb

@@ -5,7 +5,7 @@ class Customer < ApplicationRecord
 
   acts_as_taggable
 
-  searchable_attributes :name, :email, :code
+  searchable_attributes :first_name, :last_name, :email, :code
 
   belongs_to :enterprise
   belongs_to :user, class_name: "Spree::User"
@@ -34,6 +34,10 @@ class Customer < ApplicationRecord
 
   attr_accessor :gateway_recurring_payment_client_secret, :gateway_shop_id
 
+  def full_name
+    "#{first_name} #{last_name}".strip
+  end
+
   private
 
   def downcase_email

app/models/spree/order.rb

@@ -84,8 +84,7 @@ def states
     before_validation :set_currency
     before_validation :generate_order_number, on: :create
     before_validation :clone_billing_address, if: :use_billing?
-    before_validation :associate_customer, unless: :customer_id?
-    before_validation :ensure_customer, unless: :customer_is_valid?
+    before_validation :ensure_customer
 
     before_create :link_by_email
     after_create :create_tax_charge!
@@ -711,23 +710,25 @@ def email_for_customer
     def associate_customer
       return customer if customer.present?
 
-      self.customer = Customer.of(distributor).find_by(email: email_for_customer)
+      Customer.of(distributor).find_by(email: email_for_customer)
     end
 
-    def ensure_customer
-      return if associate_customer
+    def create_customer
+      return if customer_is_valid?
 
-      self.customer = Customer.new(
+      Customer.create(
         enterprise: distributor,
         email: email_for_customer,
         user: user,
-        name: bill_address&.full_name,
+        first_name: bill_address&.first_name.to_s,
+        last_name: bill_address&.last_name.to_s,
         bill_address: bill_address&.clone,
         ship_address: ship_address&.clone
       )
-      customer.save
+    end
 
-      Bugsnag.notify(customer.errors.full_messages.join(", ")) unless customer.persisted?
+    def ensure_customer
+      self.customer = associate_customer || create_customer
     end
 
     def update_adjustment!(adjustment)

app/serializers/api/admin/customer_serializer.rb

@@ -3,14 +3,14 @@
 module Api
   module Admin
     class CustomerSerializer < ActiveModel::Serializer
-      attributes :id, :email, :enterprise_id, :user_id, :code, :tags, :tag_list, :name,
-                 :allow_charges, :default_card_present?
+      attributes :id, :email, :enterprise_id, :user_id, :code, :tags, :tag_list, :first_name,
+                 :last_name, :allow_charges, :default_card_present?
 
       has_one :ship_address, serializer: Api::AddressSerializer
       has_one :bill_address, serializer: Api::AddressSerializer
 
-      def name
-        object.name.presence || object.bill_address&.full_name
+      def full_name
+        object.full_name.presence || object.bill_address&.full_name
       end
 
       def tag_list

app/serializers/api/admin/subscription_serializer.rb

@@ -4,8 +4,8 @@ module Api
   module Admin
     class SubscriptionSerializer < ActiveModel::Serializer
       attributes :id, :shop_id, :customer_id, :schedule_id, :payment_method_id, :shipping_method_id,
-                 :begins_at, :ends_at,
-                 :customer_email, :customer_name, :schedule_name, :edit_path, :canceled_at, :paused_at, :state,
+                 :begins_at, :ends_at, :customer_email, :customer_first_name, :customer_last_name,
+                 :customer_full_name, :schedule_name, :edit_path, :canceled_at, :paused_at, :state,
                  :shipping_fee_estimate, :payment_fee_estimate
 
       has_many :subscription_line_items, serializer: Api::Admin::SubscriptionLineItemSerializer
@@ -34,8 +34,16 @@ def customer_email
         object.customer&.email
       end
 
-      def customer_name
-        object.customer&.name
+      def customer_first_name
+        object.customer&.first_name
+      end
+
+      def customer_last_name
+        object.customer&.last_name
+      end
+
+      def customer_full_name
+        object.customer&.full_name
       end
 
       def schedule_name

app/serializers/api/customer_serializer.rb

@@ -2,7 +2,7 @@
 
 module Api
   class CustomerSerializer < ActiveModel::Serializer
-    attributes :id, :enterprise_id, :name, :code, :email, :allow_charges
+    attributes :id, :enterprise_id, :first_name, :last_name, :code, :email, :allow_charges
 
     def attributes
       hash = super

app/views/admin/customers/index.html.haml

@@ -50,7 +50,8 @@
 
       %table.index#customers
         %col.email{ width: "20%", 'ng-show' => 'columns.email.visible' }
-        %col.name{ width: "20%", 'ng-show' => 'columns.name.visible' }
+        %col.first_name{ width: "20%", 'ng-show' => 'columns.first_name.visible' }
+        %col.last_name{ width: "20%", 'ng-show' => 'columns.last_name.visible' }
         %col.code{ width: "10%", 'ng-show' => 'columns.code.visible' }
         %col.tags{ width: "20%", 'ng-show' => 'columns.tags.visible' }
         %col.bill_address{ width: "10%", 'ng-show' => 'columns.bill_address.visible' }
@@ -63,8 +64,10 @@
               -# %input{ :type => "checkbox", :name => 'toggle_bulk', 'ng-click' => 'toggleAllCheckboxes()', 'ng-checked' => "allBoxesChecked()" }
             %th.email{ 'ng-show' => 'columns.email.visible' }
               %a{ :href => '', 'ng-click' => "sorting.toggle('email')" }=t('admin.email')
-            %th.name{ 'ng-show' => 'columns.name.visible' }
-              %a{ :href => '', 'ng-click' => "sorting.toggle('name')" }=t('admin.name')
+            %th.first_name{ 'ng-show' => 'columns.first_name.visible' }
+              %a{ :href => '', 'ng-click' => "sorting.toggle('first_name')" }=t('admin.first_name')
+            %th.last_name{ 'ng-show' => 'columns.last_name.visible' }
+              %a{ :href => '', 'ng-click' => "sorting.toggle('last_name')" }=t('admin.last_name')
             %th.code{ 'ng-show' => 'columns.code.visible' }
               %a{ :href => '', 'ng-click' => "sorting.toggle('code')" }=t('admin.customers.index.code')
             %th.tags{ 'ng-show' => 'columns.tags.visible' }=t('admin.tags')
@@ -78,8 +81,10 @@
             %td.email{ 'ng-show' => 'columns.email.visible'}
               %span{ 'ng-bind' => '::customer.email' }
               %span.guest-label{ 'ng-show' => 'customer.user_id == null' }= t('.guest_label')
-            %td.name{ 'ng-show' => 'columns.name.visible'}
-              %input{ type: 'text', name: 'name', ng: { model: 'customer.name' }, 'obj-for-update' => 'customer', 'attr-for-update' => 'name'}
+            %td.first_name{ 'ng-show' => 'columns.first_name.visible'}
+              %input{ type: 'text', name: 'first_name', ng: { model: 'customer.first_name' }, 'obj-for-update' => 'customer', 'attr-for-update' => 'first_name'}
+            %td.last_name{ 'ng-show' => 'columns.last_name.visible'}
+              %input{ type: 'text', name: 'last_name', ng: { model: 'customer.last_name' }, 'obj-for-update' => 'customer', 'attr-for-update' => 'last_name'}
             %td.code{ 'ng-show' => 'columns.code.visible' }
               %input{ type: 'text', name: 'code', ng: {model: 'customer.code', change: 'checkForDuplicateCodes()'}, "obj-for-update" => "customer", "attr-for-update" => "code" }
               %i.icon-warning-sign{ ng: {if: 'duplicate'} }

app/views/admin/subscriptions/_table.html.haml

@@ -41,7 +41,7 @@
       %td.customer.text-center{ ng: { show: 'columns.customer.visible'}}
         %span{ "ng-bind": '::subscription.customer_email' }
         %br
-        %span{ "ng-bind": '::subscription.customer_name' } 
+        %span{ "ng-bind": '::subscription.customer_full_name' }
       %td.schedule.text-center{ ng: { show: 'columns.schedule.visible', bind: '::subscription.schedule_name' } }
       %td.items.panel-toggle.text-center{ name: 'products', ng: { show: 'columns.items.visible' } }
         %h5{ ng: { bind: 'itemCount(subscription)' } }

config/locales/en.yml

@@ -447,6 +447,8 @@ en:
     ends_at: Ends At
     ends_on: Ends On
     name: Name
+    first_name: First Name
+    last_name: Last Name
     on_hand: On Hand
     on_demand: On Demand
     on_demand?: On Demand?

db/migrate/20220105085729_split_customers_name.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class SplitCustomersName < ActiveRecord::Migration[6.1]
+  def up
+    add_column :customers, :first_name, :string, null: false, default: ""
+    add_column :customers, :last_name, :string, null: false, default: ""
+  end
+
+  def down
+    remove_column :customers, :first_name
+    remove_column :customers, :last_name
+  end
+end

db/migrate/20220105085730_migrate_customers_data.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+class MigrateCustomersData < ActiveRecord::Migration[6.1]
+  class SpreeAddress < ApplicationRecord; end
+
+  class Customer < ApplicationRecord
+    belongs_to :bill_address, class_name: "SpreeAddress"
+  end
+
+  def up
+    migrate_customer_name_data!
+  end
+
+  def migrate_customer_name_data!
+    customers_with_bill_addresses.find_each do |customer|
+      if bill_address_name_matches?(customer)
+        apply_name_from_bill_address!(customer)
+        next
+      end
+
+      split_customer_name!(customer)
+    end
+
+    customers_without_bill_addresses.find_each do |customer|
+      split_customer_name!(customer)
+    end
+  end
+
+  def customers_with_bill_addresses
+    Customer.joins(:bill_address).where(first_name: "", last_name: "").where.not(name: [nil, ""])
+  end
+
+  def customers_without_bill_addresses
+    Customer.where(bill_address_id: nil, first_name: "", last_name: "").where.not(name: [nil, ""])
+  end
+
+  def bill_address_name_matches?(customer)
+    address_name = customer.bill_address.firstname + customer.bill_address.lastname
+    customer.name.delete(" ") == address_name.delete(" ")
+  end
+
+  def split_customer_name!(customer)
+    return if (name_parts = customer.name.split(' ')).empty?
+
+    customer.update_columns(
+      first_name: name_parts.first,
+      last_name: name_parts[1..].join(' '),
+      updated_at: Time.zone.now
+    )
+  end
+
+  def apply_name_from_bill_address!(customer)
+    customer.update_columns(
+      first_name: customer.bill_address.firstname,
+      last_name: customer.bill_address.lastname,
+      updated_at: Time.zone.now
+    )
+  end
+end

db/schema.rb

@@ -54,6 +54,8 @@
     t.string "name", limit: 255
     t.boolean "allow_charges", default: false, null: false
     t.datetime "terms_and_conditions_accepted_at"
+    t.string "first_name", default: "", null: false
+    t.string "last_name", default: "", null: false
     t.index ["bill_address_id"], name: "index_customers_on_bill_address_id"
     t.index ["email"], name: "index_customers_on_email"
     t.index ["enterprise_id", "code"], name: "index_customers_on_enterprise_id_and_code", unique: true

engines/order_management/app/services/order_management/reports/enterprise_fee_summary/scope.rb

@@ -374,7 +374,7 @@ def select_attributes
                   hubs.name AS hub_name,
                   enterprises.name AS enterprise_name,
                   enterprise_fees.fee_type AS fee_type,
-                  customers.name AS customer_name,
+                  TRIM(CONCAT(customers.first_name, ' ', customers.last_name)) AS customer_name,
                   customers.email AS customer_email,
                   enterprise_fees.name AS fee_name,
                   spree_tax_categories.name AS tax_category_name,

engines/order_management/spec/services/order_management/reports/enterprise_fee_summary/report_service_spec.rb

@@ -36,8 +36,8 @@
   let!(:variant) { prepare_variant }
 
   # Create customers.
-  let!(:customer) { create(:customer, name: "Sample Customer") }
-  let!(:another_customer) { create(:customer, name: "Another Customer") }
+  let!(:customer) { create(:customer, first_name: "Sample", last_name: "Customer") }
+  let!(:another_customer) { create(:customer, first_name: "Another", last_name: "Customer") }
 
   # Setup up permissions and report.
   let!(:current_user) { create(:admin_user) }
@@ -438,9 +438,9 @@
     context "filtering by completion date" do
       let(:timestamp) { Time.zone.local(2018, 1, 5, 14, 30, 5) }
 
-      let!(:customer_a) { create(:customer, name: "Customer A") }
-      let!(:customer_b) { create(:customer, name: "Customer B") }
-      let!(:customer_c) { create(:customer, name: "Customer C") }
+      let!(:customer_a) { create(:customer, first_name: "Customer", last_name: "A") }
+      let!(:customer_b) { create(:customer, first_name: "Customer", last_name: "B") }
+      let!(:customer_c) { create(:customer, first_name: "Customer", last_name: "C") }
 
       let!(:order_placed_before_timestamp) do
         prepare_order(customer: customer_a).tap do |order|

lib/open_food_network/column_preference_defaults.rb

@@ -30,9 +30,10 @@ def customers_index_columns
       node = 'admin.customers.index'
       {
         email: { name: I18n.t("admin.email"), visible: true },
-        name: { name: I18n.t("admin.name"),           visible: true },
-        code: { name: I18n.t("#{node}.code"),         visible: true },
-        tags: { name: I18n.t("admin.tags"),           visible: true },
+        first_name: { name: I18n.t("admin.first_name"), visible: true },
+        last_name: { name: I18n.t("admin.last_name"), visible: true },
+        code: { name: I18n.t("#{node}.code"), visible: true },
+        tags: { name: I18n.t("admin.tags"), visible: true },
         bill_address: { name: I18n.t("#{node}.bill_address"), visible: true },
         ship_address: { name: I18n.t("#{node}.ship_address"), visible: true },
         balance: { name: I18n.t("#{node}.balance"), visible: true }

spec/controllers/spree/admin/search_controller_spec.rb

@@ -35,7 +35,7 @@
 
     describe 'searching for customers' do
       let!(:customer_1) { create(:customer, enterprise: enterprise, email: 'test1@email.com') }
-      let!(:customer_2) { create(:customer, enterprise: enterprise, name: 'test2') }
+      let!(:customer_2) { create(:customer, enterprise: enterprise, first_name: 'test2') }
       let!(:customer_3) { create(:customer, email: 'test3@email.com') }
 
       describe 'when search owned enterprises' do

spec/factories.rb

@@ -113,14 +113,6 @@
     property
   end
 
-  factory :customer, class: Customer do
-    email { generate(:random_email) }
-    enterprise
-    code { SecureRandom.base64(150) }
-    user
-    bill_address { create(:address) }
-  end
-
   factory :stripe_account do
     enterprise { FactoryBot.create(:distributor_enterprise) }
     stripe_user_id { "abc123" }

spec/factories/customer_factory.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :customer, class: Customer do
+    email { generate(:random_email) }
+    enterprise
+    code { SecureRandom.base64(150) }
+    user
+    bill_address { create(:address) }
+  end
+end