continue fix migration

app/models/applies_job.rb → app/models/apply_job.rb

-class AppliesJob < ApplicationRecord
+class ApplyJob < ApplicationRecord
   belongs_to :user
-  belongs_to :job
+  belongs_to :jobs
 end

app/models/city.rb

 class City < ApplicationRecord
+  belongs_to :regions
   has_and_belongs_to_many :jobs
   has_and_belongs_to_many :companies
-  has_many :regions
 end

app/models/company.rb

 class Company < ApplicationRecord
-  has_and_belongs_to_many :cities
   has_many :jobs
+  has_and_belongs_to_many :cities
 end

app/models/favorite_job.rb

+class FavoriteJob < ApplicationRecord
+  belongs_to :user
+  belongs_to :jobs
+end

app/models/history_job.rb

+class HistoryJob < ApplicationRecord
+  belongs_to :user
+  belongs_to :jobs
+end

app/models/job.rb

 class Job < ApplicationRecord
-  has_and_belongs_to_many :users
+  belongs_to :companies
+  has_many :apply_jobs
+  has_many :favorite_jobs
+  has_many :history_jobs
   has_and_belongs_to_many :industries
   has_and_belongs_to_many :cities
-  has_many :applies_jobs
-  has_many :users, through: :applies_jobs
-  belongs_to :company
 end

app/models/region.rb

 class Region < ApplicationRecord
-  belongs_to :city
+  has_many :cities
 end

app/models/user.rb

 class User < ApplicationRecord
-  has_and_belongs_to_many :jobs
-  has_many :applies_jobs
-  has_many :jobs, through: :applies_jobs
+  has_many :apply_jobs
+  has_many :favorite_jobs
+  has_many :history_jobs
 end

db/migrate/20210708034910_create_regions.rb → db/migrate/20210709034620_create_regions.rb

 class CreateRegions < ActiveRecord::Migration[6.1]
   def change
     create_table :regions do |t|
-      t.references :city, null: false, foreign_key: true
       t.string :name
-
       t.timestamps
     end
   end

db/migrate/20210708030507_create_cities.rb → db/migrate/20210709040246_create_cities.rb

 class CreateCities < ActiveRecord::Migration[6.1]
   def change
     create_table :cities do |t|
+      t.references :regions, null: false, foreign_key: true
       t.string :name
       t.string :address
+
       t.timestamps
     end
   end

db/migrate/20210708033114_create_cities_companies.rb → db/migrate/20210709041223_create_companies_cities.rb

-class CreateCitiesCompanies < ActiveRecord::Migration[6.1]
+class CreateCompaniesCities < ActiveRecord::Migration[6.1]
   def change
-    create_table :cities_companies do |t|
-      t.references :company, null: false, foreign_key: true
-      t.references :city, null: false, foreign_key: true
+    create_table :companies_cities do |t|
+      t.references :companies, null: false, foreign_key: true
+      t.references :cities, null: false, foreign_key: true
 
       t.timestamps
     end

db/migrate/20210708024348_create_jobs.rb → db/migrate/20210709042148_create_jobs.rb

 class CreateJobs < ActiveRecord::Migration[6.1]
   def change
     create_table :jobs do |t|
+      t.references :companies, null: false, foreign_key: true
       t.string :title
       t.text :overview
       t.text :requirement
@@ -9,8 +10,8 @@ class CreateJobs < ActiveRecord::Migration[6.1]
       t.string :type
       t.string :level
       t.integer :experience
-      t.string :benefits
       t.string :degree
+      t.string :benefits
       t.datetime :expired_at
       t.timestamps
     end

db/migrate/20210708033333_create_applies_jobs.rb → db/migrate/20210709043117_create_apply_jobs.rb

-class CreateAppliesJobs < ActiveRecord::Migration[6.1]
+class CreateApplyJobs < ActiveRecord::Migration[6.1]
   def change
-    create_table :applies_jobs do |t|
+    create_table :apply_jobs do |t|
       t.references :user, null: false, foreign_key: true
