Skip to content

Commit

Permalink
Merge pull request #12331 from saraycp/rename_methods_relationship_ev…
Browse files Browse the repository at this point in the history
…ents

Rename methods to create/delete relationship events
  • Loading branch information
vpereira committed Mar 22, 2022
2 parents 7ee4a21 + 0a12b2b commit 59106ac
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/api/app/mixins/has_relationships.rb
Expand Up @@ -55,7 +55,7 @@ def remove_role(what, role)
end
rel = rel.where(role_id: role.id) if role
transaction do
rel.map(&:create_event_before_delete)
rel.map(&:create_relationship_delete_event)
rel.delete_all
write_to_backend
end
Expand Down
6 changes: 3 additions & 3 deletions src/api/app/models/relationship.rb
Expand Up @@ -60,7 +60,7 @@ class Relationship < ApplicationRecord
bugowners.joins(:user).merge(User.with_email)
}

after_create :create_event_after_create
after_create :create_relationship_create_event

# we only care for project<->user relationships, but the cache is not *that* expensive
# to recalculate
Expand Down Expand Up @@ -127,7 +127,7 @@ def self.with_groups_and_roles
with_groups_and_roles_query.pluck('groups.title', 'roles.title')
end

def create_event_before_delete
def create_relationship_delete_event
return unless User.session

Event::RelationshipDelete.create(event_parameters)
Expand Down Expand Up @@ -167,7 +167,7 @@ def allowed_user
raise NotFoundError, "Couldn't find user #{user.login}" if user && user.is_nobody?
end

def create_event_after_create
def create_relationship_create_event
return unless User.session

Event::RelationshipCreate.create(event_parameters)
Expand Down

0 comments on commit 59106ac

Please sign in to comment.