phab public dump include story points v2

Change-Id: I57e0d863db1a4234f5e323caf62a7c6e407f0b61

2 files changed, 5 insertions, 5 deletions

diff --git a/public_task_dump.py b/public_task_dump.py
index d00bfae..d5f6dcf 100755
--- a/public_task_dump.py
+++ b/public_task_dump.py
@@ -18,6 +18,8 @@ for task in phabdb.get_taskbypolicy():
     id = task[0]
     taskdata[id] = {}
 
+    taskdata[id]['storypoints'] = phabdb.get_storypoints(task[1]) or ''
+
     taskdata[id]['transactions'] = {}
     for t in transactions:
         taskdata[id]['transactions'][t] = phabdb.get_transactionbytype(task[1], t)
@@ -32,13 +34,10 @@ for task in phabdb.get_taskbypolicy():
                     and phabdb.get_projectpolicy(edge[2]) == 'public']
     taskdata[id]['edge'] = filter(bool, edge_allowed)
 
-    taskdata[id]['storypoints'] = phabdb.get_storypoints(task[1])
-
-
 data['task'] = taskdata
 data['project'] = {}
 data['project']['projects'] = phabdb.get_projectbypolicy(policy='public')
 data['project']['columns'] = phabdb.get_projectcolumns()
 
-with open('phabricator_public.dump', 'w') as f:
+with open('/srv/dumps/phabricator_public.dump', 'w') as f:
     f.write(json.dumps(data))
diff --git a/wmfphablib/phabdb.py b/wmfphablib/phabdb.py
index 8cc1d8c..999e62f 100755
--- a/wmfphablib/phabdb.py
+++ b/wmfphablib/phabdb.py
@@ -82,7 +82,8 @@ def get_storypoints(taskPHID):
                 WHERE indexKey=%s AND  objectPHID=%s",
                 ('yERhvoZPNPtM', taskPHID), limit=None)
     p.close()
-    return _
+    if _ is not None and len(_[0]) > 0:
+        return _[0]
 
 def get_edgebysrc(src):
     p = phdb(db='phabricator_maniphest',