8a72f5c427
This commit adds the module `FromUnion`, which provides the class method
`from_union`. This simplifies the process of selecting data from the
result of a UNION, and reduces the likelihood of making mistakes. As a
result, instead of this:
union = Gitlab::SQL::Union.new([foo, bar])
Foo.from("(#{union.to_sql}) #{Foo.table_name}")
We can now write this instead:
Foo.from_union([foo, bar])
This commit also includes some changes to make this new setup work
properly. For example, a bug in Rails 4
(https://github.com/rails/rails/issues/24193) would break the use of
`from("sub-query-here").includes(:relation)` in certain cases. There was
also a CI query which appeared to repeat a lot of conditions from an
outer query on an inner query, which isn't necessary.
Finally, we include a RuboCop cop to ensure developers use this new
module, instead of using Gitlab::SQL::Union directly.
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/51307
55 lines
1.2 KiB
Ruby
55 lines
1.2 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
# This class extracts all users found in a piece of text by the username or the
|
|
# email adress
|
|
|
|
module Gitlab
|
|
class UserExtractor
|
|
# Not using `Devise.email_regexp` to filter out any chars that an email
|
|
# does not end with and not pinning the email to a start of end of a string.
|
|
EMAIL_REGEXP = /(?<email>([^@\s]+@[^@\s]+(?<!\W)))/
|
|
USERNAME_REGEXP = User.reference_pattern
|
|
|
|
def initialize(text)
|
|
@text = text
|
|
end
|
|
|
|
# rubocop: disable CodeReuse/ActiveRecord
|
|
def users
|
|
return User.none unless @text.present?
|
|
|
|
@users ||= User.from_union(union_relations)
|
|
end
|
|
# rubocop: enable CodeReuse/ActiveRecord
|
|
|
|
def usernames
|
|
matches[:usernames]
|
|
end
|
|
|
|
def emails
|
|
matches[:emails]
|
|
end
|
|
|
|
def references
|
|
@references ||= matches.values.flatten
|
|
end
|
|
|
|
def matches
|
|
@matches ||= {
|
|
emails: @text.scan(EMAIL_REGEXP).flatten.uniq,
|
|
usernames: @text.scan(USERNAME_REGEXP).flatten.uniq
|
|
}
|
|
end
|
|
|
|
private
|
|
|
|
def union_relations
|
|
relations = []
|
|
|
|
relations << User.by_any_email(emails) if emails.any?
|
|
relations << User.by_username(usernames) if usernames.any?
|
|
|
|
relations
|
|
end
|
|
end
|
|
end
|