From b8662213534279e62206d0b9848d72083b1475d2 Mon Sep 17 00:00:00 2001 From: Karol Date: Sat, 24 Sep 2022 21:08:18 +0200 Subject: [PATCH] rename route --- app/controllers/exercises_controller.rb | 8 ++++---- app/services/proforma_service/convert_task_to_exercise.rb | 4 ++-- config/routes.rb | 2 +- spec/controllers/exercises_controller_spec.rb | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/controllers/exercises_controller.rb b/app/controllers/exercises_controller.rb index 5d5eec43..4f4c1679 100644 --- a/app/controllers/exercises_controller.rb +++ b/app/controllers/exercises_controller.rb @@ -18,9 +18,9 @@ class ExercisesController < ApplicationController before_action :set_course_token, only: [:implement] before_action :set_available_tips, only: %i[implement show new edit] - skip_before_action :verify_authenticity_token, only: %i[import_exercise import_uuid_check] - skip_after_action :verify_authorized, only: %i[import_exercise import_uuid_check] - skip_after_action :verify_policy_scoped, only: %i[import_exercise import_uuid_check], raise: false + skip_before_action :verify_authenticity_token, only: %i[import_task import_uuid_check] + skip_after_action :verify_authorized, only: %i[import_task import_uuid_check] + skip_after_action :verify_policy_scoped, only: %i[import_task import_uuid_check], raise: false rescue_from Pundit::NotAuthorizedError, with: :not_authorized_for_exercise @@ -169,7 +169,7 @@ class ExercisesController < ApplicationController render json: {uuid_found: true, update_right: true} end - def import_exercise + def import_task tempfile = Tempfile.new('codeharbor_import.zip') tempfile.write request.body.read.force_encoding('UTF-8') tempfile.rewind diff --git a/app/services/proforma_service/convert_task_to_exercise.rb b/app/services/proforma_service/convert_task_to_exercise.rb index a0cbeaf7..31b4f2c4 100644 --- a/app/services/proforma_service/convert_task_to_exercise.rb +++ b/app/services/proforma_service/convert_task_to_exercise.rb @@ -10,13 +10,13 @@ module ProformaService end def execute - import_exercise + import_task @exercise end private - def import_exercise + def import_task @exercise.assign_attributes( user: @user, title: @task.title, diff --git a/config/routes.rb b/config/routes.rb index dc276e13..9e3dc3b8 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -73,7 +73,7 @@ Rails.application.routes.draw do post :sync_all_to_runner_management, on: :collection end - post '/import_exercise' => 'exercises#import_exercise' + post '/import_task' => 'exercises#import_task' post '/import_uuid_check' => 'exercises#import_uuid_check' resources :exercises do diff --git a/spec/controllers/exercises_controller_spec.rb b/spec/controllers/exercises_controller_spec.rb index 05631045..b6c38477 100644 --- a/spec/controllers/exercises_controller_spec.rb +++ b/spec/controllers/exercises_controller_spec.rb @@ -539,10 +539,10 @@ describe ExercisesController do end end - describe 'POST #import_exercise' do + describe 'POST #import_task' do let(:codeharbor_link) { create(:codeharbor_link, user: user) } let!(:imported_exercise) { create(:fibonacci) } - let(:post_request) { post :import_exercise, body: zip_file_content } + let(:post_request) { post :import_task, body: zip_file_content } let(:zip_file_content) { 'zipped task xml' } let(:headers) { {'Authorization' => "Bearer #{codeharbor_link.api_key}"} }