Milimetric has submitted this change and it was merged.
Change subject: Mingle card 1089
......................................................................
Mingle card 1089
Adding parameter information to report CSV
Added tests also
Change-Id: I6bfaf73074ffd4d1c1ecb817b1d5ce5c096b3daf
---
M tests/test_controllers/test_reports.py
M wikimetrics/controllers/reports.py
2 files changed, 25 insertions(+), 0 deletions(-)
Approvals:
Milimetric: Verified; Looks good to me, approved
diff --git a/tests/test_controllers/test_reports.py
b/tests/test_controllers/test_reports.py
index df6e977..40b65d9 100644
--- a/tests/test_controllers/test_reports.py
+++ b/tests/test_controllers/test_reports.py
@@ -173,6 +173,15 @@
# Check the csv result
response = self.app.get('/reports/result/{0}.csv'.format(result_key))
assert_true(response.data.find('Average') >= 0)
+
+ # Testing to see if the parameters are also in the CSV
+ # (related to Mingle 1089)
+ assert_true(response.data.find('parameters') >= 0)
+ assert_true(response.data.find('start_date') >= 0)
+ assert_true(response.data.find('end_date') >= 0)
+ assert_true(response.data.find('namespaces') >= 0)
+ assert_true(response.data.find('metric/cohort') >= 0)
+
def test_report_result_sum_only_csv(self):
# Make the request
diff --git a/wikimetrics/controllers/reports.py
b/wikimetrics/controllers/reports.py
index 901a282..587a562 100644
--- a/wikimetrics/controllers/reports.py
+++ b/wikimetrics/controllers/reports.py
@@ -147,6 +147,22 @@
task_row = task_result[Aggregation.STD].copy()
task_row['user_id'] = Aggregation.STD
task_rows.append(task_row)
+
+
+ #========================================================
+
+ parameters = json.loads(pj.parameters)
+
+ # generate some empty rows to separate the result
+ # from the parameters
+ task_rows.append({})
+ task_rows.append({})
+ task_rows.append({ 'user_id': 'parameters' })
+
+ for key,value in parameters.items():
+ task_rows.append({ 'user_id': key , fieldnames[1]: value })
+
+ task_rows.append({'user_id': 'metric/cohort name', fieldnames[1]:
pj.name});
writer.writeheader()
writer.writerows(task_rows)
--
To view, visit https://gerrit.wikimedia.org/r/81261
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6bfaf73074ffd4d1c1ecb817b1d5ce5c096b3daf
Gerrit-PatchSet: 2
Gerrit-Project: analytics/wikimetrics
Gerrit-Branch: master
Gerrit-Owner: Stefan.petrea <ste...@garage-coding.com>
Gerrit-Reviewer: Milimetric <dandree...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
