Skip to content

Commit

Permalink
Don't repeat after_create_commit in every event subclass
Browse files Browse the repository at this point in the history
Just send all events to the bus that have a bus ticket/key
  • Loading branch information
coolo committed Nov 14, 2018
1 parent ab9e595 commit a194fae
Show file tree
Hide file tree
Showing 31 changed files with 2 additions and 33 deletions.
3 changes: 2 additions & 1 deletion src/api/app/models/event/base.rb
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ def receiver_roles(*keys)
def inherited(subclass)
super

subclass.after_create_commit(:send_to_bus)
subclass.add_classname(name) unless name == 'Event::Base'
subclass.payload_keys(*payload_keys)
subclass.create_jobs(*create_jobs)
Expand Down Expand Up @@ -268,7 +269,7 @@ def _roles(role, project, package = nil)
end

def send_to_bus
RabbitmqBus.send_to_bus(message_bus_routing_key, self[:payload])
RabbitmqBus.send_to_bus(message_bus_routing_key, self[:payload]) if message_bus_routing_key
RabbitmqBus.send_to_bus('metrics', to_metric) if metric_fields.present?
end

Expand Down
1 change: 0 additions & 1 deletion src/api/app/models/event/branch_command.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ class BranchCommand < Base
self.description = 'Package was branched'
self.message_bus_routing_key = 'package.branch'
payload_keys :project, :package, :sender, :targetproject, :targetpackage, :user
after_create_commit :send_to_bus

def subject
"Package Branched: #{payload['project']}/#{payload['package']} => #{payload['targetproject']}/#{payload['targetpackage']}"
Expand Down
1 change: 0 additions & 1 deletion src/api/app/models/event/build_fail.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ class BuildFail < Build
self.message_bus_routing_key = 'package.build_fail'
self.description = 'Package has failed to build'
receiver_roles :maintainer, :bugowner, :reader, :watcher
after_create_commit :send_to_bus

def subject
"Build failure of #{payload['project']}/#{payload['package']} in #{payload['repository']}/#{payload['arch']}"
Expand Down
1 change: 0 additions & 1 deletion src/api/app/models/event/build_success.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ module Event
class BuildSuccess < Build
self.message_bus_routing_key = 'package.build_success'
self.description = 'Package has succeeded building'
after_create_commit :send_to_bus
end
end

Expand Down
1 change: 0 additions & 1 deletion src/api/app/models/event/build_unchanged.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ module Event
class BuildUnchanged < Build
self.message_bus_routing_key = 'package.build_unchanged'
self.description = 'Package has succeeded building with unchanged result'
after_create_commit :send_to_bus
end
end

Expand Down
1 change: 0 additions & 1 deletion src/api/app/models/event/comment_for_package.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ class CommentForPackage < Base
self.message_bus_routing_key = 'package.comment'
self.description = 'New comment for package created'
receiver_roles :maintainer, :bugowner, :watcher
after_create_commit :send_to_bus
payload_keys :project, :package, :sender

def subject
Expand Down
1 change: 0 additions & 1 deletion src/api/app/models/event/comment_for_project.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ class CommentForProject < Base
self.description = 'New comment for project created'
payload_keys :project
receiver_roles :maintainer, :bugowner, :watcher
after_create_commit :send_to_bus

def subject
"New comment in project #{payload['project']} by #{User.find(payload['commenter']).login}"
Expand Down
1 change: 0 additions & 1 deletion src/api/app/models/event/comment_for_request.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ class CommentForRequest < Request
self.description = 'New comment for request created'
payload_keys :request_number
receiver_roles :source_maintainer, :target_maintainer, :creator, :reviewer, :source_watcher, :target_watcher
after_create_commit :send_to_bus

def subject
req = BsRequest.find_by_number(payload['number'])
Expand Down
2 changes: 0 additions & 2 deletions src/api/app/models/event/commit.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@ class Commit < Base
self.message_bus_routing_key = 'package.commit'
self.description = 'New revision of a package was commited'
payload_keys :project, :package, :sender, :comment, :user, :files, :rev, :requestid

