Merge remote-tracking branch 'origin/master' into 104525318-history_import

# Conflicts:
#	Gemfile
#	app/models/domain.rb

lib/tasks/epp.rake

@@ -0,0 +1,19 @@
+namespace :epp do
+
+  desc 'EPP actions'
+  task all: :environment do
+    Rake::Task['epp:trim_documents'].invoke
+  end
+
+  desc 'Trim logs'
+  task trim_documents: :environment do
+    puts '-----> Running query'
+    sql = <<-SQL
+    UPDATE epp_logs SET request = regexp_replace(request, '<eis:legalDocument(.|\n)*?<\/eis:legalDocument>', '<eis:legalDocument>[FILTERED]<\eis:legalDocument>');
+    SQL
+    ApiLog::EppLog.connection.execute(sql)
+
+    puts "-----> Query done"
+  end
+end
+

lib/tasks/whois.rake

@@ -3,15 +3,24 @@ namespace :whois do
   task regenerate: :environment do
     start = Time.zone.now.to_f
 
-    @i = 0
     print "-----> Regenerate Registry whois_records table and sync with whois server..."
     ActiveRecord::Base.uncached do
-      puts "\n#{@i}"
-      Domain.included.find_in_batches(batch_size: 10000) do |batch|
-        batch.map(&:update_whois_record)
-        puts(@i += 10000)
-        GC.start
+
+      print "\n-----> Update domains whois_records"
+      Domain.find_in_batches.each do |group|
+        UpdateWhoisRecordJob.enqueue group.map(&:id), 'domain'
       end
+
+      print "\n-----> Update blocked domains whois_records"
+      BlockedDomain.find_in_batches.each do |group|
+        UpdateWhoisRecordJob.enqueue group.map(&:id), 'blocked'
+      end
+
+      print "\n-----> Update reserved domains whois_records"
+      ReservedDomain.find_in_batches.each do |group|
+        UpdateWhoisRecordJob.enqueue group.map(&:id), 'reserved'
+      end
+
     end
     puts "\n-----> all done in #{(Time.zone.now.to_f - start).round(2)} seconds"
   end