Skip to content

Commit

Permalink
[webui][api] Update Event classes to publish only once.
Browse files Browse the repository at this point in the history
The Event should only be published to the rabbitmq bus once - after
it is created. Before it was published everytime the Event was
created or updated.
  • Loading branch information
Evan Rolfe committed Oct 17, 2017
1 parent 8c9e0a0 commit 14ea948
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 29 deletions.
6 changes: 3 additions & 3 deletions src/api/app/models/event/build.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def custom_headers

class Event::BuildSuccess < Event::Build
self.description = 'Package has succeeded building'
after_commit :send_to_bus
after_create_commit :send_to_bus

def self.message_bus_queue
"#{Configuration.amqp_namespace}.package.build_success"
Expand All @@ -34,7 +34,7 @@ class Event::BuildFail < Event::Build

self.description = 'Package has failed to build'
receiver_roles :maintainer, :bugowner, :reader, :watcher
after_commit :send_to_bus
after_create_commit :send_to_bus

def self.message_bus_queue
"#{Configuration.amqp_namespace}.package.build_fail"
Expand Down Expand Up @@ -81,7 +81,7 @@ def custom_headers

class Event::BuildUnchanged < Event::Build
self.description = 'Package has succeeded building with unchanged result'
after_commit :send_to_bus
after_create_commit :send_to_bus

def self.message_bus_queue
"#{Configuration.amqp_namespace}.package.build_unchanged"
Expand Down
6 changes: 3 additions & 3 deletions src/api/app/models/event/comment.rb
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def custom_headers
class Event::CommentForProject < ::Event::Project
include CommentEvent
receiver_roles :maintainer, :watcher
after_commit :send_to_bus
after_create_commit :send_to_bus

def self.message_bus_queue
"#{Configuration.amqp_namespace}.project.comment"
Expand All @@ -48,7 +48,7 @@ def subject
class Event::CommentForPackage < ::Event::Package
include CommentEvent
receiver_roles :maintainer, :watcher
after_commit :send_to_bus
after_create_commit :send_to_bus

def self.message_bus_queue
"#{Configuration.amqp_namespace}.package.comment"
Expand All @@ -66,7 +66,7 @@ class Event::CommentForRequest < ::Event::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_commit :send_to_bus
after_create_commit :send_to_bus

def self.message_bus_queue
"#{Configuration.amqp_namespace}.request.comment"
Expand Down
20 changes: 10 additions & 10 deletions src/api/app/models/event/package.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class Package < Base

class CreatePackage < Package
self.description = 'Package was created'
after_commit :send_to_bus
after_create_commit :send_to_bus

def self.message_bus_queue
"#{Configuration.amqp_namespace}.package.create"
Expand All @@ -19,7 +19,7 @@ def subject

class UpdatePackage < Package
self.description = 'Package meta data was updated'
after_commit :send_to_bus
after_create_commit :send_to_bus

def self.message_bus_queue
"#{Configuration.amqp_namespace}.package.update"
Expand All @@ -29,7 +29,7 @@ def self.message_bus_queue
class UndeletePackage < Package
self.description = 'Package was undeleted'
payload_keys :comment
after_commit :send_to_bus
after_create_commit :send_to_bus

def self.message_bus_queue
"#{Configuration.amqp_namespace}.package.undelete"
Expand All @@ -45,7 +45,7 @@ def set_payload(attribs, keys)
class DeletePackage < Package
self.description = 'Package was deleted'
payload_keys :comment, :requestid
after_commit :send_to_bus
after_create_commit :send_to_bus

def self.message_bus_queue
"#{Configuration.amqp_namespace}.package.delete"
Expand All @@ -60,7 +60,7 @@ def set_payload(attribs, keys)
class BranchCommand < Package
self.description = 'Package was branched'
payload_keys :targetproject, :targetpackage, :user
after_commit :send_to_bus
after_create_commit :send_to_bus

def self.message_bus_queue
"#{Configuration.amqp_namespace}.package.branch"
Expand All @@ -74,7 +74,7 @@ def subject
class VersionChange < Package
self.description = 'Package has changed its version'
payload_keys :comment, :requestid, :files, :rev, :newversion, :user, :oldversion
after_commit :send_to_bus
after_create_commit :send_to_bus

def self.message_bus_queue
"#{Configuration.amqp_namespace}.package.version_change"
Expand All @@ -92,7 +92,7 @@ class Commit < Package
payload_keys :project, :package, :comment, :user, :files, :rev, :requestid

create_jobs :update_backend_infos_job
after_commit :send_to_bus
after_create_commit :send_to_bus

def self.message_bus_queue
"#{Configuration.amqp_namespace}.package.commit"
Expand All @@ -112,7 +112,7 @@ def set_payload(attribs, keys)
class Upload < Package
self.description = 'Package sources were uploaded'
payload_keys :project, :package, :comment, :filename, :requestid, :target, :user
after_commit :send_to_bus
after_create_commit :send_to_bus

