diff --git a/.rubocop_manual_todo.yml b/.rubocop_manual_todo.yml index 4e6da9ffd0..1facd4bad5 100644 --- a/.rubocop_manual_todo.yml +++ b/.rubocop_manual_todo.yml @@ -81,7 +81,6 @@ Metrics/LineLength: - app/models/enterprise.rb - app/models/enterprise_fee.rb - app/models/enterprise_group.rb - - app/models/enterprise_relationship.rb - app/models/enterprise_role.rb - app/models/exchange.rb - app/models/inventory_item.rb diff --git a/app/models/enterprise_relationship.rb b/app/models/enterprise_relationship.rb index f018a84e29..de2ede8440 100644 --- a/app/models/enterprise_relationship.rb +++ b/app/models/enterprise_relationship.rb @@ -4,14 +4,21 @@ class EnterpriseRelationship < ActiveRecord::Base has_many :permissions, class_name: 'EnterpriseRelationshipPermission', dependent: :destroy validates :parent_id, :child_id, presence: true - validates :child_id, uniqueness: { scope: :parent_id, message: I18n.t('validation_msg_relationship_already_established') } + validates :child_id, uniqueness: { + scope: :parent_id, + message: I18n.t('validation_msg_relationship_already_established') + } after_save :update_permissions_of_child_variant_overrides before_destroy :revoke_all_child_variant_overrides scope :with_enterprises, -> { - joins('LEFT JOIN enterprises AS parent_enterprises ON parent_enterprises.id = enterprise_relationships.parent_id'). - joins('LEFT JOIN enterprises AS child_enterprises ON child_enterprises.id = enterprise_relationships.child_id') + joins(" + LEFT JOIN enterprises AS parent_enterprises + ON parent_enterprises.id = enterprise_relationships.parent_id"). + joins(" + LEFT JOIN enterprises AS child_enterprises + ON child_enterprises.id = enterprise_relationships.child_id") } scope :involving_enterprises, ->(enterprises) { @@ -90,7 +97,7 @@ class EnterpriseRelationship < ActiveRecord::Base end def revoke_all_child_variant_overrides - child_variant_overrides.update_all(permission_revoked_at: Time.now) + child_variant_overrides.update_all(permission_revoked_at: Time.zone.now) end def child_variant_overrides