-      t.references :job, null: false, foreign_key: true
+      t.references :jobs, null: false, foreign_key: true
       t.binary :cv
 
       t.timestamps

db/migrate/20210708032535_create_favourites_jobs.rb → db/migrate/20210709043207_create_favorite_jobs.rb

-class CreateFavouritesJobs < ActiveRecord::Migration[6.1]
+class CreateFavoriteJobs < ActiveRecord::Migration[6.1]
   def change
-    create_table :favourites_jobs do |t|
+    create_table :favorite_jobs do |t|
       t.references :user, null: false, foreign_key: true
-      t.references :job, null: false, foreign_key: true
+      t.references :jobs, null: false, foreign_key: true
 
       t.timestamps
     end

db/migrate/20210708032806_create_historis_jobs.rb → db/migrate/20210709043235_create_history_jobs.rb

-class CreateHistorisJobs < ActiveRecord::Migration[6.1]
+class CreateHistoryJobs < ActiveRecord::Migration[6.1]
   def change
-    create_table :historis_jobs do |t|
+    create_table :history_jobs do |t|
       t.references :user, null: false, foreign_key: true
-      t.references :job, null: false, foreign_key: true
+      t.references :jobs, null: false, foreign_key: true
 
       t.timestamps
     end

db/migrate/20210708033023_create_cities_jobs.rb → db/migrate/20210709043319_create_cities_jobs.rb

 class CreateCitiesJobs < ActiveRecord::Migration[6.1]
   def change
     create_table :cities_jobs do |t|
-      t.references :job, null: false, foreign_key: true
-      t.references :city, null: false, foreign_key: true
+      t.references :cities, null: false, foreign_key: true
+      t.references :jobs, null: false, foreign_key: true
 
       t.timestamps
     end

db/migrate/20210708032950_create_industries_jobs.rb → db/migrate/20210709043354_create_industries_jobs.rb

 class CreateIndustriesJobs < ActiveRecord::Migration[6.1]
   def change
     create_table :industries_jobs do |t|
-      t.references :job, null: false, foreign_key: true
-      t.references :industry, null: false, foreign_key: true
+      t.references :jobs, null: false, foreign_key: true
+      t.references :industries, null: false, foreign_key: true
 
       t.timestamps
     end

db/schema.rb

@@ -10,41 +10,34 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2021_07_08_034910) do
+ActiveRecord::Schema.define(version: 2021_07_09_043354) do
 
-  create_table "applies_jobs", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+  create_table "apply_jobs", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.bigint "user_id", null: false
-    t.bigint "job_id", null: false
+    t.bigint "jobs_id", null: false
     t.binary "cv"
     t.datetime "created_at", precision: 6, null: false
     t.datetime "updated_at", precision: 6, null: false
-    t.index ["job_id"], name: "index_applies_jobs_on_job_id"
-    t.index ["user_id"], name: "index_applies_jobs_on_user_id"
+    t.index ["jobs_id"], name: "index_apply_jobs_on_jobs_id"
+    t.index ["user_id"], name: "index_apply_jobs_on_user_id"
   end
 
   create_table "cities", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+    t.bigint "regions_id", null: false
     t.string "name"
     t.string "address"
     t.datetime "created_at", precision: 6, null: false
     t.datetime "updated_at", precision: 6, null: false
-  end
-
-  create_table "cities_companies", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
-    t.bigint "company_id", null: false
-    t.bigint "city_id", null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
-    t.index ["city_id"], name: "index_cities_companies_on_city_id"
-    t.index ["company_id"], name: "index_cities_companies_on_company_id"
+    t.index ["regions_id"], name: "index_cities_on_regions_id"
   end
 
   create_table "cities_jobs", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
-    t.bigint "job_id", null: false
-    t.bigint "city_id", null: false
+    t.bigint "cities_id", null: false
+    t.bigint "jobs_id", null: false
     t.datetime "created_at", precision: 6, null: false
     t.datetime "updated_at", precision: 6, null: false
