Import resiliency (3/3)

app/assets/javascripts/cable.js

@@ -6,7 +6,7 @@
 //= require_tree ./channels
 
 (function() {
- if (this.App) this.App = {};
+ if (!this.App) this.App = {};
 
  App.cable = ActionCable.createConsumer();
 

app/assets/javascripts/setupv2.js

@@ -0,0 +1,134 @@
+/*jshint esversion: 6 */
+(function() {
+ var ready, check_progress, show_success, invitation_path, progress_path, success_path, display_progress, indicate_completion, indicate_failure, indicate_in_progress;
+
+ indicate_completion = function(step_indicator) {
+ $(step_indicator).addClass("border-green bg-green-light");
+
+ var status, completion_indicator;
+ status = $(step_indicator).find(".status");
+ if (status.hasClass("d-none")) {
+ status.removeClass("d-none");
+ }
+
+ completion_indicator = $(status).find(".complete-indicator");
+ failure_indicator = $(status).find(".failure-indicator");
+ spinner_indicator = $(status).find(".spinner");
+
+ $(completion_indicator).show();
+ $(failure_indicator).hide();
+ $(spinner_indicator).hide();
+ };
+
+ indicate_failure = function(step_indicator) {
+ $(step_indicator).addClass("border-red bg-red-light");
+
+ var status, failure_indicator;
+ status = $(step_indicator).find(".status");
+ if (status.hasClass("d-none")) {
+ status.removeClass("d-none");
+ }
+
+ completion_indicator = $(status).find(".complete-indicator");
+ failure_indicator = $(status).find(".failure-indicator");
+ spinner_indicator = $(status).find(".spinner");
+
+ $(failure_indicator).show();
+ $(completion_indicator).hide();
+ $(spinner_indicator).hide();
+ };
+
+ indicate_in_progress = function(step_indicator) {
+ let status;
+ status = $(step_indicator).find(".status");
+ if (status.hasClass("d-none")) {
+ status.removeClass("d-none");
+ }
+
+ completion_indicator = $(status).find(".complete-indicator");
+ failure_indicator = $(status).find(".failure-indicator");
+ spinner_indicator = $(status).find(".spinner");
+
+ $(step_indicator).addClass("border-green");
+
+ $(spinner_indicator).show();
+ $(failure_indicator).hide();
+ $(completion_indicator).hide();
+ };
+
+ display_progress = function(progress) {
+ let create_repo_progress_indicator = $("#create-repo-progress");
+ let import_repo_progress_indicator = $("#import-repo-progress");
+ switch(progress.status) {
+ case "creating_repo":
+ indicate_in_progress(create_repo_progress_indicator);
+ break;
+ case "importing_starter_code":
+ indicate_completion(create_repo_progress_indicator);
+ indicate_in_progress(import_repo_progress_indicator);
+ break;
+ case "errored":
+ indicate_failure(create_repo_progress_indicator);
+ indicate_failure(import_repo_progress_indicator);
+ break;
+ case "completed":
+ indicate_completion(create_repo_progress_indicator);
+ indicate_completion(import_repo_progress_indicator);
+ setTimeout(show_success, 500);
+ break;
+ }
+ };
+
+ success_path = function () {
+ return invitation_path() + "/success";
+ };
+
+ progress_path = function () {
+ return invitation_path() + "/progress";
+ };
+
+ job_path = function () {
+ return invitation_path();
+ };
+
+ invitation_path = function () {
+ const pathname = window.location.pathname;
+ let path_components = pathname.split("/");
+ path_components.pop();
+ return path_components.join("/");
+ };
+
+ show_success = function() {
+ location.href = success_path();
+ };
+
+ check_progress = function() {
+ const path = progress_path();
+
+ $.ajax({type: "GET", url: path}).done(function(data) {
+
+ display_progress(data);
+ setTimeout(check_progress, 3000);
+ });
+ };
+
+ start_job = function() {
+ const path = job_path();
+
+ $.ajax({type: "POST", url: path}).done(function(data) {
+
+ display_progress(data);
+ setTimeout(check_progress, 3000);
+ });
+ };
+
+ ready = (function() {
+ const setup_progress = $(".setupv2");
+ if (setup_progress.length !== 0) {
+ start_job();
+ check_progress();
+ }
+ });
+
+ $(document).ready(ready);
+}).call(this);

app/controllers/application_controller/feature_flags_dependency.rb

@@ -23,4 +23,9 @@ def repo_setup_enabled?
  logged_in? && current_user.feature_enabled?(:repo_setup)
  end
  helper_method :repo_setup_enabled?
+
+ def import_resiliency_enabled?
+ logged_in? && current_user.feature_enabled?(:import_resiliency)
+ end
+ helper_method :import_resiliency_enabled?
 end

app/controllers/assignment_invitations_controller.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+# rubocop:disable ClassLength
 class AssignmentInvitationsController < ApplicationController
  include InvitationsControllerMethods
  include RepoSetup
@@ -8,19 +9,79 @@ class AssignmentInvitationsController < ApplicationController
  before_action :ensure_submission_repository_exists, only: %i[setup setup_progress success]
  before_action :ensure_authorized_repo_setup, only: %i[setup setup_progress]
 
+ # rubocop:disable PerceivedComplexity
+ # rubocop:disable MethodLength
+ # rubocop:disable AbcSize
+ # rubocop:disable CyclomaticComplexity
  def accept
- create_submission do
- GitHubClassroom.statsd.increment("exercise_invitation.accept")
- if current_submission.starter_code_repo_id
- redirect_to setup_assignment_invitation_path
- else
- redirect_to success_assignment_invitation_path
+ if import_resiliency_enabled?
+ result = current_invitation.redeem_for(current_user, import_resiliency: import_resiliency_enabled?)
+ case result.status
+ when :success
+ GitHubClassroom.statsd.increment("exercise_invitation.accept")
+ if current_submission.starter_code_repo_id
+ redirect_to setup_assignment_invitation_path
+ else
+ current_invitation.completed!
+ redirect_to success_assignment_invitation_path
+ end
+ when :pending
+ GitHubClassroom.statsd.increment("exercise_invitation.accept")
+ redirect_to setupv2_assignment_invitation_path
+ when :error
+ GitHubClassroom.statsd.increment("exercise_invitation.fail")
+ current_invitation.errored!
+
+ flash[:error] = result.error
+ redirect_to assignment_invitation_path(current_invitation)
+ end
+ else
+ create_submission do
+ GitHubClassroom.statsd.increment("exercise_invitation.accept")
+ if current_submission.starter_code_repo_id
+ redirect_to setup_assignment_invitation_path
+ else
+ redirect_to success_assignment_invitation_path
+ end
  end
  end
  end
+ # rubocop:enable PerceivedComplexity
+ # rubocop:enable MethodLength
+ # rubocop:enable AbcSize
+ # rubocop:enable CyclomaticComplexity
 
  def setup; end
 
+ def setupv2
+ render status: 404 unless import_resiliency_enabled?
+ end
+
+ # rubocop:disable MethodLength
+ def create
+ if import_resiliency_enabled?
+ job_started = false
+ if current_invitation.accepted? || current_invitation.errored?
+ AssignmentRepo::CreateGitHubRepositoryJob.perform_later(current_assignment, current_user)
+ job_started = true
+ end
+ render json: {
+ job_started: job_started
+ }
+ else
+ render status: 404, json: {}
+ end
+ end
+ # rubocop:enable MethodLength
+
+ def progress
+ if import_resiliency_enabled?
+ render json: { status: current_invitation.status }
+ else
+ render status: 404, json: {}
+ end
+ end
+
  def setup_progress
  perform_setup(current_submission, classroom_config) if configurable_submission?
 
@@ -104,3 +165,4 @@ def required_scopes
  GitHubClassroom::Scopes::ASSIGNMENT_STUDENT
  end
 end
+# rubocop:enable ClassLength

app/jobs/assignment_repo/create_github_repository_job.rb

@@ -19,32 +19,25 @@ class CreateGitHubRepositoryJob < ApplicationJob
  def perform(assignment, user)
  start = Time.zone.now
 
+ assignment.invitation&.creating_repo!
+
  creator = Creator.new(assignment: assignment, user: user)
 
  creator.verify_organization_has_private_repos_available!
 
  ActionCable.server.broadcast(
  RepositoryCreationStatusChannel.channel(user_id: user.id),
- text: CREATE_REPO
+ text: CREATE_REPO,
+ status: assignment.invitation&.status
  )
 
  assignment_repo = assignment.assignment_repos.build(
  github_repo_id: creator.create_github_repository!,
  user: user
  )
 
- ActionCable.server.broadcast(
- RepositoryCreationStatusChannel.channel(user_id: user.id),
- text: ADDING_COLLABORATOR
- )
-
  creator.add_user_to_repository!(assignment_repo.github_repo_id)
 
- ActionCable.server.broadcast(
- RepositoryCreationStatusChannel.channel(user_id: user.id),
- text: IMPORT_STARTER_CODE
- )
-
  creator.push_starter_code!(assignment_repo.github_repo_id) if assignment.starter_code?
 
  begin
@@ -56,12 +49,29 @@ def perform(assignment, user)
  duration_in_millseconds = (Time.zone.now - start) * 1_000
  GitHubClassroom.statsd.timing("exercise_repo.create.time", duration_in_millseconds)
 
- PorterStatusJob.perform_later(assignment_repo, user)
+ if assignment.starter_code?
+ assignment.invitation&.importing_starter_code!
+ ActionCable.server.broadcast(
+ RepositoryCreationStatusChannel.channel(user_id: user.id),
+ text: IMPORT_STARTER_CODE,
+ status: assignment.invitation&.status
+ )
+ PorterStatusJob.perform_later(assignment_repo, user)
+ else
+ assignment.invitation&.completed!
+ ActionCable.server.broadcast(
+ RepositoryCreationStatusChannel.channel(user_id: user.id),
+ text: Creator::REPOSITORY_CREATION_COMPLETE,
+ status: assignment.invitation&.status
+ )
+ end
  rescue Creator::Result::Error => err
  creator.delete_github_repository(assignment_repo.try(:github_repo_id))
+ assignment.invitation&.errored!
  ActionCable.server.broadcast(
  RepositoryCreationStatusChannel.channel(user_id: user.id),
- text: err
+ text: err,
+ status: assignment.invitation&.status
  )
  raise err
  end

app/jobs/assignment_repo/porter_status_job.rb

@@ -32,15 +32,19 @@ def perform(assignment_repo, user)
 
  case result
  when Creator::REPOSITORY_STARTER_CODE_IMPORT_FAILED
+ assignment_repo.assignment.invitation&.errored!
  ActionCable.server.broadcast(
  RepositoryCreationStatusChannel.channel(user_id: user.id),
- text: result
+ text: result,
+ status: assignment_repo.assignment.invitation&.status
  )
  logger.warn result.to_s
  when Creator::REPOSITORY_CREATION_COMPLETE
+ assignment_repo.assignment.invitation&.completed!
  ActionCable.server.broadcast(
  RepositoryCreationStatusChannel.channel(user_id: user.id),
- text: result
+ text: result,
+ status: assignment_repo.assignment.invitation&.status
  )
  end
  end

app/models/assignment_invitation.rb

@@ -3,6 +3,8 @@
 class AssignmentInvitation < ApplicationRecord
  include ShortKey
 
+ enum status: %i[unaccepted accepted creating_repo importing_starter_code completed errored]
+
  default_scope { where(deleted_at: nil) }
 
  update_index("stafftools#assignment_invitation") { self }
@@ -20,12 +22,18 @@ class AssignmentInvitation < ApplicationRecord
 
  after_initialize :assign_key
 
+ after_initialize :set_defaults, unless: :persisted?
+
  delegate :title, to: :assignment
 
  # Public: Redeem an AssignmentInvtiation for a User invitee.
  #
  # Returns a AssignmentRepo::Creator::Result.
- def redeem_for(invitee)
+ #
+ # rubocop:disable MethodLength
+ # rubocop:disable AbcSize
+ def redeem_for(invitee, import_resiliency: false)
+ accepted!
  if (repo_access = RepoAccess.find_by(user: invitee, organization: organization))
  assignment_repo = AssignmentRepo.find_by(assignment: assignment, repo_access: repo_access)
  return AssignmentRepo::Creator::Result.success(assignment_repo) if assignment_repo.present?
@@ -36,8 +44,14 @@ def redeem_for(invitee)
 
  return AssignmentRepo::Creator::Result.failed("Invitations for this assignment have been disabled.") unless enabled?
 
- AssignmentRepo::Creator.perform(assignment: assignment, user: invitee)
+ if import_resiliency
+ AssignmentRepo::Creator::Result.pending
+ else
+ AssignmentRepo::Creator.perform(assignment: assignment, user: invitee)
+ end
  end
+ # rubocop:enable MethodLength
+ # rubocop:enable AbcSize
 
  def to_param
  key
@@ -52,4 +66,8 @@ def enabled?
  def assign_key
  self.key ||= SecureRandom.hex(16)
  end
+
+ def set_defaults
+ self.status ||= :unaccepted
+ end
 end