Commit 686f6855 authored by Robert Speicher's avatar Robert Speicher

Update SystemNoteService method naming conventions

Now the verb comes first, and there is no restriction on
singular/plural.
parent ff3a62aa
...@@ -2,17 +2,17 @@ class IssuableBaseService < BaseService ...@@ -2,17 +2,17 @@ class IssuableBaseService < BaseService
private private
def create_assignee_note(issuable) def create_assignee_note(issuable)
SystemNoteService.assignee_change( SystemNoteService.change_assignee(
issuable, issuable.project, current_user, issuable.assignee) issuable, issuable.project, current_user, issuable.assignee)
end end
def create_milestone_note(issuable) def create_milestone_note(issuable)
SystemNoteService.milestone_change( SystemNoteService.change_milestone(
issuable, issuable.project, current_user, issuable.milestone) issuable, issuable.project, current_user, issuable.milestone)
end end
def create_labels_note(issuable, added_labels, removed_labels) def create_labels_note(issuable, added_labels, removed_labels)
SystemNoteService.label_change( SystemNoteService.change_label(
issuable, issuable.project, current_user, added_labels, removed_labels) issuable, issuable.project, current_user, added_labels, removed_labels)
end end
end end
...@@ -14,7 +14,7 @@ module Issues ...@@ -14,7 +14,7 @@ module Issues
private private
def create_note(issue, current_commit) def create_note(issue, current_commit)
SystemNoteService.status_change(issue, issue.project, current_user, issue.state, current_commit) SystemNoteService.change_status(issue, issue.project, current_user, issue.state, current_commit)
end end
end end
end end
...@@ -14,7 +14,7 @@ module Issues ...@@ -14,7 +14,7 @@ module Issues
private private
def create_note(issue) def create_note(issue)
SystemNoteService.status_change(issue, issue.project, current_user, issue.state, nil) SystemNoteService.change_status(issue, issue.project, current_user, issue.state, nil)
end end
end end
end end
...@@ -2,7 +2,7 @@ module MergeRequests ...@@ -2,7 +2,7 @@ module MergeRequests
class BaseService < ::IssuableBaseService class BaseService < ::IssuableBaseService
def create_note(merge_request) def create_note(merge_request)
SystemNoteService.status_change(merge_request, merge_request.target_project, current_user, merge_request.state, nil) SystemNoteService.change_status(merge_request, merge_request.target_project, current_user, merge_request.state, nil)
end end
def hook_data(merge_request, action) def hook_data(merge_request, action)
......
...@@ -82,7 +82,7 @@ module MergeRequests ...@@ -82,7 +82,7 @@ module MergeRequests
mr_commit_ids.include?(commit.id) mr_commit_ids.include?(commit.id)
end end
SystemNoteService.commit_add(merge_request, merge_request.project, SystemNoteService.add_commits(merge_request, merge_request.project,
@current_user, new_commits, @current_user, new_commits,
existing_commits, @oldrev) existing_commits, @oldrev)
end end
......
...@@ -2,66 +2,48 @@ ...@@ -2,66 +2,48 @@
# #
# Used for creating system notes (e.g., when a user references a merge request # Used for creating system notes (e.g., when a user references a merge request
# from an issue, an issue's assignee changes, an issue is closed, etc.) # from an issue, an issue's assignee changes, an issue is closed, etc.)
#
# All methods creating notes should be named using a singular noun and
# present-tense verb (e.g., "assignee_change" not "assignee_changed",
# "label_change" not "labels_change").
class SystemNoteService class SystemNoteService
# Called when the assignee of a Noteable is changed or removed # Called when commits are added to a Merge Request
# #
# noteable - Noteable object # noteable - Noteable object
# project - Project owning noteable # project - Project owning noteable
# author - User performing the change # author - User performing the change
# assignee - User being assigned, or nil # new_commits - Array of Commits added since last push
# # existing_commits - Array of Commits added in a previous push
# Example Note text: # oldrev - TODO (rspeicher): I have no idea what this actually does
#
# "Assignee removed"
# #
# "Reassigned to @rspeicher" # See new_commit_summary and existing_commit_summary.
# #
# Returns the created Note object # Returns the created Note object
def self.assignee_change(noteable, project, author, assignee) def self.add_commits(noteable, project, author, new_commits, existing_commits = [], oldrev = nil)
body = assignee.nil? ? 'Assignee removed' : "Reassigned to @#{assignee.username}" total_count = new_commits.length + existing_commits.length
commits_text = "#{total_count} commit".pluralize(total_count)
body = "Added #{commits_text}:\n\n"
body << existing_commit_summary(noteable, existing_commits, oldrev)
body << new_commit_summary(new_commits).join("\n")
create_note(noteable: noteable, project: project, author: author, note: body) create_note(noteable: noteable, project: project, author: author, note: body)
end end
# Called when a Mentionable references a Noteable # Called when the assignee of a Noteable is changed or removed
# #
# noteable - Noteable object being referenced # noteable - Noteable object
# mentioner - Mentionable object # project - Project owning noteable
# author - User performing the reference # author - User performing the change
# assignee - User being assigned, or nil
# #
# Example Note text: # Example Note text:
# #
# "Mentioned in #1" # "Assignee removed"
#
# "Mentioned in !2"
#
# "Mentioned in 54f7727c"
# #
# See cross_reference_note_content. # "Reassigned to @rspeicher"
# #
# Returns the created Note object # Returns the created Note object
def self.cross_reference(noteable, mentioner, author) def self.change_assignee(noteable, project, author, assignee)
return if cross_reference_disallowed?(noteable, mentioner) body = assignee.nil? ? 'Assignee removed' : "Reassigned to @#{assignee.username}"
gfm_reference = mentioner_gfm_ref(noteable, mentioner)
note_options = {
project: noteable.project,
author: author,
note: cross_reference_note_content(gfm_reference)
}
if noteable.kind_of?(Commit)
note_options.merge!(noteable_type: 'Commit', commit_id: noteable.id)
else
note_options.merge!(noteable: noteable)
end
create_note(note_options) create_note(noteable: noteable, project: project, author: author, note: body)
end end
# Called when one or more labels on a Noteable are added and/or removed # Called when one or more labels on a Noteable are added and/or removed
...@@ -81,7 +63,7 @@ class SystemNoteService ...@@ -81,7 +63,7 @@ class SystemNoteService
# "Removed ~5 label" # "Removed ~5 label"
# #
# Returns the created Note object # Returns the created Note object
def self.label_change(noteable, project, author, added_labels, removed_labels) def self.change_label(noteable, project, author, added_labels, removed_labels)
labels_count = added_labels.count + removed_labels.count labels_count = added_labels.count + removed_labels.count
references = ->(label) { "~#{label.id}" } references = ->(label) { "~#{label.id}" }
...@@ -119,36 +101,13 @@ class SystemNoteService ...@@ -119,36 +101,13 @@ class SystemNoteService
# "Miletone changed to 7.11" # "Miletone changed to 7.11"
# #
# Returns the created Note object # Returns the created Note object
def self.milestone_change(noteable, project, author, milestone) def self.change_milestone(noteable, project, author, milestone)
body = 'Milestone ' body = 'Milestone '
body += milestone.nil? ? 'removed' : "changed to #{milestone.title}" body += milestone.nil? ? 'removed' : "changed to #{milestone.title}"
create_note(noteable: noteable, project: project, author: author, note: body) create_note(noteable: noteable, project: project, author: author, note: body)
end end
# Called when commits are added to a Merge Request
#
# noteable - Noteable object
# project - Project owning noteable
# author - User performing the change
# new_commits - Array of Commits added since last push
# existing_commits - Array of Commits added in a previous push
# oldrev - TODO (rspeicher): I have no idea what this actually does
#
# See new_commit_summary and existing_commit_summary.
#
# Returns the created Note object
def self.commit_add(noteable, project, author, new_commits, existing_commits = [], oldrev = nil)
total_count = new_commits.length + existing_commits.length
commits_text = "#{total_count} commit".pluralize(total_count)
body = "Added #{commits_text}:\n\n"
body << existing_commit_summary(noteable, existing_commits, oldrev)
body << new_commit_summary(new_commits).join("\n")
create_note(noteable: noteable, project: project, author: author, note: body)
end
# Called when the status of a Noteable is changed # Called when the status of a Noteable is changed
# #
# noteable - Noteable object # noteable - Noteable object
...@@ -164,13 +123,50 @@ class SystemNoteService ...@@ -164,13 +123,50 @@ class SystemNoteService
# "Status changed to closed by bc17db76" # "Status changed to closed by bc17db76"
# #
# Returns the created Note object # Returns the created Note object
def self.status_change(noteable, project, author, status, source) def self.change_status(noteable, project, author, status, source)
body = "Status changed to #{status}" body = "Status changed to #{status}"
body += " by #{source.gfm_reference}" if source body += " by #{source.gfm_reference}" if source
create_note(noteable: noteable, project: project, author: author, note: body) create_note(noteable: noteable, project: project, author: author, note: body)
end end
# Called when a Mentionable references a Noteable
#
# noteable - Noteable object being referenced
# mentioner - Mentionable object
# author - User performing the reference
#
# Example Note text:
#
# "Mentioned in #1"
#
# "Mentioned in !2"
#
# "Mentioned in 54f7727c"
#
# See cross_reference_note_content.
#
# Returns the created Note object
def self.cross_reference(noteable, mentioner, author)
return if cross_reference_disallowed?(noteable, mentioner)
gfm_reference = mentioner_gfm_ref(noteable, mentioner)
note_options = {
project: noteable.project,
author: author,
note: cross_reference_note_content(gfm_reference)
}
if noteable.kind_of?(Commit)
note_options.merge!(noteable_type: 'Commit', commit_id: noteable.id)
else
note_options.merge!(noteable: noteable)
end
create_note(note_options)
end
def self.cross_reference?(note_text) def self.cross_reference?(note_text)
note_text.start_with?(cross_reference_note_prefix) note_text.start_with?(cross_reference_note_prefix)
end end
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment