From a83e744c684ef91d69f7e59e1b63b535821de8df Mon Sep 17 00:00:00 2001
From: Rebecca Law <rebecca.law@digital.cabinet-office.gov.uk>
Date: Tue, 13 Jun 2017 11:55:14 +0100
Subject: [PATCH] Remove join to Template table. Fix typo in unit test.

---
 app/dao/jobs_dao.py        |  7 ++-----
 tests/app/job/test_rest.py | 10 +++++-----
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/app/dao/jobs_dao.py b/app/dao/jobs_dao.py
index 236ddcab8..748b7cbaa 100644
--- a/app/dao/jobs_dao.py
+++ b/app/dao/jobs_dao.py
@@ -149,9 +149,8 @@ def dao_get_job_statistics_for_job(service_id, job_id):
     query = Job.query.join(
         JobStatistics, Job.id == JobStatistics.job_id
     ).filter(
-        Job.id == job_id
-    ).join(
-        Template, Template.id == Job.template_id and Template.version == Job.template_version
+        Job.id == job_id,
+        Job.service_id == service_id
     ).add_columns(
         JobStatistics.job_id,
         Job.original_file_name,
@@ -165,8 +164,6 @@ def dao_get_job_statistics_for_job(service_id, job_id):
         JobStatistics.sent,
         JobStatistics.delivered,
         JobStatistics.failed
-    ).filter(
-        Job.service_id == service_id
     )
     return query.one()
 
diff --git a/tests/app/job/test_rest.py b/tests/app/job/test_rest.py
index b7ba7689d..0ed3a533b 100644
--- a/tests/app/job/test_rest.py
+++ b/tests/app/job/test_rest.py
@@ -796,8 +796,9 @@ def test_get_jobs_raises_for_bad_limit_days(client, sample_service):
                           query_string={'limit_days': 'bad_number'},
                           headers=[auth_header])
     assert response.status_code == 400
-    assert response.get_data(as_text=True) == '{\n  "message": {\n    "limit_days": [\n      ' \
-                                              '"bad_number is not an integer"\n    ]\n  },\n  "result": "error"\n}'
+    resp_json = json.loads(response.get_data(as_text=True))
+    assert resp_json["result"] == "error"
+    assert resp_json["message"] == {'limit_days': ['bad_number is not an integer']}
 
 
 def test_parse_status_turns_comma_sep_strings_into_list():
@@ -831,8 +832,7 @@ def test_get_job_stats_by_service_id_and_job_id(client, sample_job):
 
 
 def test_get_job_stats_with_invalid_job_id_returns404(client, sample_template):
-    service_id = sample_template.service.id
-    path = '/service/{}/job/job-=stats{}'.format(service_id, "bad-id")
+    path = '/service/{}/job/job-stats{}'.format(sample_template.service.id, uuid.uuid4())
     auth_header = create_authorization_header()
     response = client.get(path, headers=[auth_header])
     assert response.status_code == 404
@@ -842,7 +842,7 @@ def test_get_job_stats_with_invalid_job_id_returns404(client, sample_template):
 
 
 def test_get_job_stats_with_invalid_service_id_returns404(client, sample_job):
-    path = '/service/{}/job/job-=stats{}'.format(uuid.uuid4(), sample_job.id)
+    path = '/service/{}/job/job-stats{}'.format(uuid.uuid4(), sample_job.id)
     auth_header = create_authorization_header()
     response = client.get(path, headers=[auth_header])
     assert response.status_code == 404