feat: replace all calls to redis with new db package

Author: williams-jack

orchestrator/packages/api/src/controllers/docker-image-controller.ts

@@ -1,24 +1,22 @@
 import { Request, Response } from "express";
 import { errorResponse } from "./utils";
 import {
-  GradingQueueOperationError,
   validations,
 } from "@codegrade-orca/common";
-import enqueueImageBuild from "../grading-queue/mutations/enqueue-image-build";
+import { GradingQueueOperationException, enqueueImageBuild } from "@codegrade-orca/db";
 
 export const createGraderImage = async (req: Request, res: Response) => {
-  console.log("This works.");
   if (!validations.graderImageBuildRequest(req.body)) {
     return errorResponse(res, 400, [
       "The request body to build a grader image is invalid.",
     ]);
   }
-  console.log("This req was valid.");
   try {
     await enqueueImageBuild(req.body);
     return res.status(200).json({ message: "OK" });
   } catch (error) {
-    if (error instanceof GradingQueueOperationError) {
+    console.error(error);
+    if (error instanceof GradingQueueOperationException) {
       return errorResponse(res, 400, [error.message]);
     } else {
       return errorResponse(res, 500, [

orchestrator/packages/api/src/controllers/grading-queue-controller.ts

@@ -6,17 +6,20 @@ import {
 } from "../utils/pagination";
 import { validateFilterRequest } from "../utils/validate";
 import { errorResponse } from "./utils";
-import { GradingJobRequestError } from "./exceptions";
-import getAllGradingJobs from "../grading-queue/queries/get-grading-jobs";
 import {
   GradingJob,
-  GradingQueueOperationError,
   filterGradingJobs,
   getFilterInfo,
   getGradingQueueStats,
   validations,
 } from "@codegrade-orca/common";
-import mutations from "../grading-queue/mutations";
+import {
+  deleteJob as deleteJobInQueue,
+  createOrUpdateJob as putJobInQueue,
+  getAllGradingJobs,
+  GradingQueueOperationException
+} from "@codegrade-orca/db";
+import { isNaN } from "lodash";
 
 export const getGradingJobs = async (req: Request, res: Response) => {
   if (
@@ -89,7 +92,7 @@ export const getGradingJobs = async (req: Request, res: Response) => {
       filter_info: filterInfo,
     });
   } catch (err) {
-    if (err instanceof GradingQueueOperationError) {
+    if (err instanceof GradingQueueOperationException) {
       return errorResponse(res, 400, [err.message]);
     }
     return errorResponse(res, 500, [
@@ -108,11 +111,11 @@ export const createOrUpdateImmediateJob = async (
   const gradingJobConfig = req.body;
 
   try {
-    await mutations.createOrUpdateJob(gradingJobConfig, Date.now(), true);
+    await putJobInQueue(req.body, true);
     return res.status(200).json({ message: "OK" });
   } catch (error) {
     console.error(error);
-    if (error instanceof GradingQueueOperationError) {
+    if (error instanceof GradingQueueOperationException) {
       return errorResponse(res, 400, [error.message]);
     }
     return errorResponse(res, 500, [
@@ -127,13 +130,12 @@ export const createOrUpdateJob = async (req: Request, res: Response) => {
     return errorResponse(res, 400, ["The given grading job was invalid."]);
   }
 
-  const gradingJobConfig = req.body;
-
   try {
-    await mutations.createOrUpdateJob(gradingJobConfig, Date.now(), false);
+    await putJobInQueue(req.body, false);
     return res.status(200).json({ message: "OK" });
   } catch (err) {
-    if (err instanceof GradingQueueOperationError) {
+    console.error(err);
+    if (err instanceof GradingQueueOperationException) {
       return errorResponse(res, 400, [err.message]);
     } else {
       return errorResponse(res, 500, [
@@ -143,34 +145,27 @@ export const createOrUpdateJob = async (req: Request, res: Response) => {
   }
 };
 
-export const moveJob = async (req: Request, res: Response) => {
-  if (!validations.moveJobRequest(req.body)) {
-    errorResponse(res, 400, ["Invalid move request."]);
-    return;
-  }
-  try {
-    await mutations.moveJob(req.body);
-    return res.status(200).json("OK");
-  } catch (err) {
-    if (err instanceof GradingQueueOperationError) {
-      return errorResponse(res, 500, [err.message]);
-    }
-    return errorResponse(res, 500, [
-      `An error occurred while trying to move job with key ${req.body.orcaKey}.`,
-    ]);
-  }
+export const moveJob = async (_req: Request, res: Response) => {
+  return errorResponse(res, 500, ["Functionality to move a job remains to be implemented. " +
+  "Please contact [email protected] for more info."]);
+  // if (!validations.moveJobRequest(req.body)) {
+    // errorResponse(res, 400, ["Invalid move request."]);
+    // return;
+  // }
 };
 
 export const deleteJob = async (req: Request, res: Response) => {
-  if (!validations.deleteJobRequest(req.body)) {
-    return errorResponse(res, 400, ["Invalid delete request."]);
-  }
+  const { jobID: rawJobID } = req.params;
   try {
-    await mutations.deleteJob(req.body);
+    const jobID = parseInt(rawJobID);
+    if (isNaN(jobID)) {
+      return errorResponse(res, 400, ["Given job ID is not a number."]);
+    }
+    await deleteJobInQueue(jobID);
     return res.status(200).json({ message: "OK" });
   } catch (err) {
-    if (err instanceof GradingQueueOperationError) {
-      return errorResponse(res, 500, [err.message]);
+    if (err instanceof GradingQueueOperationException) {
+      return errorResponse(res, 400, [err.message]);
     } else {
       return errorResponse(res, 500, [
         `Something went wrong when trying to delete job with key ${req.body.orcaKey}.`,