Add user_type to RemoteEvaluationMappings

This commit is contained in:
Sebastian Serth
2018-11-26 17:56:07 +01:00
parent bb10e191ed
commit 1131d08e2b
5 changed files with 16 additions and 9 deletions

View File

@@ -15,14 +15,12 @@ class RemoteEvaluationController < ApplicationController
# todo extra: validiere, ob files wirklich zur Übung gehören (wenn allowNewFiles-flag nicht gesetzt ist)
if (remote_evaluation_mapping = RemoteEvaluationMapping.find_by(:validation_token => validation_token))
puts remote_evaluation_mapping.exercise_id
puts remote_evaluation_mapping.user_id
_params = remote_evaluation_params.except(:validation_token)
_params[:exercise_id] = remote_evaluation_mapping.exercise_id
_params[:user_id] = remote_evaluation_mapping.user_id
_params[:cause] = "remoteAssess"
_params[:user_type] = "ExternalUser"
_params[:user_type] = remote_evaluation_mapping.user_type
@submission = Submission.create(_params)
render json: score_submission(@submission)

View File

@@ -398,13 +398,13 @@ class SubmissionsController < ApplicationController
private :with_server_sent_events
def create_remote_evaluation_mapping
user_id = @submission.user_id
user = @submission.user
exercise_id = @submission.exercise_id
remote_evaluation_mapping = RemoteEvaluationMapping.create(:user_id => user_id, :exercise_id => exercise_id)
remote_evaluation_mapping = RemoteEvaluationMapping.create(user: user, exercise_id: exercise_id)
# create .co file
path = "tmp/" + user_id.to_s + ".co"
path = "tmp/" + user.id.to_s + ".co"
# parse validation token
content = "#{remote_evaluation_mapping.validation_token}\n"
# parse remote request url

View File

@@ -2,9 +2,9 @@
class RemoteEvaluationMapping < ApplicationRecord
before_create :generate_token, unless: :validation_token?
belongs_to :exercise
belongs_to :user, class_name: 'ExternalUser'
belongs_to :user, polymorphic: true
def generate_token
self.validation_token = SecureRandom.urlsafe_base64
end
end
end