Add space_phid parameter to get_taskbypolicy

The query in get_taskbypolicy should limit results to tasks in
the public space. Public tasks that were created before spaces
could have space_phid set to NULL.

1 files changed, 11 insertions, 5 deletions

diff --git a/wmfphablib/phabdb.py b/wmfphablib/phabdb.py
index deb3605..72a8f57 100755
--- a/wmfphablib/phabdb.py
+++ b/wmfphablib/phabdb.py
@@ -93,7 +93,14 @@ def get_transactionbytype(dbcon, objectPHID, type):
                 (objectPHID, type), limit=None)
     return _
 
-def get_taskbypolicy(dbcon, policy='public'):
+def get_taskbypolicy(dbcon, policy='public', space_phid='PHID-SPCE-6l6g5p53yi3mypnlpxjw'):
+    """ get tasks matching a specified policy
+    :param policy: the phabricator view policy identifier
+    :param space_phid: the phid of the 'public' space. Defaults to the phid value
+                       from Wikimedia's production phabricator instance.
+    """
+    # Note:
+    # space_phid is set to NULL for public tasks that were created before the spaces feature existed.
     _ = dbcon.sql_x("SELECT id, \
                         phid, \
                         authorPHID, \
@@ -105,12 +112,11 @@ def get_taskbypolicy(dbcon, policy='public'):
                         dateModified, \
                         subpriority, \
                         points \
-                FROM maniphest_task WHERE viewPolicy=%s",
-
-                (policy), limit=None)
+                FROM maniphest_task WHERE viewPolicy=%s \
+                AND (spacePHID=%s OR spacePHID IS NULL)",
+                (policy, space_phid), limit=None)
     return _
 
-
 def get_user_relations_last_finish(dbcon):
     """ get last finish time for update script
     :param dbcon: db connector