create_jobs :update_backend_infos_job
after_create_commit :send_to_bus

def subject
"#{payload['project']}/#{payload['package']} r#{payload['rev']} commited"
Expand Down
1 change: 0 additions & 1 deletion src/api/app/models/event/create_package.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ class CreatePackage < Base
self.message_bus_routing_key = 'package.create'
self.description = 'Package was created'
payload_keys :project, :package, :sender
after_create_commit :send_to_bus

def subject
"New Package #{payload['project']}/#{payload['package']}"
Expand Down
1 change: 0 additions & 1 deletion src/api/app/models/event/create_project.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ class CreateProject < Base
self.message_bus_routing_key = 'project.create'
self.description = 'Project is created'
payload_keys :project, :sender
after_create_commit :send_to_bus

def subject
"New Project #{payload['project']}"
Expand Down
1 change: 0 additions & 1 deletion src/api/app/models/event/delete_package.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ class DeletePackage < Base
self.message_bus_routing_key = 'package.delete'
self.description = 'Package was deleted'
payload_keys :project, :package, :sender, :comment, :requestid
after_create_commit :send_to_bus

def set_payload(attribs, keys)
attribs['comment'] = attribs['comment'][0..800] if attribs['comment'].present?
Expand Down
1 change: 0 additions & 1 deletion src/api/app/models/event/delete_project.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ class DeleteProject < Base
self.message_bus_routing_key = 'project.delete'
self.description = 'Project was deleted'
payload_keys :project, :comment, :requestid, :sender
after_create_commit :send_to_bus

private

Expand Down
1 change: 0 additions & 1 deletion src/api/app/models/event/packtrack.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ class Packtrack < Base

# for package tracking in first place
create_jobs :update_released_binaries_job
after_create_commit :send_to_bus
end
end

Expand Down
1 change: 0 additions & 1 deletion src/api/app/models/event/repo_build_finished.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ class RepoBuildFinished < Base
self.message_bus_routing_key = 'repo.build_finished'
self.description = 'Repository finished building'
payload_keys :project, :repo, :arch, :buildid
after_create_commit :send_to_bus
end
end

Expand Down
1 change: 0 additions & 1 deletion src/api/app/models/event/repo_publish_state.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ class RepoPublishState < Base
self.message_bus_routing_key = 'repo.publish_state'
self.description = 'Publish State of Repository has changed'
payload_keys :project, :repo, :state
after_create_commit :send_to_bus
end
end

Expand Down
1 change: 0 additions & 1 deletion src/api/app/models/event/repo_published.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ class RepoPublished < Base
self.message_bus_routing_key = 'repo.published'
self.description = 'Repository was published'
payload_keys :project, :repo, :buildid
after_create_commit :send_to_bus
end
end

Expand Down
1 change: 0 additions & 1 deletion src/api/app/models/event/request_change.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ module Event
class RequestChange < Request
self.message_bus_routing_key = 'request.change'
self.description = 'Request XML was updated (admin only)'
after_create_commit :send_to_bus
end
end

Expand Down
1 change: 0 additions & 1 deletion src/api/app/models/event/request_create.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ class RequestCreate < Request
self.message_bus_routing_key = 'request.create'
self.description = 'Request created'
receiver_roles :source_maintainer, :target_maintainer, :source_watcher, :target_watcher
after_create_commit :send_to_bus

def custom_headers
base = super
Expand Down
1 change: 0 additions & 1 deletion src/api/app/models/event/request_delete.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ module Event
class RequestDelete < Request
self.message_bus_routing_key = 'request.delete'
self.description = 'Request was deleted (admin only)'
after_create_commit :send_to_bus
end
end

Expand Down
1 change: 0 additions & 1 deletion src/api/app/models/event/request_statechange.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ class RequestStatechange < Request
self.description = 'Request state was changed'
payload_keys :oldstate
receiver_roles :source_maintainer, :target_maintainer, :creator, :reviewer, :source_watcher, :target_watcher
after_create_commit :send_to_bus

