htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reduced perceived complexity

Browse Source
This commit is contained in:
Karol
2019-12-18 17:06:31 +01:00
parent 2afbcacb1a
commit 12c76b2fe4
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/services/exercise_service/check_external.rb
View File

@ -13,20 +13,23 @@ module ExerciseService
req.headers['Authorization'] = 'Bearer ' + @codeharbor_link.api_key req.headers['Authorization'] = 'Bearer ' + @codeharbor_link.api_key
req.body = {uuid: @uuid}.to_json req.body = {uuid: @uuid}.to_json
end end
response_hash = JSON.parse(response.body, symbolize_names: true) response_hash = JSON.parse(response.body, symbolize_names: true).slice(:exercise_found, :update_right)
message = if response_hash[:exercise_found]
response_hash[:update_right] ? I18n.t('exercises.export_codeharbor.check.exercise_found') : I18n.t('exercises.export_codeharbor.check.exercise_found_no_right')
else
I18n.t('exercises.export_codeharbor.check.no_exercise')
end
{error: false, message: message}.merge(response_hash.slice(:exercise_found, :update_right)) {error: false, message: message(response_hash[:exercise_found], response_hash[:update_right])}.merge(response_hash)
rescue Faraday::Error, JSON::ParserError rescue Faraday::Error, JSON::ParserError
{error: true, message: I18n.t('exercises.export_codeharbor.error')} {error: true, message: I18n.t('exercises.export_codeharbor.error')}
end end
private private
def message(exercise_found, update_right)
if exercise_found
update_right ? I18n.t('exercises.export_codeharbor.check.exercise_found') : I18n.t('exercises.export_codeharbor.check.exercise_found_no_right')
else
I18n.t('exercises.export_codeharbor.check.no_exercise')
end
end
def connection def connection
Faraday.new(url: @codeharbor_link.check_uuid_url) do |faraday| Faraday.new(url: @codeharbor_link.check_uuid_url) do |faraday|
faraday.options[:open_timeout] = 5 faraday.options[:open_timeout] = 5