diff --git a/app/services/sftp/directory.rb b/app/services/sftp/directory.rb index 49cb68f9..15dbc34f 100644 --- a/app/services/sftp/directory.rb +++ b/app/services/sftp/directory.rb @@ -4,8 +4,8 @@ require 'uri' module Sftp class Directory def self.open(path: '/data/survey_responses/clean', &block) - sftptogo_url = ENV['ECP_SFTPTOGO_URL'] - uri = URI.parse(sftptogo_url) + sftp_url = ENV['SFTP_URL'] + uri = URI.parse(sftp_url) Net::SFTP.start(uri.host, uri.user, password: uri.password) do |sftp| sftp.dir.foreach(path) do |entry| next unless entry.file? diff --git a/app/services/sftp/race_loader.rb b/app/services/sftp/race_loader.rb deleted file mode 100644 index 49f805b1..00000000 --- a/app/services/sftp/race_loader.rb +++ /dev/null @@ -1,32 +0,0 @@ -require 'net/sftp' -require 'uri' - -module Sftp - class RaceLoader - def self.load_data(path: '/data/survey_responses/') - SurveyItemResponse.update_all(student_id: nil) - StudentRace.delete_all - Student.delete_all - - sftptogo_url = ENV['SFTPTOGO_URL'] - uri = URI.parse(sftptogo_url) - Net::SFTP.start(uri.host, uri.user, password: uri.password) do |sftp| - sftp.dir.foreach(path) do |entry| - filename = entry.name - puts filename - - sftp.file.open(filepath(path:, filename:), 'r') do |f| - StudentLoader.from_file(file: f, rules: []) - end - end - end - end - - def self.filepath(path:, filename:) - path += '/' unless path.end_with?('/') - "#{path}#{filename}" - end - - private_class_method :filepath - end -end diff --git a/lib/tasks/upload.rake b/lib/tasks/upload.rake index 46972cb3..a1a2a10d 100644 --- a/lib/tasks/upload.rake +++ b/lib/tasks/upload.rake @@ -7,8 +7,8 @@ namespace :upload do next if filename.start_with?('.') # skip hidden files and ./.. directories # this can probably be replaced with Dir.join or similar input_filename = Rails.root.join('tmp', 'data', 'rpp_data', 'clean', filename).to_s - sftptogo_url = ENV['SFTPTOGO_URL'] - uri = URI.parse(sftptogo_url) + sftp_url = ENV['SFTP_URL'] + uri = URI.parse(sftp_url) Net::SFTP.start(uri.host, uri.user, password: uri.password) do |sftp| puts "Uploading #{filename}..." sftp.upload!(input_filename, "/data/survey_responses/clean/#{filename}") @@ -21,7 +21,7 @@ namespace :upload do # the open method already prints all the contents... end end - + desc 'upload cleaned ECP CSVs to the SFTP server' task ecp: :environment do new_files = Array.new @@ -30,8 +30,8 @@ namespace :upload do next if filename.start_with?('.') # skip hidden files and ./.. directories # this can probably be replaced with Dir.join or similar input_filename = Rails.root.join('tmp', 'data', 'ecp_data', 'clean', filename).to_s - sftptogo_url = ENV['ECP_SFTPTOGO_URL'] - uri = URI.parse(sftptogo_url) + sftp_url = ENV['SFTP_URL'] + uri = URI.parse(sftp_url) Net::SFTP.start(uri.host, uri.user, password: uri.password) do |sftp| puts "Uploading #{filename}..." sftp.upload!(input_filename, "/data/survey_responses/clean/#{filename}") @@ -44,7 +44,7 @@ namespace :upload do # the open method already prints all the contents... end end - + desc 'upload cleaned MCIEA CSVs to the SFTP server' task mciea: :environment do new_files = Array.new @@ -53,8 +53,8 @@ namespace :upload do next if filename.start_with?('.') # skip hidden files and ./.. directories # this can probably be replaced with Dir.join or similar input_filename = Rails.root.join('tmp', 'data', 'mciea_data', 'clean', filename).to_s - sftptogo_url = ENV['MCIEA_SFTPTOGO_URL'] - uri = URI.parse(sftptogo_url) + sftp_url = ENV['SFTP_URL'] + uri = URI.parse(sftp_url) Net::SFTP.start(uri.host, uri.user, password: uri.password) do |sftp| puts "Uploading #{filename}..." sftp.upload!(input_filename, "/data/survey_responses/clean/#{filename}") @@ -67,4 +67,4 @@ namespace :upload do # the open method already prints all the contents... end end -end \ No newline at end of file +end