Skip to content

Commit

Permalink
Auto-correct RuboCop offenses for Rails/RedundantForeignKey
Browse files Browse the repository at this point in the history
This cop was introduced in rubocop-rails 2.6.0
  • Loading branch information
Dany Marcoux committed Jun 9, 2020
1 parent 89c5704 commit 8a2833e
Show file tree
Hide file tree
Showing 13 changed files with 27 additions and 27 deletions.
2 changes: 1 addition & 1 deletion src/api/app/models/binary_release.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class SaveError < APIError; end
#### Attributes
#### Associations macros (Belongs to, Has one, Has many)
belongs_to :repository
belongs_to :release_package, class_name: 'Package', foreign_key: 'release_package_id' # optional
belongs_to :release_package, class_name: 'Package' # optional
belongs_to :on_medium, class_name: 'BinaryRelease'

#### Callbacks macros: before_save, after_save, etc.
Expand Down
4 changes: 2 additions & 2 deletions src/api/app/models/bs_request.rb
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ class BsRequest < ApplicationRecord
has_many :review_history_elements, through: :reviews, source: :history_elements
has_many :status_reports, as: :checkable, class_name: 'Status::Report', dependent: :destroy
has_many :target_project_objects, through: :bs_request_actions
belongs_to :staging_project, class_name: 'Project', foreign_key: 'staging_project_id'
has_one :request_exclusion, class_name: 'Staging::RequestExclusion', foreign_key: 'bs_request_id', dependent: :destroy
belongs_to :staging_project, class_name: 'Project'
has_one :request_exclusion, class_name: 'Staging::RequestExclusion', dependent: :destroy
has_many :not_accepted_reviews, -> { where.not(state: :accepted) }, class_name: 'Review'
has_many :notifications, as: :notifiable, dependent: :delete_all

Expand Down
2 changes: 1 addition & 1 deletion src/api/app/models/channel.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
class Channel < ApplicationRecord
include ModelHelper

belongs_to :package, foreign_key: :package_id, touch: true
belongs_to :package, touch: true
has_many :channel_targets, dependent: :destroy
has_many :channel_binary_lists, dependent: :destroy

Expand Down
2 changes: 1 addition & 1 deletion src/api/app/models/issue.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
class Issue < ApplicationRecord
include Issue::Errors

has_many :package_issues, foreign_key: 'issue_id', dependent: :delete_all
has_many :package_issues, dependent: :delete_all

belongs_to :issue_tracker
belongs_to :owner, class_name: 'User'
Expand Down
2 changes: 1 addition & 1 deletion src/api/app/models/linked_project.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
class LinkedProject < ApplicationRecord
belongs_to :project, foreign_key: :db_project_id
belongs_to :linked_db_project, class_name: 'Project', foreign_key: :linked_db_project_id
belongs_to :linked_db_project, class_name: 'Project'

validate :validate_duplicates

Expand Down
4 changes: 2 additions & 2 deletions src/api/app/models/maintained_project.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
class MaintainedProject < ApplicationRecord
belongs_to :project, foreign_key: :project_id
belongs_to :maintenance_project, class_name: 'Project', foreign_key: :maintenance_project_id
belongs_to :project
belongs_to :maintenance_project, class_name: 'Project'

validates :project_id, uniqueness: {
scope: :maintenance_project_id,
Expand Down
10 changes: 5 additions & 5 deletions src/api/app/models/package.rb
Original file line number Diff line number Diff line change
Expand Up @@ -43,17 +43,17 @@ class Package < ApplicationRecord

has_many :flags, -> { order(:position) }, dependent: :delete_all, inverse_of: :package

belongs_to :develpackage, class_name: 'Package', foreign_key: 'develpackage_id'
belongs_to :develpackage, class_name: 'Package'
has_many :develpackages, class_name: 'Package', foreign_key: 'develpackage_id'

has_many :attribs, dependent: :destroy, foreign_key: :package_id
has_many :attribs, dependent: :destroy

has_many :package_kinds, dependent: :delete_all
has_many :package_issues, dependent: :delete_all # defined in sources
has_many :issues, through: :package_issues

has_many :products, dependent: :destroy
has_many :channels, dependent: :destroy, foreign_key: :package_id
has_many :channels, dependent: :destroy

has_many :comments, as: :commentable, dependent: :destroy

Expand Down Expand Up @@ -110,8 +110,8 @@ class Package < ApplicationRecord
}
validate :valid_name

