Improve code

app/models/account.rb

@@ -40,7 +40,7 @@ class Account < ApplicationRecord
 
   before_create :generate_guest_token
 
-  validates :person_id, allow_nil: true, uniqueness: true
+  validates :person, allow_nil: true, uniqueness: true
 
   validates :username,
             presence:   true,

app/models/account_telegram_contact.rb

@@ -4,5 +4,5 @@ class AccountTelegramContact < ApplicationRecord
   belongs_to :account
   belongs_to :telegram_chat
 
-  validates :telegram_chat_id, uniqueness: true
+  validates :telegram_chat, uniqueness: true
 end

app/models/membership_app.rb

@@ -14,7 +14,7 @@ class MembershipApp < ApplicationRecord
   validates :date_of_birth, presence: true
   validates :phone_number, presence: true
 
-  validates :account_id, uniqueness: true
+  validates :account, uniqueness: true
 
   before_validation do
     email&.strip!

app/models/passport_confirmation.rb

@@ -4,7 +4,7 @@ class PassportConfirmation < ApplicationRecord
   belongs_to :passport
   belongs_to :account
 
-  validates :account_id, uniqueness: { scope: :passport_id }
+  validates :account, uniqueness: { scope: :passport_id }
 
   validate :passport_can_have_confirmations
 

app/models/regional_office.rb

@@ -7,5 +7,5 @@ class RegionalOffice < ApplicationRecord
 
   has_many :people, dependent: :restrict_with_exception
 
-  validates :country_state_id, uniqueness: true
+  validates :country_state, uniqueness: true
 end

app/models/user.rb

@@ -19,7 +19,7 @@ class User < ApplicationRecord
 
   has_many :user_omniauths, dependent: :restrict_with_exception
 
-  validates :account_id, uniqueness: true
+  validates :account, uniqueness: true
 
   before_validation do
     self.account ||= Account.new

spec/models/membership_app_spec.rb

@@ -30,7 +30,7 @@ RSpec.describe MembershipApp do
   it { is_expected.not_to validate_presence_of :organization_membership }
   it { is_expected.not_to validate_presence_of :comment }
 
-  it { is_expected.to validate_uniqueness_of :account_id }
+  it { is_expected.to validate_uniqueness_of :account }
 
   describe '#email' do
     def allow_value(*)

spec/models/passport_confirmation_spec.rb

@@ -12,7 +12,7 @@ RSpec.describe PassportConfirmation do
   it { is_expected.to validate_presence_of(:account).with_message(:required) }
 
   it do
-    is_expected.to validate_uniqueness_of(:account_id).scoped_to(:passport_id)
+    is_expected.to validate_uniqueness_of(:account).scoped_to(:passport_id)
   end
 
   it { is_expected.not_to allow_value(create(:empty_passport)).for :passport }

spec/models/regional_office_spec.rb

@@ -17,5 +17,5 @@ RSpec.describe RegionalOffice do
       .with_message(:required)
   end
 
-  it { is_expected.to validate_uniqueness_of :country_state_id }
+  it { is_expected.to validate_uniqueness_of :country_state }
 end

spec/models/user_spec.rb

@@ -7,5 +7,5 @@ RSpec.describe User do
 
   it { is_expected.to belong_to(:account).required(false) }
 
-  it { is_expected.to validate_uniqueness_of :account_id }
+  it { is_expected.to validate_uniqueness_of :account }
 end