n_strand migrations and fix page error for old course copies

all migrations are put on an n_strand for the course's root
account now. This is to prevent a school copying all its
course at a semester boundary from starving other jobs.

Also, some old content migration objects don't have the
migration type set which causes a page error in the new UI

Test Plan:
 * in the /jobs UI a migration should have a strand name like
   migrations:import_content:#{account_id}
 * Course copies from new migration UI and through course settings
   should work and not cause page errors when the new UI is refreshed
 * Also removed the question mark for the checkbox labeled
   "Select migration content"

closes CNVS-6951

Change-Id: Ifbecbc49c40b35c3212e39e92b753c14e499ed6c
Reviewed-on: https://gerrit.instructure.com/22427
QA-Review: August Thornton <august@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: James Williams  <jamesw@instructure.com>
Product-Review: Bracken Mosbacker <bracken@instructure.com>

Author: bracken

app/controllers/content_imports_controller.rb

@@ -126,8 +126,8 @@ def copy_course_content
                                     :source_course => @source_course,
                                     :copy_options => copy_params,
                                     :migration_type => 'course_copy_importer')
+      cm.queue_migration
       cm.workflow_state = 'created'
-      cm.copy_course
       render :json => copy_status_json(cm, @context, @current_user, session)
     end
   end

app/models/content_migration.rb

@@ -124,6 +124,10 @@ def strand=(s)
   def strand
     migration_settings[:strand]
   end
+
+  def n_strand
+    ["migrations:import_content", self.root_account.try(:global_id) || "global"]
+  end
 
   def migration_ids_to_import=(val)
     migration_settings[:migration_ids_to_import] = val
@@ -323,17 +327,25 @@ def queue_migration
     check_quiz_id_prepender
     plugin = Canvas::Plugin.find(migration_type)
     if plugin
+      queue_opts = {:priority => Delayed::LOW_PRIORITY, :max_attempts => 1}
+      if self.strand
+        queue_opts[:strand] = self.strand
+      else
+        queue_opts[:n_strand] = self.n_strand
+      end
+
       if self.workflow_state == 'exported' && !plugin.settings[:skip_conversion_step]
         # it's ready to be imported
         self.workflow_state = :importing
         self.save
-        import_content
+        self.send_later_enqueue_args(:import_content, queue_opts)
       else
         # find worker and queue for conversion
         begin
           if Canvas::Migration::Worker.const_defined?(plugin.settings['worker'])
             self.workflow_state = :exporting
-            job = Canvas::Migration::Worker.const_get(plugin.settings['worker']).enqueue(self)
+            worker_class = Canvas::Migration::Worker.const_get(plugin.settings['worker'])
+            job = Delayed::Job.enqueue(worker_class.new(self.id), queue_opts)
             self.save
             job
           else
@@ -429,7 +441,7 @@ def import_content
       clear_migration_data
     end
   end
-  handle_asynchronously :import_content, :priority => Delayed::LOW_PRIORITY, :max_attempts => 1
+  alias_method :import_content_without_send_later, :import_content
 
   def prepare_data(data)
     data = data.with_indifferent_access if data.is_a? Hash
@@ -461,12 +473,6 @@ def date_shift_options
     self.migration_settings[:date_shift_options]
   end
 
-  def copy_course
-    worker = Canvas::Migration::Worker::CourseCopyWorker.new
-    worker.perform(self)
-  end
-  handle_asynchronously :copy_course, :priority => Delayed::LOW_PRIORITY, :max_attempts => 1
-  
   scope :for_context, lambda { |context| where(:context_id => context, :context_type => context.class.to_s) }
 
   scope :successful, where(:workflow_state => 'imported')

app/views/jst/content_migrations/ProgressingIssues.handlebars

@@ -2,4 +2,4 @@
 <ul class="unstyled well collectionViewItems"></ul>
 {{/if}}
 
-<div class="paginatedLoadingIndicator">Loading</div>
+<div class="paginatedLoadingIndicator">{{#t "loading"}}Loading{{/t}}</div>

app/views/jst/content_migrations/subviews/SelectContentCheckbox.handlebars

@@ -1,3 +1,3 @@
 <label class="checkbox" for="selectContentCheckbox">
-  <input id="selectContentCheckbox" type="checkbox" />{{#t "select_migration_label"}}Select migration content?{{/t}}
+  <input id="selectContentCheckbox" type="checkbox" />{{#t "select_migration_label"}}Select migration content{{/t}}
 </label>

lib/api/v1/content_migration.rb

@@ -44,7 +44,7 @@ def content_migration_json(migration, current_user, session, attachment_prefligh
     json[:migration_issues_count] = migration.migration_issues.count
     if attachment_preflight
       json[:pre_attachment] = attachment_preflight
-    elsif migration.attachment && migration.migration_type != 'course_copy_importer'
+    elsif migration.attachment && !migration.for_course_copy?
       json[:attachment] = attachment_json(migration.attachment, current_user, {}, {:can_manage_files => true})
     end
     if migration.job_progress

lib/canvas/migration/worker/course_copy_worker.rb

@@ -62,7 +62,7 @@ def perform(cm=nil)
           cm.context.copy_attachments_from_course(source, :content_export => ce, :content_migration => cm)
           cm.update_import_progress(20)
 
-          cm.import_content_without_send_later
+          cm.import_content
           cm.workflow_state = :imported
           cm.save
           cm.update_import_progress(100)

lib/cc/importer/cc_worker.rb

@@ -53,7 +53,7 @@ def perform
       cm.update_conversion_progress(100)
 
       if cm.import_immediately?
-         cm.import_content_without_send_later
+         cm.import_content
          cm.update_import_progress(100)
          saved = cm.save
          if converter.respond_to?(:post_process)

spec/apis/v1/content_migrations_api_spec.rb

@@ -101,6 +101,20 @@
       course_with_student_logged_in(:course => @course, :active_all => true)
       api_call(:get, @migration_url, @params, {}, {}, :expected_status => 401)
     end
+
+    it "should not return attachment for course copies course copies" do
+      @migration.migration_type = nil
+      @migration.source_course_id = @course.id
+      @attachment = Attachment.create!(:context => @migration, :filename => "test.zip", :uploaded_data => StringIO.new("test file"))
+      @attachment.file_state = "deleted"
+      @attachment.workflow_state = "unattached"
+      @attachment.save
+      @migration.attachment = @attachment
+      @migration.save!
+
+      json = api_call(:get, @migration_url, @params)
+      json["attachment"].should be_nil
+    end
   end
 
   describe 'create' do

spec/apis/v1/courses_api_spec.rb

@@ -1796,8 +1796,8 @@ def run_copy(to_id=nil, from_id=nil, options={})
 
     api_call(:get, status_url, { :controller => 'content_imports', :action => 'copy_course_status', :course_id => @copy_to.to_param, :id => data['id'].to_param, :format => 'json' })
     (JSON.parse(response.body)).tap do |res|
-      res['workflow_state'].should == 'created'
-      res['progress'].should be_nil
+      res['workflow_state'].should == 'started'
+      res['progress'].should == 0
     end
 
     run_jobs

spec/models/content_migration_spec.rb

@@ -63,7 +63,8 @@
     end
 
     def run_course_copy(warnings=[])
-      @cm.copy_course_without_send_later
+      worker = Canvas::Migration::Worker::CourseCopyWorker.new
+      worker.perform(@cm)
       @cm.reload
       if @cm.migration_settings[:last_error]
         er = ErrorReport.last