From 70d2e1dec6d703c3cbdb62d6f9eb4a99a2d40811 Mon Sep 17 00:00:00 2001
From: Alex Kotov <kotovalexarian@gmail.com>
Date: Wed, 14 Aug 2019 18:54:27 +0500
Subject: [PATCH] Fix factories and sequences

---
 db/migrate/20181129203927_initial_migration.rb | 8 ++++----
 db/structure.sql                               | 8 ++++----
 factories/federal_subjects.rb                  | 7 +++----
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/db/migrate/20181129203927_initial_migration.rb b/db/migrate/20181129203927_initial_migration.rb
index 7887a5a..fdd03da 100644
--- a/db/migrate/20181129203927_initial_migration.rb
+++ b/db/migrate/20181129203927_initial_migration.rb
@@ -365,10 +365,10 @@ private
     reversible do |dir|
       dir.up do
         execute <<~SQL
-          ALTER SEQUENCE contact_networks_id_seq START WITH 100;
-          ALTER SEQUENCE federal_subjects_id_seq START WITH 100;
-          ALTER SEQUENCE contacts_id_seq         START WITH 4000;
-          ALTER SEQUENCE people_id_seq           START WITH 3000;
+          ALTER SEQUENCE contact_networks_id_seq RESTART WITH 100;
+          ALTER SEQUENCE federal_subjects_id_seq RESTART WITH 100;
+          ALTER SEQUENCE contacts_id_seq         RESTART WITH 4000;
+          ALTER SEQUENCE people_id_seq           RESTART WITH 3000;
         SQL
       end
     end
diff --git a/db/structure.sql b/db/structure.sql
index 175f5a3..34760ec 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -415,7 +415,7 @@ CREATE TABLE public.contact_networks (
 --
 
 CREATE SEQUENCE public.contact_networks_id_seq
-    START WITH 100
+    START WITH 1
     INCREMENT BY 1
     NO MINVALUE
     NO MAXVALUE
@@ -449,7 +449,7 @@ CREATE TABLE public.contacts (
 --
 
 CREATE SEQUENCE public.contacts_id_seq
-    START WITH 4000
+    START WITH 1
     INCREMENT BY 1
     NO MINVALUE
     NO MAXVALUE
@@ -488,7 +488,7 @@ CREATE TABLE public.federal_subjects (
 --
 
 CREATE SEQUENCE public.federal_subjects_id_seq
-    START WITH 100
+    START WITH 1
     INCREMENT BY 1
     NO MINVALUE
     NO MAXVALUE
@@ -598,7 +598,7 @@ CREATE TABLE public.people (
 --
 
 CREATE SEQUENCE public.people_id_seq
-    START WITH 3000
+    START WITH 1
     INCREMENT BY 1
     NO MINVALUE
     NO MAXVALUE
diff --git a/factories/federal_subjects.rb b/factories/federal_subjects.rb
index 27c3e44..cf88f4f 100644
--- a/factories/federal_subjects.rb
+++ b/factories/federal_subjects.rb
@@ -2,12 +2,11 @@
 
 FactoryBot.define do
   factory :federal_subject do
-    sequence(:id)     { |n| n + 1000 }
-    sequence(:number) { |n| n + 1000 }
+    number { rand 1..2**31 - 1 }
 
-    sequence :english_name do |n|
+    english_name do
       I18n.with_locale :en do
-        "#{Faker::Address.unique.state} #{n}"
+        "#{Faker::Address.state} #{number}"
       end
     end