fix -part4

lib/service/ftp.rb

@@ -10,24 +10,24 @@ class FtpSever
   CONTENT_SERVER_DOMAIN_NAME = '192.168.1.156'
   CONTENT_SERVER_DOMAIN_NAME = '192.168.1.156'
   CONTENT_SERVER_USER_NAME = 'training'
   CONTENT_SERVER_USER_NAME = 'training'
   CONTENT_SERVER_USER_PASSWORD = 'training'
   CONTENT_SERVER_USER_PASSWORD = 'training'
-  DIRECTORY_CSV = './jobs.zip'
+  NAME_CSV = 'jobs.zip'
 
 
   def data_csv
   def data_csv
     donwload_csv
     donwload_csv
-    CSV.parse(File.read('lib/csv/jobs.csv'), headers: true)  
+    CSV.parse(File.read('lib/csv/jobs.csv'), headers: true)
   end
   end
 
 
   def logger
   def logger
-    @logger ||= Logger.new("#{Rails.root}/log/csv.log")
+    @logger ||= Logger.new(Rails.root.join('log', 'csv.log'))
   end
   end
 
 
   private
   private
 
 
   def donwload_csv
   def donwload_csv
     Net::FTP.open(CONTENT_SERVER_DOMAIN_NAME, CONTENT_SERVER_USER_NAME, CONTENT_SERVER_USER_PASSWORD) do |ftp|
     Net::FTP.open(CONTENT_SERVER_DOMAIN_NAME, CONTENT_SERVER_USER_NAME, CONTENT_SERVER_USER_PASSWORD) do |ftp|
-      ftp.getbinaryfile('jobs.zip')
-      Unzip.extract_zip(DIRECTORY_CSV, 'lib/csv')
-      File.delete(DIRECTORY_CSV) if File.exist?(DIRECTORY_CSV)
+      ftp.getbinaryfile(NAME_CSV)
+      Unzip.extract_zip(Rails.root.join(NAME_CSV), Rails.root.join('lib', 'csv'))
+      File.delete(Rails.root.join(NAME_CSV)) if File.exist?(Rails.root.join(NAME_CSV))
       logger.info 'Donwload & extract success'
       logger.info 'Donwload & extract success'
     end
     end
   end
   end

lib/service/import_data.rb

@@ -78,13 +78,13 @@ class ImportData
     data = data.to_s.delete('[]\"')
     data = data.to_s.delete('[]\"')
     city = City.find_or_create_by(name: data.strip) { |record| record.area = DOMESTIC }
     city = City.find_or_create_by(name: data.strip) { |record| record.area = DOMESTIC }
     city_id = city.id
     city_id = city.id
-    CityJob.create!(job_id: id_job, city_id: city_id)
+    CityJob.create(job_id: id_job, city_id: city_id)
   end
   end
 
 
   def make_foreign_industries_table(data, id_job)
   def make_foreign_industries_table(data, id_job)
-    data = data.to_s.gsub(',', '/').gsub('/', ' / ')
-    industry = Industry.find_or_create_by(name: data.strip)
+    industry_name = data.to_s.gsub(',', '/').gsub('/', ' / ')
+    industry = Industry.find_or_create_by(name: industry_name.strip)
     industry_id = industry.id
     industry_id = industry.id
-    IndustryJob.create!(industry_id: industry_id, job_id: id_job)
+    IndustryJob.create(industry_id: industry_id, job_id: id_job)
   end
   end
 end
 end