Autofix Rubocop Rails/RedundantForeignKey (#23731)

This commit is contained in:
Nick Schonning 2023-02-19 20:19:40 -05:00 committed by GitHub
parent 8ef09813a2
commit 597767a9f7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 8 additions and 20 deletions

View file

@ -2459,18 +2459,6 @@ Rails/RakeEnvironment:
- 'lib/tasks/repo.rake' - 'lib/tasks/repo.rake'
- 'lib/tasks/statistics.rake' - 'lib/tasks/statistics.rake'
# Offense count: 8
# This cop supports safe autocorrection (--autocorrect).
Rails/RedundantForeignKey:
Exclude:
- 'app/models/custom_filter.rb'
- 'app/models/follow_recommendation.rb'
- 'app/models/report.rb'
- 'app/models/status.rb'
- 'app/models/user_ip.rb'
- 'db/post_migrate/20221101190723_backfill_admin_action_logs.rb'
- 'db/post_migrate/20221206114142_backfill_admin_action_logs_again.rb'
# Offense count: 29 # Offense count: 29
# Configuration parameters: Include. # Configuration parameters: Include.
# Include: db/**/*.rb # Include: db/**/*.rb

View file

@ -33,8 +33,8 @@ class CustomFilter < ApplicationRecord
enum action: [:warn, :hide], _suffix: :action enum action: [:warn, :hide], _suffix: :action
belongs_to :account belongs_to :account
has_many :keywords, class_name: 'CustomFilterKeyword', foreign_key: :custom_filter_id, inverse_of: :custom_filter, dependent: :destroy has_many :keywords, class_name: 'CustomFilterKeyword', inverse_of: :custom_filter, dependent: :destroy
has_many :statuses, class_name: 'CustomFilterStatus', foreign_key: :custom_filter_id, inverse_of: :custom_filter, dependent: :destroy has_many :statuses, class_name: 'CustomFilterStatus', inverse_of: :custom_filter, dependent: :destroy
accepts_nested_attributes_for :keywords, reject_if: :all_blank, allow_destroy: true accepts_nested_attributes_for :keywords, reject_if: :all_blank, allow_destroy: true
validates :title, :context, presence: true validates :title, :context, presence: true

View file

@ -12,7 +12,7 @@ class FollowRecommendation < ApplicationRecord
self.primary_key = :account_id self.primary_key = :account_id
belongs_to :account_summary, foreign_key: :account_id belongs_to :account_summary, foreign_key: :account_id
belongs_to :account, foreign_key: :account_id belongs_to :account
scope :localized, ->(locale) { joins(:account_summary).merge(AccountSummary.localized(locale)) } scope :localized, ->(locale) { joins(:account_summary).merge(AccountSummary.localized(locale)) }

View file

@ -32,7 +32,7 @@ class Report < ApplicationRecord
belongs_to :action_taken_by_account, class_name: 'Account', optional: true belongs_to :action_taken_by_account, class_name: 'Account', optional: true
belongs_to :assigned_account, class_name: 'Account', optional: true belongs_to :assigned_account, class_name: 'Account', optional: true
has_many :notes, class_name: 'ReportNote', foreign_key: :report_id, inverse_of: :report, dependent: :destroy has_many :notes, class_name: 'ReportNote', inverse_of: :report, dependent: :destroy
has_many :notifications, as: :activity, dependent: :destroy has_many :notifications, as: :activity, dependent: :destroy
scope :unresolved, -> { where(action_taken_at: nil) } scope :unresolved, -> { where(action_taken_at: nil) }

View file

@ -53,7 +53,7 @@ class Status < ApplicationRecord
belongs_to :application, class_name: 'Doorkeeper::Application', optional: true belongs_to :application, class_name: 'Doorkeeper::Application', optional: true
belongs_to :account, inverse_of: :statuses belongs_to :account, inverse_of: :statuses
belongs_to :in_reply_to_account, foreign_key: 'in_reply_to_account_id', class_name: 'Account', optional: true belongs_to :in_reply_to_account, class_name: 'Account', optional: true
belongs_to :conversation, optional: true belongs_to :conversation, optional: true
belongs_to :preloadable_poll, class_name: 'Poll', foreign_key: 'poll_id', optional: true belongs_to :preloadable_poll, class_name: 'Poll', foreign_key: 'poll_id', optional: true

View file

@ -11,7 +11,7 @@
class UserIp < ApplicationRecord class UserIp < ApplicationRecord
self.primary_key = :user_id self.primary_key = :user_id
belongs_to :user, foreign_key: :user_id belongs_to :user
def readonly? def readonly?
true true

View file

@ -62,7 +62,7 @@ class BackfillAdminActionLogs < ActiveRecord::Migration[6.1]
# Cannot use usual polymorphic support because of namespacing issues # Cannot use usual polymorphic support because of namespacing issues
belongs_to :status, foreign_key: :target_id belongs_to :status, foreign_key: :target_id
belongs_to :account, foreign_key: :target_id belongs_to :account, foreign_key: :target_id
belongs_to :user, foreign_key: :user_id belongs_to :user
belongs_to :domain_block, foreign_key: :target_id belongs_to :domain_block, foreign_key: :target_id
belongs_to :domain_allow, foreign_key: :target_id belongs_to :domain_allow, foreign_key: :target_id
belongs_to :email_domain_block, foreign_key: :target_id belongs_to :email_domain_block, foreign_key: :target_id

View file

@ -62,7 +62,7 @@ class BackfillAdminActionLogsAgain < ActiveRecord::Migration[6.1]
# Cannot use usual polymorphic support because of namespacing issues # Cannot use usual polymorphic support because of namespacing issues
belongs_to :status, foreign_key: :target_id belongs_to :status, foreign_key: :target_id
belongs_to :account, foreign_key: :target_id belongs_to :account, foreign_key: :target_id
belongs_to :user, foreign_key: :user_id belongs_to :user
belongs_to :domain_block, foreign_key: :target_id belongs_to :domain_block, foreign_key: :target_id
belongs_to :domain_allow, foreign_key: :target_id belongs_to :domain_allow, foreign_key: :target_id
belongs_to :email_domain_block, foreign_key: :target_id belongs_to :email_domain_block, foreign_key: :target_id