1 files changed, 3 insertions, 7 deletions
diff --git a/app/models/customer_relations/organization.rb b/app/models/customer_relations/organization.rb
index caf1cd68cc5..a18d3ab8148 100644
--- a/app/models/customer_relations/organization.rb
+++ b/app/models/customer_relations/organization.rb
@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 
 class CustomerRelations::Organization < ApplicationRecord
+  include StripAttribute
+
   self.table_name = "customer_relations_organizations"
 
   belongs_to :group, -> { where(type: 'Group') }, foreign_key: 'group_id'
 
-  before_validation :strip_whitespace!
+  strip_attributes! :name
 
   enum state: {
     inactive: 0,
@@ -22,10 +24,4 @@ class CustomerRelations::Organization < ApplicationRecord
     where(group: group_id)
     .where('LOWER(name) = LOWER(?)', name)
   end
-
-  private
-
-  def strip_whitespace!
-    name&.strip!
-  end
 end