Merge pull request #9394 from saraycp/rename_notify_parameters

Rename notify_parameters to event_parameters

src/api/app/controllers/request_controller.rb

@@ -113,7 +113,7 @@ def update
 
     BsRequest.transaction do
       oldrequest = BsRequest.find_by_number!(params[:id])
-      notify = oldrequest.notify_parameters
+      notify = oldrequest.event_parameters
       oldrequest.destroy
 
       req = BsRequest.new_from_xml(body)
@@ -131,7 +131,7 @@ def update
   # DELETE /request/:id
   def destroy
     request = BsRequest.find_by_number!(params[:id])
-    notify = request.notify_parameters
+    notify = request.event_parameters
     request.destroy # throws us out of here if failing
     notify[:who] = User.session!.login
     Event::RequestDelete.create(notify)

src/api/app/jobs/project_create_auto_cleanup_requests.rb

@@ -58,6 +58,6 @@ def autoclean_project(prj)
                                        <accept_at>' + @cleanup_time.to_s + '</accept_at>
                                      </request>')
     req.save!
-    Event::RequestCreate.create(req.notify_parameters)
+    Event::RequestCreate.create(req.event_parameters)
   end
 end

src/api/app/models/bs_request.rb

@@ -726,7 +726,7 @@ def change_review_state(new_review_state, opts = {})
       if new_request_state == :new
         self.comment = 'All reviewers accepted request'
         save!
-        Event::RequestReviewsDone.create(notify_parameters)
+        Event::RequestReviewsDone.create(event_parameters)
         HistoryElement::RequestAllReviewsApproved.create(history_parameters)
         # pre-approved requests can be processed
         BsRequestAutoAcceptJob.perform_later(id) if approver
@@ -779,7 +779,7 @@ def addreview(opts)
       }
       history_params[:comment] = opts[:comment] if opts[:comment]
       HistoryElement::RequestReviewAdded.create(history_params)
-      newreview.create_event(notify_parameters)
+      newreview.create_event(event_parameters)
     end
   end
 
@@ -828,7 +828,7 @@ def send_state_change
     return if state_was.to_s == state.to_s
     # new->review && review->new are not worth an event - it's just spam
     return if state.to_s.in?(intermediate_state) && state_was.to_s.in?(intermediate_state)
-    Event::RequestStatechange.create(notify_parameters)
+    Event::RequestStatechange.create(event_parameters)
   end
 
   def accept_staged_request
@@ -839,23 +839,24 @@ def accept_staged_request
     self.staging_project_id = nil
   end
 
-  def notify_parameters(ret = {})
-    ret[:id] = id
-    ret[:number] = number
-    ret[:description] = description
-    ret[:state] = state
-    ret[:oldstate] = state_was if state_changed?
-    ret[:who] = commenter if commenter.present?
-    ret[:when] = updated_when.strftime('%Y-%m-%dT%H:%M:%S')
-    ret[:comment] = comment
-    ret[:author] = creator
+  def event_parameters
+    params = { id: id,
+               number: number,
+               description: description,
+               state: state,
+               when: updated_when.strftime('%Y-%m-%dT%H:%M:%S'),
+               comment: comment,
+               author: creator }
+
+    params[:oldstate] = state_was if state_changed?
+    params[:who] = commenter if commenter.present?
 
     # Use a nested data structure to support multiple actions in one request
-    ret[:actions] = []
+    params[:actions] = []
     bs_request_actions[0..ACTION_NOTIFY_LIMIT].each do |a|
-      ret[:actions] << a.notify_params
+      params[:actions] << a.notify_params
     end
-    ret
+    params
   end
 
   def auto_accept
@@ -926,7 +927,7 @@ def set_accept_at!(time = nil)
   end
 
   def notify
-    notify = notify_parameters
+    notify = event_parameters
     Event::RequestCreate.create(notify)
 
     reviews.each do |review|
@@ -1067,11 +1068,6 @@ def required_checks
     target_project_objects.pluck(:required_checks).flatten.uniq
   end
 
-  # TODO: rename the 'notify_parameters' method instead of wrapping it like this.
-  def event_parameters
-    notify_parameters
-  end
-
   private
 
   def apply_default_reviewers

src/api/app/models/event/comment_for_request.rb

@@ -8,7 +8,7 @@ class CommentForRequest < Request
 
     def subject
       req = BsRequest.find_by_number(payload['number'])
-      req_payload = req.notify_parameters
+      req_payload = req.event_parameters
       "Request #{payload['number']} commented by #{payload['commenter']} (#{BsRequest.actions_summary(req_payload)})"
     end
 

src/api/app/models/review.rb

@@ -221,7 +221,7 @@ def change_state(new_state, comment)
     self.state = new_state
     self.reviewer = User.session!.login
     save!
-    Event::ReviewChanged.create(bs_request.notify_parameters)
+    Event::ReviewChanged.create(bs_request.event_parameters)
 
     arguments = { review: self, comment: comment, user: User.session! }
     if new_state == :accepted