Skip to content

Commit

Permalink
Implement suggestions from code review
Browse files Browse the repository at this point in the history
Co-authored-by: Juan Diego Gonzalez <[email protected]>
Co-authored-by: Alexander Berezovsky <[email protected]>
  • Loading branch information
a-b and Juan Diego Gonzalez committed Aug 17, 2022
1 parent c2ba1f7 commit 51fbbc4
Show file tree
Hide file tree
Showing 12 changed files with 100 additions and 5,803 deletions.
2 changes: 1 addition & 1 deletion app/controllers/v3/organizations_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ def show_default_domain

def list_members
message = UsersListMessage.from_params(query_params)
invalid_param!(message.errors.full_messages) unless message.valid
invalid_param!(message.errors.full_messages) unless message.valid?

org = fetch_org(hashed_params[:guid])
org_not_found! unless org && permission_queryer.can_read_from_org?(org.guid)
Expand Down
4 changes: 2 additions & 2 deletions app/messages/users_list_message.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class UsersListMessage < MetadataListMessage

validates_with NoAdditionalParamsValidator

validate :origin_requires_username
validate :origin_requires_username_or_partial_usernames
validate :usernames_or_partial_usernames

validates :usernames, allow_nil: true, array: true
Expand All @@ -21,7 +21,7 @@ def self.from_params(params)
super(params, %w(usernames partial_usernames origins))
end

def origin_requires_username
def origin_requires_username_or_partial_usernames
if @origins
unless @usernames || @partial_usernames
errors.add(:origins, 'filter cannot be provided without usernames or partial_usernames filter.')
Expand Down
Loading

0 comments on commit 51fbbc4

Please sign in to comment.