Merge branch 'feature/rake_task_crawler' into 'master'

Fix association, model

See merge request !3

app/models/city_job.rb

-class CityJob < ApplicationRecord
-  belongs_to :city
-  belongs_to :job
-end

app/models/industry_job.rb

-class IndustryJob < ApplicationRecord
-  belongs_to :industry
-  belongs_to :job
-end

db/migrate/20200317071357_create_jobs.rb

@@ -10,7 +10,10 @@ class CreateJobs < ActiveRecord::Migration[6.0]
 
       t.text :job_description
       
+      t.belongs_to :company
+
       t.timestamps
     end
+    
   end
 end

db/migrate/20200318055923_add_references_company_to_jobs.rb

-class AddReferencesCompanyToJobs < ActiveRecord::Migration[6.0]
-  def change
-    add_reference :jobs, :company, null: false, foreign_key: true
-  end
-end

db/migrate/20200320100139_create_city_job.rb → db/migrate/20200403070221_create_join_table_city_job.rb

-class CreateCityJob < ActiveRecord::Migration[6.0]
+class CreateJoinTableCityJob < ActiveRecord::Migration[6.0]
   def change
-    create_table :city_jobs do |t|
-      t.references :city, null: false, foreign_key: true
-      t.references :job, null: false, foreign_key: true
+    create_join_table :cities, :jobs do |t|
+      t.index [:city_id, :job_id]
+      t.index [:job_id, :city_id]
     end
   end
 end

db/migrate/20200320101302_create_industry_job.rb → db/migrate/20200403070245_create_join_table_industry_job.rb

-class CreateIndustryJob < ActiveRecord::Migration[6.0]
+class CreateJoinTableIndustryJob < ActiveRecord::Migration[6.0]
   def change
-    create_table :industry_jobs do |t|
-      t.references :industry, null: false, foreign_key: true
-      t.references :job, null: false, foreign_key: true
+    create_join_table :industries, :jobs do |t|
+      t.index [:industry_id, :job_id]
+      t.index [:job_id, :industry_id]
     end
   end
 end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2020_03_20_101302) do
+ActiveRecord::Schema.define(version: 2020_04_03_070245) do
 
   create_table "applies", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
     t.bigint "user_id", null: false
@@ -27,11 +27,11 @@ ActiveRecord::Schema.define(version: 2020_03_20_101302) do
     t.datetime "updated_at", precision: 6, null: false
   end
 
-  create_table "city_jobs", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "cities_jobs", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
     t.bigint "city_id", null: false
     t.bigint "job_id", null: false
-    t.index ["city_id"], name: "index_city_jobs_on_city_id"
-    t.index ["job_id"], name: "index_city_jobs_on_job_id"
+    t.index ["city_id", "job_id"], name: "index_cities_jobs_on_city_id_and_job_id"
+    t.index ["job_id", "city_id"], name: "index_cities_jobs_on_job_id_and_city_id"
   end
 
   create_table "companies", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
@@ -58,11 +58,11 @@ ActiveRecord::Schema.define(version: 2020_03_20_101302) do
     t.datetime "updated_at", precision: 6, null: false
   end
 
-  create_table "industry_jobs", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "industries_jobs", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
     t.bigint "industry_id", null: false
     t.bigint "job_id", null: false
-    t.index ["industry_id"], name: "index_industry_jobs_on_industry_id"
-    t.index ["job_id"], name: "index_industry_jobs_on_job_id"
+    t.index ["industry_id", "job_id"], name: "index_industries_jobs_on_industry_id_and_job_id"
+    t.index ["job_id", "industry_id"], name: "index_industries_jobs_on_job_id_and_industry_id"
   end
 
   create_table "jobs", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
@@ -73,9 +73,9 @@ ActiveRecord::Schema.define(version: 2020_03_20_101302) do
     t.string "salary"
     t.string "expiration_date"
     t.text "job_description"
+    t.bigint "company_id"
     t.datetime "created_at", precision: 6, null: false
     t.datetime "updated_at", precision: 6, null: false
-    t.bigint "company_id", null: false
     t.index ["company_id"], name: "index_jobs_on_company_id"
   end
 
@@ -90,11 +90,6 @@ ActiveRecord::Schema.define(version: 2020_03_20_101302) do
 
   add_foreign_key "applies", "jobs"
   add_foreign_key "applies", "users"
-  add_foreign_key "city_jobs", "cities"
-  add_foreign_key "city_jobs", "jobs"
   add_foreign_key "favorites", "jobs"
   add_foreign_key "favorites", "users"
-  add_foreign_key "industry_jobs", "industries"
-  add_foreign_key "industry_jobs", "jobs"
-  add_foreign_key "jobs", "companies"
 end

lib/tasks/crawler.rake

@@ -33,7 +33,7 @@ namespace :crawler do
           salary: nil,
           expiration_date: nil,
           job_description: nil,