has_one :backend_package, foreign_key: :package_id, dependent: :destroy, inverse_of: :package
has_one :token, class_name: 'Token::Service', foreign_key: :package_id, dependent: :destroy
has_one :backend_package, dependent: :destroy, inverse_of: :package
has_one :token, class_name: 'Token::Service', dependent: :destroy

has_many :tokens, class_name: 'Token::Service', dependent: :destroy, inverse_of: :package

Expand Down
2 changes: 1 addition & 1 deletion src/api/app/models/product.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
class Product < ApplicationRecord
belongs_to :package, foreign_key: :package_id
belongs_to :package
has_many :product_update_repositories, dependent: :destroy
has_many :product_media, dependent: :destroy

Expand Down
6 changes: 3 additions & 3 deletions src/api/app/models/product_medium.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
class ProductMedium < ApplicationRecord
belongs_to :product, foreign_key: :product_id
belongs_to :repository, foreign_key: :repository_id
belongs_to :arch_filter, foreign_key: :arch_filter_id, class_name: 'Architecture'
belongs_to :product
belongs_to :repository
belongs_to :arch_filter, class_name: 'Architecture'
end

# == Schema Information
Expand Down
6 changes: 3 additions & 3 deletions src/api/app/models/product_update_repository.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
class ProductUpdateRepository < ApplicationRecord
belongs_to :product, foreign_key: :product_id
belongs_to :repository, foreign_key: :repository_id
belongs_to :arch_filter, foreign_key: :arch_filter_id, class_name: 'Architecture'
belongs_to :product
belongs_to :repository
belongs_to :arch_filter, class_name: 'Architecture'
end

# == Schema Information
Expand Down
4 changes: 2 additions & 2 deletions src/api/app/models/project.rb
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@ def autocomplete(search)

# projects can maintain other projects
has_many :maintained_projects, class_name: 'MaintainedProject', foreign_key: :maintenance_project_id, dependent: :delete_all
has_many :maintenance_projects, class_name: 'MaintainedProject', foreign_key: :project_id, dependent: :delete_all
has_many :maintenance_projects, class_name: 'MaintainedProject', dependent: :delete_all

has_many :incident_updateinfo_counter_values, foreign_key: :project_id, dependent: :delete_all
has_many :incident_updateinfo_counter_values, dependent: :delete_all

# develproject is history, use develpackage instead. FIXME3.0: clean this up
has_many :develprojects, class_name: 'Project', foreign_key: 'develproject_id'
Expand Down
8 changes: 4 additions & 4 deletions src/api/app/models/repository.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ class Repository < ApplicationRecord

before_destroy :cleanup_before_destroy

has_many :channel_targets, class_name: 'ChannelTarget', dependent: :delete_all, foreign_key: 'repository_id'
has_many :release_targets, class_name: 'ReleaseTarget', dependent: :delete_all, foreign_key: 'repository_id'
has_many :channel_targets, class_name: 'ChannelTarget', dependent: :delete_all
has_many :release_targets, class_name: 'ReleaseTarget', dependent: :delete_all
has_many :path_elements, -> { order('position') }, foreign_key: 'parent_id', dependent: :delete_all, inverse_of: :repository
has_many :download_repositories, dependent: :delete_all, foreign_key: :repository_id
has_many :links, class_name: 'PathElement', foreign_key: 'repository_id', inverse_of: :link
has_many :download_repositories, dependent: :delete_all
has_many :links, class_name: 'PathElement', inverse_of: :link
has_many :targetlinks, class_name: 'ReleaseTarget', foreign_key: 'target_repository_id'
has_one :hostsystem, class_name: 'Repository', foreign_key: 'hostsystem_id'
has_many :binary_releases, dependent: :destroy
Expand Down
2 changes: 1 addition & 1 deletion src/api/app/models/review.rb
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class NotFoundError < APIError
belongs_to :package

belongs_to :review_assigned_from, class_name: 'Review', foreign_key: :review_id
has_one :review_assigned_to, class_name: 'Review', foreign_key: :review_id
has_one :review_assigned_to, class_name: 'Review'

scope :assigned, lambda {
left_outer_joins(:history_elements_assigned).having('COUNT(history_elements.id) > 0').group('reviews.id')
Expand Down

0 comments on commit 8a2833e

Please sign in to comment.