diff --git a/app/models/contact_network.rb b/app/models/contact_network.rb
index 23d3c79..19e4388 100644
--- a/app/models/contact_network.rb
+++ b/app/models/contact_network.rb
@@ -20,17 +20,17 @@ class ContactNetwork < ApplicationRecord
format: CODENAME_RE,
uniqueness: { case_sensitive: false }
- validates :public_name, allow_nil: true, length: { in: 1..255 }
+ validates :name, allow_nil: true, length: { in: 1..255 }
private
def turn_blanks_into_nils
- self.codename = nil if codename.blank?
- self.public_name = nil if public_name.blank?
+ self.codename = nil if codename.blank?
+ self.name = nil if name.blank?
end
def strip_extra_spaces
- self.codename = codename&.strip
- self.public_name = public_name&.strip
+ self.codename = codename&.strip
+ self.name = name&.strip
end
end
diff --git a/app/views/staffs/contact_networks/index.html.erb b/app/views/staffs/contact_networks/index.html.erb
index e9906c4..7947cd5 100644
--- a/app/views/staffs/contact_networks/index.html.erb
+++ b/app/views/staffs/contact_networks/index.html.erb
@@ -11,7 +11,7 @@
<%= ContactNetwork.human_attribute_name :codename %>
|
- <%= ContactNetwork.human_attribute_name :public_name %>
+ <%= ContactNetwork.human_attribute_name :name %>
|
|
@@ -21,7 +21,7 @@
<% @contact_networks.each do |contact_network| %>
| <%= contact_network.codename %> |
- <%= contact_network.public_name %> |
+ <%= contact_network.name %> |
<% end %>
diff --git a/config/locales/activerecord/en.yml b/config/locales/activerecord/en.yml
index e7a3203..e651ee5 100644
--- a/config/locales/activerecord/en.yml
+++ b/config/locales/activerecord/en.yml
@@ -39,7 +39,7 @@ en:
contact_network:
id: ID
codename: Codename
- public_name: Public name
+ name: Name
federal_subject:
id: ID
regional_office: Regional department
diff --git a/config/locales/activerecord/ru.yml b/config/locales/activerecord/ru.yml
index 00accdf..116d19d 100644
--- a/config/locales/activerecord/ru.yml
+++ b/config/locales/activerecord/ru.yml
@@ -39,7 +39,7 @@ ru:
contact_network:
id: ID
codename: Кодовое имя
- public_name: Публичное имя
+ name: Название
federal_subject:
id: ID
regional_office: Региональное отделение
diff --git a/db/migrate/20181129203927_initial_migration.rb b/db/migrate/20181129203927_initial_migration.rb
index 517ca07..998cfa5 100644
--- a/db/migrate/20181129203927_initial_migration.rb
+++ b/db/migrate/20181129203927_initial_migration.rb
@@ -170,8 +170,8 @@ private
create_table :contact_networks do |t|
t.timestamps null: false
- t.string :codename, null: false, index: { unique: true }
- t.string :public_name, null: false, index: { unique: true }
+ t.string :codename, null: false, index: { unique: true }
+ t.string :name, null: false, index: { unique: true }
end
create_table :contact_lists do |t|
@@ -397,8 +397,8 @@ private
is_codename(codename)
SQL
- constraint :contact_networks, :public_name, <<~SQL
- is_good_small_text(public_name)
+ constraint :contact_networks, :name, <<~SQL
+ is_good_small_text(name)
SQL
constraint :relationships, :role, <<~SQL
diff --git a/db/seeds.rb b/db/seeds.rb
index 9b311fe..fe9ecc8 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -25,17 +25,14 @@ CSV.foreach(
end
end
-CSV.foreach(
- contact_networks_filename,
- col_sep: '|',
-) do |(id, codename, public_name)|
+CSV.foreach contact_networks_filename, col_sep: '|' do |(id, codename, name)|
id = Integer(id.strip)
codename.strip!
- public_name.strip!
+ name.strip!
ContactNetwork.where(id: id).first_or_create! do |new_contact_network|
new_contact_network.codename = codename
- new_contact_network.public_name = public_name
+ new_contact_network.name = name
end
end
diff --git a/db/structure.sql b/db/structure.sql
index a9a262f..d4fae68 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -417,9 +417,9 @@ CREATE TABLE public.contact_networks (
created_at timestamp(6) without time zone NOT NULL,
updated_at timestamp(6) without time zone NOT NULL,
codename character varying NOT NULL,
- public_name character varying NOT NULL,
+ name character varying NOT NULL,
CONSTRAINT codename CHECK (public.is_codename((codename)::text)),
- CONSTRAINT public_name CHECK (public.is_good_small_text((public_name)::text))
+ CONSTRAINT name CHECK (public.is_good_small_text((name)::text))
);
@@ -1105,10 +1105,10 @@ CREATE UNIQUE INDEX index_contact_networks_on_codename ON public.contact_network
--
--- Name: index_contact_networks_on_public_name; Type: INDEX; Schema: public; Owner: -
+-- Name: index_contact_networks_on_name; Type: INDEX; Schema: public; Owner: -
--
-CREATE UNIQUE INDEX index_contact_networks_on_public_name ON public.contact_networks USING btree (public_name);
+CREATE UNIQUE INDEX index_contact_networks_on_name ON public.contact_networks USING btree (name);
--
diff --git a/factories/contact_networks.rb b/factories/contact_networks.rb
index 68c7c79..623c212 100644
--- a/factories/contact_networks.rb
+++ b/factories/contact_networks.rb
@@ -3,6 +3,6 @@
FactoryBot.define do
factory :contact_network, class: ContactNetwork do
codename { Faker::Internet.username 3..36, %w[_] }
- public_name { Faker::Company.unique.name }
+ name { Faker::Company.unique.name }
end
end
diff --git a/spec/models/contact_network_spec.rb b/spec/models/contact_network_spec.rb
index 9711bda..f1f588d 100644
--- a/spec/models/contact_network_spec.rb
+++ b/spec/models/contact_network_spec.rb
@@ -37,9 +37,9 @@ RSpec.describe ContactNetwork do
it { is_expected.not_to allow_value '1foo' }
end
- describe '#public_name' do
+ describe '#name' do
def allow_value(*)
- super.for :public_name
+ super.for :name
end
it { is_expected.to allow_value nil }
@@ -50,25 +50,29 @@ RSpec.describe ContactNetwork do
it { is_expected.to allow_value Faker::Name.first_name }
it { is_expected.to allow_value 'Foo Bar' }
- it { is_expected.to validate_length_of(:public_name).is_at_most(255) }
+ it { is_expected.to validate_length_of(:name).is_at_most(255) }
context 'when it was set to blank value' do
- subject { create :personal_account, public_name: ' ' * rand(100) }
+ subject { build :contact_network, name: ' ' * rand(100) }
+
+ before { subject.validate }
specify do
- expect(subject.public_name).to eq nil
+ expect(subject.name).to eq nil
end
end
context 'when it was set to value with leading and trailing spaces' do
- subject { create :personal_account, public_name: public_name }
+ subject { create :contact_network, name: name }
- let :public_name do
+ let :name do
"#{' ' * rand(4)}#{Faker::Name.name}#{' ' * rand(4)}"
end
+ before { subject.validate }
+
specify do
- expect(subject.public_name).to eq public_name.strip
+ expect(subject.name).to eq name.strip
end
end
end