def self.message_bus_queue
"#{Configuration.amqp_namespace}.package.upload"
Expand All @@ -124,7 +124,7 @@ class ServiceSuccess < Package
payload_keys :comment, :package, :project, :rev, :user, :requestid
receiver_roles :maintainer, :bugowner
create_jobs :update_backend_infos_job
after_commit :send_to_bus
after_create_commit :send_to_bus

def self.message_bus_queue
"#{Configuration.amqp_namespace}.package.service_success"
Expand All @@ -146,7 +146,7 @@ class ServiceFail < Package
payload_keys :comment, :error, :package, :project, :rev, :user, :requestid
receiver_roles :maintainer, :bugowner
create_jobs :update_backend_infos_job
after_commit :send_to_bus
after_create_commit :send_to_bus

def self.message_bus_queue
"#{Configuration.amqp_namespace}.package.service_fail"
Expand Down
2 changes: 1 addition & 1 deletion src/api/app/models/event/packtrack.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ class Event::Packtrack < Event::Base

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

def self.message_bus_queue
"#{Configuration.amqp_namespace}.repo.packtrack"
Expand Down
10 changes: 5 additions & 5 deletions src/api/app/models/event/project.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class Project < Base
class CreateProject < Project
self.description = 'Project is created'
payload_keys :sender
after_commit :send_to_bus
after_create_commit :send_to_bus

def self.message_bus_queue
"#{Configuration.amqp_namespace}.project.create"
Expand All @@ -21,7 +21,7 @@ def subject
class UpdateProjectConfig < Project
self.description = 'Project _config was updated'
payload_keys :sender, :files, :comment
after_commit :send_to_bus
after_create_commit :send_to_bus

def self.message_bus_queue
"#{Configuration.amqp_namespace}.project.update_project_conf"
Expand All @@ -31,7 +31,7 @@ def self.message_bus_queue
class UndeleteProject < Project
self.description = 'Project was undeleted'
payload_keys :comment, :sender
after_commit :send_to_bus
after_create_commit :send_to_bus

def self.message_bus_queue
"#{Configuration.amqp_namespace}.project.undelete"
Expand All @@ -41,7 +41,7 @@ def self.message_bus_queue
class UpdateProject < Project
self.description = 'Project meta was updated'
payload_keys :sender
after_commit :send_to_bus
after_create_commit :send_to_bus

def self.message_bus_queue
"#{Configuration.amqp_namespace}.project.update"
Expand All @@ -51,7 +51,7 @@ def self.message_bus_queue
class DeleteProject < Project
self.description = 'Project was deleted'
payload_keys :comment, :requestid, :sender
after_commit :send_to_bus
after_create_commit :send_to_bus

def self.message_bus_queue
"#{Configuration.amqp_namespace}.project.delete"
Expand Down
2 changes: 1 addition & 1 deletion src/api/app/models/event/repo_publish_state.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
class Event::RepoPublishState < Event::Base
self.description = 'Publish State of Repository has changed'
payload_keys :project, :repo, :state
after_commit :send_to_bus
after_create_commit :send_to_bus

def self.message_bus_queue
"#{Configuration.amqp_namespace}.repo.publish_state"
Expand Down
2 changes: 1 addition & 1 deletion src/api/app/models/event/repo_published.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
class Event::RepoPublished < Event::Base
self.description = 'Repository was published'
payload_keys :project, :repo
after_commit :send_to_bus
after_create_commit :send_to_bus

def self.message_bus_queue
"#{Configuration.amqp_namespace}.repo.published"
Expand Down
10 changes: 5 additions & 5 deletions src/api/app/models/event/request.rb
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ def find_watchers(project_key)

class Event::RequestChange < Event::Request
self.description = 'Request XML was updated (admin only)'
after_commit :send_to_bus
after_create_commit :send_to_bus

def self.message_bus_queue
"#{Configuration.amqp_namespace}.request.change"
Expand All @@ -149,7 +149,7 @@ def self.message_bus_queue
class Event::RequestCreate < Event::Request
self.description = 'Request created'
receiver_roles :source_maintainer, :target_maintainer, :source_watcher, :target_watcher
after_commit :send_to_bus
after_create_commit :send_to_bus

def self.message_bus_queue
"#{Configuration.amqp_namespace}.request.create"
Expand All @@ -174,7 +174,7 @@ def expanded_payload

class Event::RequestDelete < Event::Request
self.description = 'Request was deleted (admin only)'
after_commit :send_to_bus
after_create_commit :send_to_bus

def self.message_bus_queue
"#{Configuration.amqp_namespace}.request.delete"
Expand All @@ -185,7 +185,7 @@ class Event::RequestStatechange < Event::Request
self.description = 'Request state was changed'
payload_keys :oldstate
receiver_roles :source_maintainer, :target_maintainer, :creator, :reviewer, :source_watcher, :target_watcher
after_commit :send_to_bus
after_create_commit :send_to_bus

def self.message_bus_queue
"#{Configuration.amqp_namespace}.request.state_change"
Expand All @@ -201,7 +201,7 @@ class Event::ReviewWanted < Event::Request

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

def self.message_bus_queue
"#{Configuration.amqp_namespace}.request.review_wanted"
Expand Down

0 comments on commit 14ea948

Please sign in to comment.