From 27a6c17f1ff44c66cddb83daf66f7b1b64e22784 Mon Sep 17 00:00:00 2001
From: Alex Kotov <kotovalexarian@gmail.com>
Date: Sun, 24 Mar 2019 06:42:27 +0500
Subject: [PATCH] Improve code

---
 app/models/account.rb                     | 2 +-
 app/models/account_telegram_contact.rb    | 2 +-
 app/models/membership_app.rb              | 2 +-
 app/models/passport_confirmation.rb       | 2 +-
 app/models/regional_office.rb             | 2 +-
 app/models/user.rb                        | 2 +-
 spec/models/membership_app_spec.rb        | 2 +-
 spec/models/passport_confirmation_spec.rb | 2 +-
 spec/models/regional_office_spec.rb       | 2 +-
 spec/models/user_spec.rb                  | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/models/account.rb b/app/models/account.rb
index fcd9f37..1622295 100644
--- a/app/models/account.rb
+++ b/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,
diff --git a/app/models/account_telegram_contact.rb b/app/models/account_telegram_contact.rb
index 928ee25..358306f 100644
--- a/app/models/account_telegram_contact.rb
+++ b/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
diff --git a/app/models/membership_app.rb b/app/models/membership_app.rb
index 54ee22c..f03d657 100644
--- a/app/models/membership_app.rb
+++ b/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!
diff --git a/app/models/passport_confirmation.rb b/app/models/passport_confirmation.rb
index 4ef200e..a3ede2a 100644
--- a/app/models/passport_confirmation.rb
+++ b/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
 
diff --git a/app/models/regional_office.rb b/app/models/regional_office.rb
index 27d7093..52c50aa 100644
--- a/app/models/regional_office.rb
+++ b/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
diff --git a/app/models/user.rb b/app/models/user.rb
index e7e3034..35f968c 100644
--- a/app/models/user.rb
+++ b/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
diff --git a/spec/models/membership_app_spec.rb b/spec/models/membership_app_spec.rb
index 72d0904..632cfc2 100644
--- a/spec/models/membership_app_spec.rb
+++ b/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(*)
diff --git a/spec/models/passport_confirmation_spec.rb b/spec/models/passport_confirmation_spec.rb
index 07cbe03..bbaf48a 100644
--- a/spec/models/passport_confirmation_spec.rb
+++ b/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 }
diff --git a/spec/models/regional_office_spec.rb b/spec/models/regional_office_spec.rb
index fc65b67..51d51c8 100644
--- a/spec/models/regional_office_spec.rb
+++ b/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
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index a3bf6e2..d4d6c64 100644
--- a/spec/models/user_spec.rb
+++ b/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