-    t.index ["city_id"], name: "index_cities_jobs_on_city_id"
-    t.index ["job_id"], name: "index_cities_jobs_on_job_id"
+    t.index ["cities_id"], name: "index_cities_jobs_on_cities_id"
+    t.index ["jobs_id"], name: "index_cities_jobs_on_jobs_id"
   end
 
   create_table "companies", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
@@ -58,22 +51,31 @@ ActiveRecord::Schema.define(version: 2021_07_08_034910) do
     t.datetime "updated_at", precision: 6, null: false
   end
 
-  create_table "favourites_jobs", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+  create_table "companies_cities", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+    t.bigint "companies_id", null: false
+    t.bigint "cities_id", null: false
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+    t.index ["cities_id"], name: "index_companies_cities_on_cities_id"
+    t.index ["companies_id"], name: "index_companies_cities_on_companies_id"
+  end
+
+  create_table "favorite_jobs", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.bigint "user_id", null: false
-    t.bigint "job_id", null: false
+    t.bigint "jobs_id", null: false
     t.datetime "created_at", precision: 6, null: false
     t.datetime "updated_at", precision: 6, null: false
-    t.index ["job_id"], name: "index_favourites_jobs_on_job_id"
-    t.index ["user_id"], name: "index_favourites_jobs_on_user_id"
+    t.index ["jobs_id"], name: "index_favorite_jobs_on_jobs_id"
+    t.index ["user_id"], name: "index_favorite_jobs_on_user_id"
   end
 
-  create_table "historis_jobs", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+  create_table "history_jobs", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.bigint "user_id", null: false
-    t.bigint "job_id", null: false
+    t.bigint "jobs_id", null: false
     t.datetime "created_at", precision: 6, null: false
     t.datetime "updated_at", precision: 6, null: false
-    t.index ["job_id"], name: "index_historis_jobs_on_job_id"
-    t.index ["user_id"], name: "index_historis_jobs_on_user_id"
+    t.index ["jobs_id"], name: "index_history_jobs_on_jobs_id"
+    t.index ["user_id"], name: "index_history_jobs_on_user_id"
   end
 
   create_table "industries", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
@@ -83,15 +85,16 @@ ActiveRecord::Schema.define(version: 2021_07_08_034910) do
   end
 
   create_table "industries_jobs", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
-    t.bigint "job_id", null: false
-    t.bigint "industry_id", null: false
+    t.bigint "jobs_id", null: false
+    t.bigint "industries_id", null: false
     t.datetime "created_at", precision: 6, null: false
     t.datetime "updated_at", precision: 6, null: false
-    t.index ["industry_id"], name: "index_industries_jobs_on_industry_id"
-    t.index ["job_id"], name: "index_industries_jobs_on_job_id"
+    t.index ["industries_id"], name: "index_industries_jobs_on_industries_id"
+    t.index ["jobs_id"], name: "index_industries_jobs_on_jobs_id"
   end
 
   create_table "jobs", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+    t.bigint "companies_id", null: false
     t.string "title"
     t.text "overview"
     t.text "requirement"
@@ -100,19 +103,18 @@ ActiveRecord::Schema.define(version: 2021_07_08_034910) do
     t.string "type"
     t.string "level"
     t.integer "experience"
-    t.string "benefits"
     t.string "degree"
+    t.string "benefits"
     t.datetime "expired_at"
     t.datetime "created_at", precision: 6, null: false
     t.datetime "updated_at", precision: 6, null: false
+    t.index ["companies_id"], name: "index_jobs_on_companies_id"
   end
 
   create_table "regions", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
-    t.bigint "city_id", null: false
     t.string "name"
     t.datetime "created_at", precision: 6, null: false
     t.datetime "updated_at", precision: 6, null: false
-    t.index ["city_id"], name: "index_regions_on_city_id"
   end
 
   create_table "users", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
@@ -123,17 +125,18 @@ ActiveRecord::Schema.define(version: 2021_07_08_034910) do
     t.datetime "updated_at", precision: 6, null: false
   end
 
