diff options
author | dklawren <dklawren@users.noreply.github.com> | 2018-05-11 19:10:09 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-11 19:10:09 +0200 |
commit | a1d7038494ee5fb327b21b48c7d1e5fb75b39e72 (patch) | |
tree | 8c88e015e615ee3801092d30d7e5ba6d87059c18 /extensions/PhabBugz/lib/Project.pm | |
parent | a5b780358d0e8c9cd611a644b3d6168daac711e3 (diff) | |
download | bugzilla-a1d7038494ee5fb327b21b48c7d1e5fb75b39e72.tar.gz bugzilla-a1d7038494ee5fb327b21b48c7d1e5fb75b39e72.tar.xz |
Bug 1440086 - Refactor PhabBugz extension code to use new User.pm module for better type checking
Diffstat (limited to 'extensions/PhabBugz/lib/Project.pm')
-rw-r--r-- | extensions/PhabBugz/lib/Project.pm | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/extensions/PhabBugz/lib/Project.pm b/extensions/PhabBugz/lib/Project.pm index cbf1bdcaf..c52e1a661 100644 --- a/extensions/PhabBugz/lib/Project.pm +++ b/extensions/PhabBugz/lib/Project.pm @@ -9,15 +9,14 @@ package Bugzilla::Extension::PhabBugz::Project; use 5.10.1; use Moo; +use Scalar::Util qw(blessed); use Types::Standard -all; use Type::Utils; use Bugzilla::Error; use Bugzilla::Util qw(trim); -use Bugzilla::Extension::PhabBugz::Util qw( - request - get_phab_bmo_ids -); +use Bugzilla::Extension::PhabBugz::User; +use Bugzilla::Extension::PhabBugz::Util qw(request); ######################### # Initialization # @@ -281,20 +280,20 @@ sub set_description { sub add_member { my ( $self, $member ) = @_; $self->{add_members} ||= []; - my $member_phid = blessed $member ? $member->phab_phid : $member; + my $member_phid = blessed $member ? $member->phid : $member; push( @{ $self->{add_members} }, $member_phid ); } sub remove_member { my ( $self, $member ) = @_; $self->{remove_members} ||= []; - my $member_phid = blessed $member ? $member->phab_phid : $member; + my $member_phid = blessed $member ? $member->phid : $member; push( @{ $self->{remove_members} }, $member_phid ); } sub set_members { my ( $self, $members ) = @_; - $self->{set_members} = [ map { $_->phab_phid } @$members ]; + $self->{set_members} = [ map { blessed $_ ? $_->phid : $_ } @$members ]; } sub set_policy { @@ -318,16 +317,13 @@ sub _build_members { return [] if !@phids; - my $users = get_phab_bmo_ids( { phids => \@phids } ); + my $users = Bugzilla::Extension::PhabBugz::User->match( + { + phids => \@phids + } + ); - my @members; - foreach my $user (@$users) { - my $member = Bugzilla::User->new( { id => $user->{id}, cache => 1 } ); - $member->{phab_phid} = $user->{phid}; - push( @members, $member ); - } - - return \@members; + return [ map { $_->bugzilla_user } @$users ]; } 1; |