Fix Rubocop offenses

This commit is contained in:
Sebastian Serth
2024-06-16 14:16:45 +02:00
committed by Sebastian Serth
parent a3a0322540
commit 4e1e8c0f4d
3 changed files with 6 additions and 7 deletions

View File

@ -71,15 +71,14 @@ module StatisticsHelper
{
key: 'submissions_per_minute',
name: t('statistics.entries.exercises.submissions_per_minute'),
data: (Submission.where('created_at >= ?', DateTime.now - 1.hour).count.to_f / 60).round(2),
data: (Submission.where(created_at: DateTime.now - 1.hour..).count.to_f / 60).round(2),
unit: '/min',
url: statistics_graphs_path,
},
{
key: 'autosaves_per_minute',
name: t('statistics.entries.exercises.autosaves_per_minute'),
data: (Submission.where('created_at >= ?',
DateTime.now - 1.hour).where(cause: 'autosave').count.to_f / 60).round(2),
data: (Submission.where(created_at: DateTime.now - 1.hour..).where(cause: 'autosave').count.to_f / 60).round(2),
unit: '/min',
},
{
@ -121,13 +120,13 @@ module StatisticsHelper
key: 'active_in_last_hour',
name: t('statistics.entries.users.currently_active'),
data: ExternalUser.joins(:submissions)
.where(['submissions.created_at >= ?', DateTime.now - 5.minutes])
.where(submissions: {created_at: DateTime.now - 5.minutes..})
.distinct('external_users.id').count,
},
{
key: 'submissions_per_minute',
name: t('statistics.entries.exercises.submissions_per_minute'),
data: (Submission.where('created_at >= ?', DateTime.now - 1.hour).count.to_f / 60).round(2),
data: (Submission.where(created_at: DateTime.now - 1.hour..).count.to_f / 60).round(2),
unit: '/min',
axis: 'right',
},

View File

@ -85,7 +85,7 @@ class RequestForComment < ApplicationRecord
def last_per_user(count = 5)
from(row_number_user_sql, :request_for_comments)
.where('row_number <= ?', count)
.where(row_number: ..count)
.group('request_for_comments.id, request_for_comments.user_id, request_for_comments.user_type, ' \
'request_for_comments.exercise_id, request_for_comments.file_id, request_for_comments.question, ' \
'request_for_comments.created_at, request_for_comments.updated_at, request_for_comments.solved, ' \