Merge pull request #375 from canonical/CERTTF-373

Update server logic to select jobs with high priority

server/src/api/v1.py

@@ -664,6 +664,7 @@ def job_position_get(job_id):
     jobs = database.mongo.db.jobs.find(
         {"job_data.job_queue": queue, "result_data.job_state": "waiting"},
         {"job_id": 1},
+        sort=[("job_priority", -1)],
     )
     # Create a dict mapping job_id (as a string) to the position in the queue
     jobs_id_position = {job.get("job_id"): pos for pos, job in enumerate(jobs)}

server/src/database.py

@@ -190,8 +190,9 @@ def pop_job(queue_list):
                 "job_id": True,
                 "created_at": True,
                 "job_data": True,
-                "_id": False,
+                "_id": True,
             },
+            sort=[("job_priority", -1)],
         )
     except TypeError:
         return None

server/tests/test_v1.py

@@ -877,3 +877,63 @@ def test_missing_fields_in_token(mongo_app_with_permissions):
     )
     assert 403 == job_response.status_code
     assert "Invalid Token" in job_response.text
+
+
+def test_job_get_with_priority(mongo_app_with_permissions):
+    """Tests job get returns job with highest job priority"""
+    app, _, client_id, client_key, _ = mongo_app_with_permissions
+    authenticate_output = app.post(
+        "/v1/oauth2/token",
+        headers=create_auth_header(client_id, client_key),
+    )
+    token = authenticate_output.data.decode("utf-8")
+    jobs = [
+        {"job_queue": "myqueue2"},
+        {"job_queue": "myqueue2", "job_priority": 200},
+        {"job_queue": "myqueue2", "job_priority": 100},
+    ]
+    job_ids = []
+    for job in jobs:
+        job_response = app.post(
+            "/v1/job", json=job, headers={"Authorization": token}
+        )
+        job_id = job_response.json.get("job_id")
+        job_ids.append(job_id)
+    returned_job_ids = []
+    for _ in range(len(jobs)):
+        job_get_response = app.get("/v1/job?queue=myqueue2")
+        job_id = job_get_response.json.get("job_id")
+        returned_job_ids.append(job_id)
+    assert returned_job_ids[0] == job_ids[1]
+    assert returned_job_ids[1] == job_ids[2]
+    assert returned_job_ids[2] == job_ids[0]
+
+
+def test_job_position_get_with_priority(mongo_app_with_permissions):
+    """Tests job position get returns correct position with priority"""
+    app, _, client_id, client_key, _ = mongo_app_with_permissions
+    authenticate_output = app.post(
+        "/v1/oauth2/token",
+        headers=create_auth_header(client_id, client_key),
+    )
+    token = authenticate_output.data.decode("utf-8")
+    jobs = [
+        {"job_queue": "myqueue2"},
+        {"job_queue": "myqueue2", "job_priority": 200},
+        {"job_queue": "myqueue2", "job_priority": 100},
+    ]
+    job_ids = []
+    for job in jobs:
+        job_response = app.post(
+            "/v1/job", json=job, headers={"Authorization": token}
+        )
+        job_id = job_response.json.get("job_id")
+        job_ids.append(job_id)
+
+    job_positions = []
+    for job_id in job_ids:
+        job_positions.append(app.get(f"/v1/job/{job_id}/position").text)
+
+    assert job_positions[0] == "2"
+    assert job_positions[1] == "0"
+    assert job_positions[2] == "1"