6 files changed, 77 insertions, 6 deletions
diff --git a/opendc/api/v1/traces/traceId/tasks/__init__.py b/opendc/api/v1/traces/traceId/jobs/__init__.py
index e69de29b..e69de29b 100644
--- a/opendc/api/v1/traces/traceId/tasks/__init__.py
+++ b/opendc/api/v1/traces/traceId/jobs/__init__.py
diff --git a/opendc/api/v1/traces/traceId/tasks/endpoint.py b/opendc/api/v1/traces/traceId/jobs/endpoint.py
index 6acf790c..2f271c9e 100644
--- a/opendc/api/v1/traces/traceId/tasks/endpoint.py
+++ b/opendc/api/v1/traces/traceId/jobs/endpoint.py
@@ -1,10 +1,10 @@
 from opendc.models.trace import Trace
-from opendc.models.task import Task
+from opendc.models.job import Job
 from opendc.util import database, exceptions
 from opendc.util.rest import Response
 
 def GET(request):
-    """Get this Trace's Tasks."""
+    """Get this Trace's Jobs."""
 
     # Make sure required parameters are there
 
@@ -25,12 +25,12 @@ def GET(request):
     if not trace.exists():
         return Response(404, '{} not found.'.format(trace))
 
-    # Get and return the Tasks
+    # Get and return the Jobs
 
-    tasks = Task.query('trace_id', request.params_path['traceId'])
+    jobs = Job.query('trace_id', request.params_path['traceId'])
 
     return Response(
         200,
-        'Successfully retrieved Tasks for {}.'.format(trace),
-        [x.to_JSON() for x in tasks]
+        'Successfully retrieved Jobs for {}.'.format(trace),
+        [x.to_JSON() for x in jobs]
     )
diff --git a/opendc/api/v1/traces/traceId/jobs/jobId/__init__.py b/opendc/api/v1/traces/traceId/jobs/jobId/__init__.py
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/opendc/api/v1/traces/traceId/jobs/jobId/__init__.py
diff --git a/opendc/api/v1/traces/traceId/jobs/jobId/endpoint.py b/opendc/api/v1/traces/traceId/jobs/jobId/endpoint.py
new file mode 100644
index 00000000..8bf26ab5
--- /dev/null
+++ b/opendc/api/v1/traces/traceId/jobs/jobId/endpoint.py
@@ -0,0 +1,34 @@
+from opendc.models.job import Job
+from opendc.util import exceptions
+from opendc.util.rest import Response
+
+def GET(request):
+    """Get this Job."""
+
+    # Make sure required parameters are there
+
+    try:
+        request.check_required_parameters(
+            path = {
+                'traceId': 'int',
+                'jobId': 'int'
+            }
+        )
+
+    except exceptions.ParameterError as e:
+        return Response(400, e.message)
+
+    # Instantiate a Trace and make sure it exists
+
+    job = Job.from_primary_key((request.params_path['jobId'],))
+
+    if not job.exists():
+        return Response(404, '{} not found.'.format(job))
+
+    # Return this Job
+
+    return Response(
+        200,
+        'Successfully retrieved {}.'.format(job),
+        job.to_JSON()
+    )
diff --git a/opendc/api/v1/traces/traceId/jobs/jobId/tasks/__init__.py b/opendc/api/v1/traces/traceId/jobs/jobId/tasks/__init__.py
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/opendc/api/v1/traces/traceId/jobs/jobId/tasks/__init__.py
diff --git a/opendc/api/v1/traces/traceId/jobs/jobId/tasks/endpoint.py b/opendc/api/v1/traces/traceId/jobs/jobId/tasks/endpoint.py
new file mode 100644
index 00000000..ecd38758
--- /dev/null
+++ b/opendc/api/v1/traces/traceId/jobs/jobId/tasks/endpoint.py
@@ -0,0 +1,37 @@
+from opendc.models.job import Job
+from opendc.models.task import Task
+from opendc.util import database, exceptions
+from opendc.util.rest import Response
+
+def GET(request):
+    """Get this Job's Tasks."""
+
+    # Make sure required parameters are there
+
+    try:
+        request.check_required_parameters(
+            path = {
+                'traceId': 'int',
+                'jobId': 'int'
+            }
+        )
+
+    except exceptions.ParameterError as e:
+        return Response(400, e.message)
+
+    # Instantiate a Job and make sure it exists
+
+    job = Job.from_primary_key((request.params_path['jobId'],))
+
+    if not job.exists():
+        return Response(404, '{} not found.'.format(job))
+
+    # Get and return the Tasks
+
+    tasks = Task.query('job_id', request.params_path['jobId'])
+
+    return Response(
+        200,
+        'Successfully retrieved Tasks for {}.'.format(job),
+        [x.to_JSON() for x in tasks]
+    )