-          company_id: nil
+          company_id: nil,
         }
 
         # Company attributes
@@ -45,10 +45,10 @@ namespace :crawler do
         }
 
         # Defind city ids array
-        city_ids = []
+        cities = []
 
         # Defind industry ids array
-        industry_ids = []
+        industries = []
         
         # Check what template job belongs to 
         if html_job_detail.at_css("#uni_container .MyJobDetail")
@@ -75,8 +75,8 @@ namespace :crawler do
               # Check exist or create city
               ele.css("b a").each_with_index do |ele, index|
                 if index > 0
-                  city_id = check_exist_or_create_city(ele.text.gsub(",",""))
-                  city_ids << city_id
+                  city = check_exist_or_create_city(ele.text.gsub(",",""))
+                  cities << city
                 end
               end
             when "Cấp bậc: "
@@ -88,8 +88,8 @@ namespace :crawler do
             when "Ngành nghề: "
               # Check exist or create industry
               ele.css("b a").each_with_index do |ele, index|
-                industry_id = check_exist_or_create_industry(ele.text.gsub(",",""))
-                industry_ids << industry_id
+                industry = check_exist_or_create_industry(ele.text.gsub(",",""))
+                industries << industry
               end
             else
               job_attributes[:expiration_date] = ele.text.gsub("Hết hạn nộp: ","")
@@ -131,8 +131,8 @@ namespace :crawler do
               # Check exist or create city
               ele.css("span a").each_with_index do |ele, index|
                 if index > 0
-                  city_id = check_exist_or_create_city(ele.text.gsub(",",""))
-                  city_ids << city_id
+                  city = check_exist_or_create_city(ele.text.gsub(",",""))
+                  cities << city
                 end
               end
             when "Cấp bậc"
@@ -144,8 +144,8 @@ namespace :crawler do
             when "Ngành nghề"
               # Check exist or create industry
               ele.css("span a").each_with_index do |ele, index|
-                industry_id = check_exist_or_create_industry(ele.text.gsub(",",""))
-                industry_ids << industry_id
+                industry = check_exist_or_create_industry(ele.text.gsub(",",""))
+                industries << industry
               end
             else
               job_attributes[:expiration_date] = ele.css("span").text
@@ -179,8 +179,8 @@ namespace :crawler do
               # Check exist or create city
               ele.css("span a").each_with_index do |ele, index|
                 if index > 0
-                  city_id = check_exist_or_create_city(ele.text)
-                  city_ids << city_id
+                  city = check_exist_or_create_city(ele.text)
+                  cities << city
                 end
               end
             when "Cấp bậc"
@@ -190,8 +190,8 @@ namespace :crawler do
             when "Ngành nghề"
               # Check exist or create industry
               ele.css("span a").each_with_index do |ele, index|
-                industry_id = check_exist_or_create_industry(ele.text)
-                industry_ids << industry_id
+                industry = check_exist_or_create_industry(ele.text)
+                industries << industry
               end
             when "Hết hạn nộp"
               job_attributes[:expiration_date] = ele.css("span").text
@@ -209,21 +209,20 @@ namespace :crawler do
 
         # Check exist or create company
         job_attributes[:company_id] = check_exist_or_create_company(company_attributes)
-
         # Create job
-        job_id = check_exist_or_create_job(job_attributes)
+        job = check_exist_or_create_job(job_attributes)
 
         # Create city_job
-        if city_ids.length > 0
-          city_ids.each do |city_id|
-            check_exist_or_create_city_job(city_id, job_id)
+        if cities.length > 0
+          cities.each do |city|
+            job.cities << city
           end
         end
 
         # Create industry_job
-        if industry_ids.length > 0
-          industry_ids.each do |industry_id|
-            check_exist_or_create_industry_job(industry_id, job_id)
+        if industries.length > 0
+          industries.each do |industry|
+            job.industries << industry
           end
         end
 
@@ -241,25 +240,16 @@ namespace :crawler do
 
   def check_exist_or_create_city(city_title)
     find_city = City.find_or_create_by(title: city_title)
-    return find_city.id
+    return find_city
   end
 
   def check_exist_or_create_industry(industry_title)
     find_industry = Industry.find_or_create_by(title: industry_title)
-    return find_industry.id
+    return find_industry
   end
 
   def check_exist_or_create_job(job_attributes)
     job = Job.find_or_create_by(job_attributes)
-    return job.id
-  end
-
-  def check_exist_or_create_city_job(city_id, job_id)
-    return CityJob.find_or_create_by(city_id: city_id, job_id: job_id)
+    return job
   end
-
-  def check_exist_or_create_industry_job(industry_id, job_id)
-    return IndustryJob.find_or_create_by(industry_id: industry_id, job_id: job_id)
-  end
-
 end