From 7da8e374e0c96e10077690935e829b0c04fc82f4 Mon Sep 17 00:00:00 2001
From: dklawren <dklawren@users.noreply.github.com>
Date: Wed, 29 Nov 2017 13:54:22 -0500
Subject: Bug 1409957 - Create polling daemon to query Phabricator for recent
 transcations and update bug data according to revision changes

---
 extensions/PhabBugz/bin/update_project_members.pl | 41 +++++++++++++----------
 1 file changed, 23 insertions(+), 18 deletions(-)

(limited to 'extensions/PhabBugz/bin/update_project_members.pl')

diff --git a/extensions/PhabBugz/bin/update_project_members.pl b/extensions/PhabBugz/bin/update_project_members.pl
index bdc054e1a..06cc55626 100755
--- a/extensions/PhabBugz/bin/update_project_members.pl
+++ b/extensions/PhabBugz/bin/update_project_members.pl
@@ -20,11 +20,9 @@ use Bugzilla::Constants;
 use Bugzilla::Error;
 use Bugzilla::Group;
 
+use Bugzilla::Extension::PhabBugz::Project;
 use Bugzilla::Extension::PhabBugz::Util qw(
-    create_project
-    get_members_by_bmo_id
-    get_project_phid
-    set_project_members
+    get_phab_bmo_ids
 );
 
 Bugzilla->usage_mode(USAGE_MODE_CMDLINE);
@@ -55,23 +53,22 @@ unless ($phab_sync_groups = Bugzilla->params->{phabricator_sync_groups}) {
 my $sync_groups = Bugzilla::Group->match({ name => [ split('[,\s]+', $phab_sync_groups) ] });
 
 foreach my $group (@$sync_groups) {
-    my @users = get_group_members($group);
-
     # Create group project if one does not yet exist
     my $phab_project_name = 'bmo-' . $group->name;
-    my $project_phid = get_project_phid($phab_project_name);
-    if (!$project_phid) {
-        $project_phid = create_project($phab_project_name, 'BMO Security Group for ' . $group->name);
+    my $project = Bugzilla::Extension::PhabBugz::Project->new({
+        name => $phab_project_name
+    });
+    if (!$project->id) {
+        $project = Bugzilla::Extension::PhabBugz::Project->create({
+            name        => $phab_project_name,
+            description => 'BMO Security Group for ' . $group->name
+        });
     }
 
-    # Get the internal user ids for the bugzilla group members
-    my $phab_user_ids = [];
-    if (@users) {
-        $phab_user_ids = get_members_by_bmo_id(\@users);
-    }
+    my @group_members = get_group_members($group);
 
-    # Set the project members to the exact list
-    set_project_members($project_phid, $phab_user_ids);
+    $project->set_members(\@group_members);
+    $project->update();
 }
 
 sub get_group_members {
@@ -84,5 +81,13 @@ sub get_group_members {
             $users{$user->id} = $user;
         }
     }
-    return values %users;
-}
+
+    # Look up the phab ids for these users
+    my $phab_users = get_phab_bmo_ids({ ids => [ keys %users ] });
+    foreach my $phab_user (@{ $phab_users }) {
+        $users{$phab_user->{id}}->{phab_phid} = $phab_user->{phid};
+    }
+
+    # We only need users who have accounts in phabricator
+    return grep { $_->phab_phid } values %users;
+}
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b