def subject
"Request #{payload['number']} changed to #{payload['state']} (#{actions_summary})"
Expand Down
2 changes: 0 additions & 2 deletions src/api/app/models/event/review_wanted.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@ module Event
class ReviewWanted < Request
self.message_bus_routing_key = 'request.review_wanted'
self.description = 'Review was created'

payload_keys :reviewers, :by_user, :by_group, :by_project, :by_package
receiver_roles :reviewer
after_create_commit :send_to_bus

def subject
"Request #{payload['number']} requires review (#{actions_summary})"
Expand Down
1 change: 0 additions & 1 deletion src/api/app/models/event/service_fail.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ class ServiceFail < Base
payload_keys :project, :package, :sender, :comment, :error, :rev, :user, :requestid
receiver_roles :maintainer, :bugowner
create_jobs :update_backend_infos_job
after_create_commit :send_to_bus

def subject
"Source service failure of #{payload['project']}/#{payload['package']}"
Expand Down
1 change: 0 additions & 1 deletion src/api/app/models/event/service_success.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ class ServiceSuccess < Base
payload_keys :project, :package, :sender, :comment, :rev, :user, :requestid
receiver_roles :maintainer, :bugowner
create_jobs :update_backend_infos_job
after_create_commit :send_to_bus

def subject
"Source service succeeded of #{payload['project']}/#{payload['package']}"
Expand Down
1 change: 0 additions & 1 deletion src/api/app/models/event/undelete_package.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ class UndeletePackage < Base
self.message_bus_routing_key = 'package.undelete'
self.description = 'Package was undeleted'
payload_keys :project, :package, :sender, :comment
after_create_commit :send_to_bus

def set_payload(attribs, keys)
attribs['comment'] = attribs['comment'][0..800] if attribs['comment'].present?
Expand Down
1 change: 0 additions & 1 deletion src/api/app/models/event/undelete_project.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ class UndeleteProject < Base
self.message_bus_routing_key = 'project.undelete'
self.description = 'Project was undeleted'
payload_keys :project, :comment, :sender
after_create_commit :send_to_bus
end
end

Expand Down
1 change: 0 additions & 1 deletion src/api/app/models/event/update_package.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ class UpdatePackage < Base
self.message_bus_routing_key = 'package.update'
self.description = 'Package meta data was updated'
payload_keys :project, :package, :sender
after_create_commit :send_to_bus
end
end

Expand Down
1 change: 0 additions & 1 deletion src/api/app/models/event/update_project.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ class UpdateProject < Base
self.message_bus_routing_key = 'project.update'
self.description = 'Project meta was updated'
payload_keys :project, :sender
after_create_commit :send_to_bus
end
end

Expand Down
1 change: 0 additions & 1 deletion src/api/app/models/event/update_project_config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ class UpdateProjectConfig < Base
self.message_bus_routing_key = 'project.update_project_conf'
self.description = 'Project _config was updated'
payload_keys :project, :sender, :files, :comment
after_create_commit :send_to_bus
end
end

Expand Down
1 change: 0 additions & 1 deletion src/api/app/models/event/upload.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ class Upload < Base
self.message_bus_routing_key = 'package.upload'
self.description = 'Package sources were uploaded'
payload_keys :project, :package, :sender, :comment, :filename, :requestid, :target, :user
after_create_commit :send_to_bus
end
end

Expand Down
1 change: 0 additions & 1 deletion src/api/app/models/event/version_change.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ class VersionChange < Base
self.message_bus_routing_key = 'package.version_change'
self.description = 'Package has changed its version'
payload_keys :project, :package, :sender, :comment, :requestid, :files, :rev, :newversion, :user, :oldversion
after_create_commit :send_to_bus

def set_payload(attribs, keys)
attribs['comment'] = attribs['comment'][0..800] if attribs['comment'].present?
Expand Down

0 comments on commit a194fae

Please sign in to comment.