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

Ensure Postgres always returns a duration

Browse Source
This commit is contained in:
Sebastian Serth
2020-12-14 19:57:11 +01:00
parent bc2e0d90c4
commit 2d2869765f
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/models/exercise.rb
View File

@ -245,7 +245,9 @@ class Exercise < ApplicationRecord
def get_quantiles(quantiles) def get_quantiles(quantiles)
quantiles_str = '[' + quantiles.join(',') + ']' quantiles_str = '[' + quantiles.join(',') + ']'
result = self.class.connection.execute(''" result = ActiveRecord::Base.transaction do
self.class.connection.execute(''"
SET LOCAL intervalstyle = 'iso_8601';
WITH working_time AS WITH working_time AS
( (
SELECT user_id, SELECT user_id,
@ -352,6 +354,7 @@ class Exercise < ApplicationRecord
SELECT unnest(percentile_cont(array#{quantiles_str}) within GROUP (ORDER BY working_time)) SELECT unnest(percentile_cont(array#{quantiles_str}) within GROUP (ORDER BY working_time))
FROM result FROM result
"'') "'')
end
if result.count > 0 if result.count > 0
begin begin
quantiles.each_with_index.map { |_q, i| ActiveSupport::Duration.parse(result[i]['unnest']).to_f } quantiles.each_with_index.map { |_q, i| ActiveSupport::Duration.parse(result[i]['unnest']).to_f }
@ -384,7 +387,10 @@ class Exercise < ApplicationRecord
def accumulated_working_time_for_only(user) def accumulated_working_time_for_only(user)
user_type = user.external_user? ? 'ExternalUser' : 'InternalUser' user_type = user.external_user? ? 'ExternalUser' : 'InternalUser'
begin begin
ActiveSupport::Duration.parse(self.class.connection.execute(''" result = ActiveRecord::Base.transaction do
self.class.connection.execute(''"
BEGIN;
SET LOCAL intervalstyle = 'iso_8601';
WITH WORKING_TIME AS WITH WORKING_TIME AS
(SELECT user_id, (SELECT user_id,
id, id,
@ -433,7 +439,9 @@ class Exercise < ApplicationRecord
SELECT e.external_id AS external_user_id, f.user_id, exercise_id, MAX(max_score) AS max_score, sum(working_time_new) AS working_time SELECT e.external_id AS external_user_id, f.user_id, exercise_id, MAX(max_score) AS max_score, sum(working_time_new) AS working_time
FROM FILTERED_TIMES_UNTIL_MAX f, EXTERNAL_USERS e FROM FILTERED_TIMES_UNTIL_MAX f, EXTERNAL_USERS e
WHERE f.user_id = e.id GROUP BY e.external_id, f.user_id, exercise_id WHERE f.user_id = e.id GROUP BY e.external_id, f.user_id, exercise_id
"'').first['working_time']).to_f "'')
end
ActiveSupport::Duration.parse(result.first['working_time']).to_f
rescue StandardError rescue StandardError
0 0
end end