From 6f00d1f45ae13a73bf92a16080ce3da2b88f82ac Mon Sep 17 00:00:00 2001 From: hugh-obrien Date: Tue, 18 Sep 2018 10:05:35 +0100 Subject: [PATCH 1/2] send required export fields for s1 submission --- .../app/coffee/Features/Exports/ExportsController.coffee | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/services/web/app/coffee/Features/Exports/ExportsController.coffee b/services/web/app/coffee/Features/Exports/ExportsController.coffee index 5e76e9a4b8..ea82cf6a04 100644 --- a/services/web/app/coffee/Features/Exports/ExportsController.coffee +++ b/services/web/app/coffee/Features/Exports/ExportsController.coffee @@ -24,7 +24,7 @@ module.exports = export_params.show_source = req.body.show_source if req.body.show_source ExportsHandler.exportProject export_params, (err, export_data) -> - return next(err) if err? + return err if err? logger.log user_id:user_id project_id: project_id @@ -36,11 +36,13 @@ module.exports = exportStatus: (req, res) -> {export_id} = req.params ExportsHandler.fetchExport export_id, (err, export_json) -> - return next(err) if err? + return err if err? parsed_export = JSON.parse(export_json) json = { status_summary: parsed_export.status_summary, - status_detail: parsed_export.status_detail + status_detail: parsed_export.status_detail, + partner_submission_id: parsed_export.partner_submission_id, + token: parsed_export.token } res.send export_json: json From 39f580d6ba277b2a885c313ffb4b06b52019f521 Mon Sep 17 00:00:00 2001 From: hugh-obrien Date: Tue, 18 Sep 2018 10:13:33 +0100 Subject: [PATCH 2/2] fixing broken exports test --- .../web/test/unit/coffee/Exports/ExportsControllerTests.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/web/test/unit/coffee/Exports/ExportsControllerTests.coffee b/services/web/test/unit/coffee/Exports/ExportsControllerTests.coffee index 4e96f68926..36ff01c3ef 100644 --- a/services/web/test/unit/coffee/Exports/ExportsControllerTests.coffee +++ b/services/web/test/unit/coffee/Exports/ExportsControllerTests.coffee @@ -90,6 +90,6 @@ describe 'ExportsController', -> @req.params = {project_id: project_id, export_id: 897} @controller.exportStatus @req, send:(body) => expect(body).to.deep.equal {export_json: { - status_summary: 'completed', status_detail: undefined + status_summary: 'completed', status_detail: undefined, partner_submission_id: undefined, token: undefined }} done()