Added new endpoint for job statistics.

The structure has been flattened, so I need to create a new endpoint, start using that endpoint, then change the name back.
Added template_id and version to the get job stats by id.

app/dao/jobs_dao.py

@@ -145,20 +145,31 @@ def dao_get_all_letter_jobs():
 
 
 @statsd(namespace="dao")
-def dao_get_job_statistics_for_job(job_id):
-    query = db.session.query(
+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
+    ).add_columns(
         JobStatistics.job_id,
         Job.original_file_name,
         Job.created_at,
+        Job.scheduled_for,
+        Job.template_id,
+        Job.template_version,
         JobStatistics.sent,
         JobStatistics.delivered,
         JobStatistics.failed
-    ).filter(JobStatistics.job_id == job_id).filter(Job.id == JobStatistics.job_id)
+    ).filter(
+        Job.service_id == service_id
+    )
     return query.one()
 
 
 @statsd(namespace="dao")
-def dao_get_job_stats_for_service(service_id, page=1, page_size=50, limit_days=None):
+def dao_get_job_stats_for_service(service_id, page=1, page_size=50, limit_days=None, statuses=None):
     query = Job.query.join(
         JobStatistics, Job.id == JobStatistics.job_id
     ).filter(
@@ -167,11 +178,15 @@ def dao_get_job_stats_for_service(service_id, page=1, page_size=50, limit_days=N
         JobStatistics.job_id,
         Job.original_file_name,
         Job.created_at,
+        Job.scheduled_for,
         JobStatistics.sent,
         JobStatistics.delivered,
         JobStatistics.failed
     )
     if limit_days:
         query = query.filter(Job.created_at >= days_ago(limit_days))
+    if statuses is not None and statuses != ['']:
+        query = query.filter(Job.job_status.in_(statuses))
+
     query = query.order_by(Job.created_at.desc())
-    return query.paginate(page=page, per_page=page_size).items
+    return query.paginate(page=page, per_page=page_size)

app/job/rest.py

@@ -11,8 +11,8 @@ from app.dao.jobs_dao import (
     dao_get_job_by_service_id_and_job_id,
     dao_get_jobs_by_service_id,
     dao_get_future_scheduled_job_by_id_and_service_id,
-    dao_get_notification_outcomes_for_job
-)
+    dao_get_notification_outcomes_for_job,
+    dao_get_job_stats_for_service)
 
 from app.dao.services_dao import (
     dao_fetch_service_by_id
@@ -117,6 +117,52 @@ def get_jobs_by_service(service_id):
     return jsonify(**get_paginated_jobs(service_id, limit_days, statuses, page))
 
 
+@job_blueprint.route('/job-stats', methods=['GET'])
+def get_jobs_for_service(service_id):
+    if request.args.get('limit_days'):
+        try:
+            limit_days = int(request.args['limit_days'])
+        except ValueError:
+            errors = {'limit_days': ['{} is not an integer'.format(request.args['limit_days'])]}
+            raise InvalidRequest(errors, status_code=400)
+    else:
+        limit_days = None
+    statuses = _parse_statuses(request.args.get('statuses', ''))
+    page = int(request.args.get('page', 1))
+
+    pagination = dao_get_job_stats_for_service(service_id=service_id,
+                                               page=page,
+                                               page_size=current_app.config['PAGE_SIZE'],
+                                               limit_days=limit_days,
+                                               statuses=statuses)
+    return jsonify({
+        'data': [_serialize_job_stats(x) for x in pagination.items],
+        'page_size': pagination.per_page,
+        'total': pagination.total,
+        'links': pagination_links(
+            pagination,
+            '.get_jobs_by_service',
+            service_id=service_id
+        )
+    })
+
+
+def _parse_statuses(statuses):
+    return [x.strip() for x in statuses.split(',')]
+
+
+def _serialize_job_stats(stat):
+    return {
+        "job_id": stat.job_id,
+        "original_file_name": stat.original_file_name,
+        "created_at": stat.created_at,
+        "scheduled_for": stat.scheduled_for,
+        "sent": stat.sent,
+        "delivered": stat.delivered,
+        "failed": stat.failed
+    }
+
+
 @job_blueprint.route('', methods=['POST'])
 def create_job(service_id):
     service = dao_fetch_service_by_id(service_id)