-  add_foreign_key "applies_jobs", "jobs"
-  add_foreign_key "applies_jobs", "users"
-  add_foreign_key "cities_companies", "cities"
-  add_foreign_key "cities_companies", "companies"
-  add_foreign_key "cities_jobs", "cities"
-  add_foreign_key "cities_jobs", "jobs"
-  add_foreign_key "favourites_jobs", "jobs"
-  add_foreign_key "favourites_jobs", "users"
-  add_foreign_key "historis_jobs", "jobs"
-  add_foreign_key "historis_jobs", "users"
-  add_foreign_key "industries_jobs", "industries"
-  add_foreign_key "industries_jobs", "jobs"
-  add_foreign_key "regions", "cities"
+  add_foreign_key "apply_jobs", "jobs", column: "jobs_id"
+  add_foreign_key "apply_jobs", "users"
+  add_foreign_key "cities", "regions", column: "regions_id"
+  add_foreign_key "cities_jobs", "cities", column: "cities_id"
+  add_foreign_key "cities_jobs", "jobs", column: "jobs_id"
+  add_foreign_key "companies_cities", "cities", column: "cities_id"
+  add_foreign_key "companies_cities", "companies", column: "companies_id"
+  add_foreign_key "favorite_jobs", "jobs", column: "jobs_id"
+  add_foreign_key "favorite_jobs", "users"
+  add_foreign_key "history_jobs", "jobs", column: "jobs_id"
+  add_foreign_key "history_jobs", "users"
+  add_foreign_key "industries_jobs", "industries", column: "industries_id"
+  add_foreign_key "industries_jobs", "jobs", column: "jobs_id"
+  add_foreign_key "jobs", "companies", column: "companies_id"
 end

test/fixtures/applies_jobs.yml

-# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
-
-one:
-  user: one
-  job: one
-  cv: 
-
-two:
-  user: two
-  job: two
-  cv: 

test/fixtures/cities.yml

-# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
-
-# This model initially had no columns defined. If you add columns to the
-# model remove the '{}' from the fixture names and add the columns immediately
-# below each fixture, per the syntax in the comments below
-#
-one: {}
-# column: value
-#
-two: {}
-# column: value

test/fixtures/companies.yml

-# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
-
-# This model initially had no columns defined. If you add columns to the
-# model remove the '{}' from the fixture names and add the columns immediately
-# below each fixture, per the syntax in the comments below
-#
-one: {}
-# column: value
-#
-two: {}
-# column: value

test/fixtures/industries.yml

-# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
-
-# This model initially had no columns defined. If you add columns to the
-# model remove the '{}' from the fixture names and add the columns immediately
-# below each fixture, per the syntax in the comments below
-#
-one: {}
-# column: value
-#
-two: {}
-# column: value

test/fixtures/jobs.yml

-# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
-
-# This model initially had no columns defined. If you add columns to the
-# model remove the '{}' from the fixture names and add the columns immediately
-# below each fixture, per the syntax in the comments below
-#
-one: {}
-# column: value
-#
-two: {}
-# column: value

test/fixtures/regions.yml

-# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
-
-one:
-  city: one
-  name: MyString
-
-two:
-  city: two
-  name: MyString

test/fixtures/users.yml

-# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
-
-# This model initially had no columns defined. If you add columns to the
-# model remove the '{}' from the fixture names and add the columns immediately
-# below each fixture, per the syntax in the comments below
-#
-one: {}
-# column: value
-#
-two: {}
-# column: value

test/models/applies_job_test.rb

-require "test_helper"
-
-class AppliesJobTest < ActiveSupport::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
-end

test/models/city_test.rb

-require "test_helper"
-
-class CityTest < ActiveSupport::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
-end

test/models/company_test.rb

-require "test_helper"
-
-class CompanyTest < ActiveSupport::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
-end

test/models/industry_test.rb

-require "test_helper"
-
-class IndustryTest < ActiveSupport::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
-end

test/models/job_test.rb

-require "test_helper"
-
-class JobTest < ActiveSupport::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
-end

test/models/region_test.rb

-require "test_helper"
-
-class RegionTest < ActiveSupport::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
-end

test/models/user_test.rb

-require "test_helper"
-
-class UserTest < ActiveSupport::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
-end