Skip to content

Remove default_scope for reordering records #285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bradleyprice wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove default_scope for reordering records #285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions app/models/ping.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ class Ping < ApplicationRecord
validates(:status, presence: true)
validates(:response_time, presence: true)

default_scope { order(created_at: :desc) }

after_create(:send_to_ping_notifier, unless: :skip_callbacks)

def self.without_outliers
Expand Down
2 changes: 1 addition & 1 deletion app/models/website.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class Website < ApplicationRecord
VALID_URL_REGEX = /\A#{URI::regexp(['http', 'https'])}\z/

has_many :pings, dependent: :delete_all
has_many :recent_pings, -> { limit(5) }, class_name: 'Ping'
has_many :recent_pings, -> { order(created_at: :desc).limit(5) }, class_name: 'Ping'
has_many :daily_pings, -> { limit(1_440) }, class_name: 'Ping'

# Only query the max number from pagination.
Expand Down
4 changes: 2 additions & 2 deletions app/services/notifiers/ping_notifier.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ def can_notify?
end

def first_ping
@first_ping ||= previous_ping.nil?
previous_ping.nil?
end

def previous_ping
website.pings.second
@previous_ping ||= website.pings.order(created_at: :desc).second
end

def message
Expand Down