first edit this branch

app/models/city.rb

@@ -14,6 +14,10 @@
 #
 #
 
 
 class City < ApplicationRecord
 class City < ApplicationRecord
+<<<<<<< HEAD
   scope :vn_cities, -> {where region: "Việt Nam"}
   scope :vn_cities, -> {where region: "Việt Nam"}
   scope :inter_cities, -> {where region: "#"}
   scope :inter_cities, -> {where region: "#"}
+=======
+  has_many :city_jobs
+>>>>>>> first edit this branch
 end
 end

app/models/city_job.rb

@@ -22,4 +22,12 @@
 class CityJob < ApplicationRecord
 class CityJob < ApplicationRecord
   belongs_to :city
   belongs_to :city
   belongs_to :job
   belongs_to :job
+
+  def city_id
+    self.city.id
+  end
+
+  def job_id
+    self.job.id
+  end
 end
 end

app/models/job.rb

@@ -30,4 +30,6 @@
 
 
 class Job < ApplicationRecord
 class Job < ApplicationRecord
   belongs_to :company
   belongs_to :company
+
+  has_many :city_jobs
 end
 end