@terreno/jobs 57.4.0 → 57.6.0

package/dist/routes/jobsAdmin.js

@@ -1,103 +1,18 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
-    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
-var __values = (this && this.__values) || function(o) {
-    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
-    if (m) return m.call(o);
-    if (o && typeof o.length === "number") return {
-        next: function () {
-            if (o && i >= o.length) o = void 0;
-            return { value: o && o[i++], done: !o };
-        }
-    };
-    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
-};
-var __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.registerJobsAdminRoutes = void 0;
-var api_1 = require("@terreno/api");
-var luxon_1 = require("luxon");
-var mongoose_1 = __importDefault(require("mongoose"));
-var job_1 = require("../models/job");
-var jobSchedule_1 = require("../models/jobSchedule");
-var DEFAULT_LIMIT = 50;
-var MAX_LIMIT = 200;
-var MAX_Q_LENGTH = 200;
-var VALID_JOB_STATUSES = new Set([
+const api_1 = require("@terreno/api");
+const luxon_1 = require("luxon");
+const mongoose_1 = __importDefault(require("mongoose"));
+const job_1 = require("../models/job");
+const jobSchedule_1 = require("../models/jobSchedule");
+const DEFAULT_LIMIT = 50;
+const MAX_LIMIT = 200;
+const MAX_Q_LENGTH = 200;
+const VALID_JOB_STATUSES = new Set([
     "cancelled",
     "completed",
     "dead",
@@ -106,14 +21,14 @@ var VALID_JOB_STATUSES = new Set([
     "running",
     "scheduled",
 ]);
-var JOB_ADMIN_ITEM_SCHEMA = {
+const JOB_ADMIN_ITEM_SCHEMA = {
     _id: { type: "string" },
     attemptCount: { type: "number" },
     id: { type: "string" },
     name: { type: "string" },
     status: { type: "string" },
 };
-var SCHEDULE_ADMIN_ITEM_SCHEMA = {
+const SCHEDULE_ADMIN_ITEM_SCHEMA = {
     cron: { type: "string" },
     enabled: { type: "boolean" },
     handlerName: { type: "string" },
@@ -122,21 +37,21 @@ var SCHEDULE_ADMIN_ITEM_SCHEMA = {
     nextRunAt: { format: "date-time", type: "string" },
     timezone: { type: "string" },
 };
-var pathParam = function (value) {
+const pathParam = (value) => {
     if (Array.isArray(value)) {
         return value[0];
     }
     return value;
 };
-var readString = function (value) {
+const readString = (value) => {
     if (typeof value !== "string") {
         return undefined;
     }
-    var trimmed = value.trim();
+    const trimmed = value.trim();
     return trimmed.length > 0 ? trimmed : undefined;
 };
-var readPositiveInt = function (value, fallback, max) {
-    var parsed = typeof value === "number"
+const readPositiveInt = (value, fallback, max) => {
+    const parsed = typeof value === "number"
         ? value
         : typeof value === "string" && value.trim().length > 0
             ? Number(value)
@@ -146,20 +61,20 @@ var readPositiveInt = function (value, fallback, max) {
     }
     return Math.min(Math.floor(parsed), max);
 };
-var escapeRegexLiteral = function (value) { return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"); };
-var parseIsoDate = function (value, label) {
-    var raw = readString(value);
+const escapeRegexLiteral = (value) => value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+const parseIsoDate = (value, label) => {
+    const raw = readString(value);
     if (!raw) {
         return undefined;
     }
-    var parsed = luxon_1.DateTime.fromISO(raw, { zone: "utc" });
+    const parsed = luxon_1.DateTime.fromISO(raw, { zone: "utc" });
     if (!parsed.isValid) {
-        throw new api_1.APIError({ status: 400, title: "Invalid ".concat(label) });
+        throw new api_1.APIError({ status: 400, title: `Invalid ${label}` });
     }
     return parsed.toJSDate();
 };
-var parseSearchQuery = function (value) {
-    var raw = readString(value);
+const parseSearchQuery = (value) => {
+    const raw = readString(value);
     if (!raw) {
         return undefined;
     }
@@ -168,8 +83,8 @@ var parseSearchQuery = function (value) {
     }
     return escapeRegexLiteral(raw);
 };
-var parseStatusFilter = function (value) {
-    var status = readString(value);
+const parseStatusFilter = (value) => {
+    const status = readString(value);
     if (!status) {
         return undefined;
     }
@@ -178,15 +93,15 @@ var parseStatusFilter = function (value) {
     }
     return status;
 };
-var parseListFilters = function (query) { return ({
+const parseListFilters = (query) => ({
     end: parseIsoDate(query.end, "end date"),
     name: readString(query.name),
     q: parseSearchQuery(query.q),
     scheduleId: readString(query.scheduleId),
     start: parseIsoDate(query.start, "start date"),
     status: parseStatusFilter(query.status),
-}); };
-var EMPTY_STATUS_COUNTS = {
+});
+const EMPTY_STATUS_COUNTS = {
     cancelled: 0,
     completed: 0,
     dead: 0,
@@ -195,31 +110,20 @@ var EMPTY_STATUS_COUNTS = {
     running: 0,
     scheduled: 0,
 };
-var buildStatusCounts = function (grouped) {
-    var e_1, _a;
-    var byStatus = __assign({}, EMPTY_STATUS_COUNTS);
-    var total = 0;
-    try {
-        for (var grouped_1 = __values(grouped), grouped_1_1 = grouped_1.next(); !grouped_1_1.done; grouped_1_1 = grouped_1.next()) {
-            var row = grouped_1_1.value;
-            if (!VALID_JOB_STATUSES.has(row._id)) {
-                continue;
-            }
-            byStatus[row._id] = row.count;
-            total += row.count;
-        }
-    }
-    catch (e_1_1) { e_1 = { error: e_1_1 }; }
-    finally {
-        try {
-            if (grouped_1_1 && !grouped_1_1.done && (_a = grouped_1.return)) _a.call(grouped_1);
+const buildStatusCounts = (grouped) => {
+    const byStatus = { ...EMPTY_STATUS_COUNTS };
+    let total = 0;
+    for (const row of grouped) {
+        if (!VALID_JOB_STATUSES.has(row._id)) {
+            continue;
         }
-        finally { if (e_1) throw e_1.error; }
+        byStatus[row._id] = row.count;
+        total += row.count;
     }
-    return { byStatus: byStatus, total: total };
+    return { byStatus, total };
 };
-var buildListMatch = function (filters) {
-    var match = {};
+const buildListMatch = (filters) => {
+    const match = {};
     if (filters.name) {
         match.name = filters.name;
     }
@@ -233,7 +137,7 @@ var buildListMatch = function (filters) {
         match.scheduleId = new mongoose_1.default.Types.ObjectId(filters.scheduleId);
     }
     if (filters.start || filters.end) {
-        var created = {};
+        const created = {};
         if (filters.start) {
             created.$gte = filters.start;
         }
@@ -250,7 +154,7 @@ var buildListMatch = function (filters) {
     }
     return match;
 };
-var projectAdminPayload = function (job, redactPayload) {
+const projectAdminPayload = (job, redactPayload) => {
     if (job.payloadRedacted) {
         return undefined;
     }
@@ -263,70 +167,66 @@ var projectAdminPayload = function (job, redactPayload) {
         payloadRedacted: job.payloadRedacted,
     });
 };
-var serializeJob = function (job, redactPayload) {
-    var json = job.toJSON();
-    var _storedPayload = json.payload, rest = __rest(json, ["payload"]);
-    var projectedPayload = projectAdminPayload(job, redactPayload);
+const serializeJob = (job, redactPayload) => {
+    const json = job.toJSON();
+    const { payload: _storedPayload, ...rest } = json;
+    const projectedPayload = projectAdminPayload(job, redactPayload);
     if (projectedPayload === undefined) {
-        return __assign(__assign({}, rest), { id: job._id.toString() });
+        return {
+            ...rest,
+            id: job._id.toString(),
+        };
     }
-    return __assign(__assign({}, rest), { id: job._id.toString(), payload: projectedPayload });
+    return {
+        ...rest,
+        id: job._id.toString(),
+        payload: projectedPayload,
+    };
 };
-var serializeSchedule = function (schedule) {
-    var json = schedule.toJSON();
-    return __assign(__assign({}, json), { id: schedule._id.toString() });
+const serializeSchedule = (schedule) => {
+    const json = schedule.toJSON();
+    return {
+        ...json,
+        id: schedule._id.toString(),
+    };
 };
-var createRequireJobsAdmin = function (accessControl) {
-    return function (req) { return __awaiter(void 0, void 0, void 0, function () {
-        var user, result;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    user = req.user;
-                    if (!user) {
-                        throw new api_1.UnauthorizedError("Authentication required");
-                    }
-                    if (!accessControl) return [3 /*break*/, 2];
-                    return [4 /*yield*/, accessControl.can({
-                            permissions: { admin: [api_1.ADMIN_PAGE_ACTION, "jobs"] },
-                            user: user,
-                        })];
-                case 1:
-                    result = _a.sent();
-                    if (!result.allowed) {
-                        throw new api_1.ForbiddenError({
-                            detail: result.reason,
-                            title: "Jobs admin access required",
-                        });
-                    }
-                    return [2 /*return*/];
-                case 2:
-                    if (!user.admin) {
-                        throw new api_1.ForbiddenError("Admin access required");
-                    }
-                    return [2 /*return*/];
-            }
+const createRequireJobsAdmin = (accessControl) => async (req) => {
+    const user = req.user;
+    if (!user) {
+        throw new api_1.UnauthorizedError("Authentication required");
+    }
+    if (accessControl) {
+        const result = await accessControl.can({
+            permissions: { admin: [api_1.ADMIN_PAGE_ACTION, "jobs"] },
+            user: user,
         });
-    }); };
-};
-var listQueryParameters = function (builder) {
-    return builder
-        .withQueryParameter("page", { type: "number" }, { required: false })
-        .withQueryParameter("limit", { type: "number" }, { required: false })
-        .withQueryParameter("name", { type: "string" }, { required: false })
-        .withQueryParameter("status", { type: "string" }, { required: false })
-        .withQueryParameter("scheduleId", { type: "string" }, { required: false })
-        .withQueryParameter("start", { type: "string" }, { required: false })
-        .withQueryParameter("end", { type: "string" }, { required: false })
-        .withQueryParameter("q", { type: "string" }, { required: false });
+        if (!result.allowed) {
+            throw new api_1.ForbiddenError({
+                detail: result.reason,
+                title: "Jobs admin access required",
+            });
+        }
+        return;
+    }
+    if (!user.admin) {
+        throw new api_1.ForbiddenError("Admin access required");
+    }
 };
-var registerJobsAdminRoutes = function (_a) {
-    var app = _a.app, options = _a.options;
-    var routeOpenApi = options.openApi ? { openApi: options.openApi } : {};
-    var requireJobsAdmin = createRequireJobsAdmin(options.accessControl);
-    var basePath = options.basePath;
-    var jobsService = options.jobsService, redactPayload = options.redactPayload;
-    app.get("".concat(basePath, "/schedules"), [
+const listQueryParameters = (builder) => builder
+    .withQueryParameter("page", { type: "number" }, { required: false })
+    .withQueryParameter("limit", { type: "number" }, { required: false })
+    .withQueryParameter("name", { type: "string" }, { required: false })
+    .withQueryParameter("status", { type: "string" }, { required: false })
+    .withQueryParameter("scheduleId", { type: "string" }, { required: false })
+    .withQueryParameter("start", { type: "string" }, { required: false })
+    .withQueryParameter("end", { type: "string" }, { required: false })
+    .withQueryParameter("q", { type: "string" }, { required: false });
+const registerJobsAdminRoutes = ({ app, options, }) => {
+    const routeOpenApi = options.openApi ? { openApi: options.openApi } : {};
+    const requireJobsAdmin = createRequireJobsAdmin(options.accessControl);
+    const basePath = options.basePath;
+    const { jobsService, redactPayload } = options;
+    app.get(`${basePath}/schedules`, [
         (0, api_1.authenticateMiddleware)(),
         (0, api_1.createOpenApiBuilder)(routeOpenApi)
             .withTags(["admin", "jobs"])
@@ -341,21 +241,12 @@ var registerJobsAdminRoutes = function (_a) {
             },
         })
             .build(),
-    ], (0, api_1.asyncHandler)(function (req, res) { return __awaiter(void 0, void 0, void 0, function () {
-        var schedules;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, requireJobsAdmin(req)];
-                case 1:
-                    _a.sent();
-                    return [4 /*yield*/, jobSchedule_1.JobSchedule.find({}).sort("name")];
-                case 2:
-                    schedules = _a.sent();
-                    return [2 /*return*/, res.json({ data: schedules.map(function (schedule) { return serializeSchedule(schedule); }) })];
-            }
-        });
-    }); }));
-    app.post("".concat(basePath, "/schedules/:name/pause"), [
+    ], (0, api_1.asyncHandler)(async (req, res) => {
+        await requireJobsAdmin(req);
+        const schedules = await jobSchedule_1.JobSchedule.find({}).sort("name");
+        return res.json({ data: schedules.map((schedule) => serializeSchedule(schedule)) });
+    }));
+    app.post(`${basePath}/schedules/:name/pause`, [
         (0, api_1.authenticateMiddleware)(),
         (0, api_1.createOpenApiBuilder)(routeOpenApi)
             .withTags(["admin", "jobs"])
@@ -363,25 +254,16 @@ var registerJobsAdminRoutes = function (_a) {
             .withPathParameter("name", { type: "string" })
             .withResponse(200, { data: { type: "object" } })
             .build(),
-    ], (0, api_1.asyncHandler)(function (req, res) { return __awaiter(void 0, void 0, void 0, function () {
-        var name, schedule;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, requireJobsAdmin(req)];
-                case 1:
-                    _a.sent();
-                    name = pathParam(req.params.name);
-                    if (!name) {
-                        throw new api_1.NotFoundError("Schedule not found");
-                    }
-                    return [4 /*yield*/, jobsService.pauseSchedule(name)];
-                case 2:
-                    schedule = _a.sent();
-                    return [2 /*return*/, res.json({ data: serializeSchedule(schedule) })];
-            }
-        });
-    }); }));
-    app.post("".concat(basePath, "/schedules/:name/resume"), [
+    ], (0, api_1.asyncHandler)(async (req, res) => {
+        await requireJobsAdmin(req);
+        const name = pathParam(req.params.name);
+        if (!name) {
+            throw new api_1.NotFoundError("Schedule not found");
+        }
+        const schedule = await jobsService.pauseSchedule(name);
+        return res.json({ data: serializeSchedule(schedule) });
+    }));
+    app.post(`${basePath}/schedules/:name/resume`, [
         (0, api_1.authenticateMiddleware)(),
         (0, api_1.createOpenApiBuilder)(routeOpenApi)
             .withTags(["admin", "jobs"])
@@ -389,24 +271,15 @@ var registerJobsAdminRoutes = function (_a) {
             .withPathParameter("name", { type: "string" })
             .withResponse(200, { data: { type: "object" } })
             .build(),
-    ], (0, api_1.asyncHandler)(function (req, res) { return __awaiter(void 0, void 0, void 0, function () {
-        var name, schedule;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, requireJobsAdmin(req)];
-                case 1:
-                    _a.sent();
-                    name = pathParam(req.params.name);
-                    if (!name) {
-                        throw new api_1.NotFoundError("Schedule not found");
-                    }
-                    return [4 /*yield*/, jobsService.resumeSchedule(name)];
-                case 2:
-                    schedule = _a.sent();
-                    return [2 /*return*/, res.json({ data: serializeSchedule(schedule) })];
-            }
-        });
-    }); }));
+    ], (0, api_1.asyncHandler)(async (req, res) => {
+        await requireJobsAdmin(req);
+        const name = pathParam(req.params.name);
+        if (!name) {
+            throw new api_1.NotFoundError("Schedule not found");
+        }
+        const schedule = await jobsService.resumeSchedule(name);
+        return res.json({ data: serializeSchedule(schedule) });
+    }));
     app.get(basePath, [
         (0, api_1.authenticateMiddleware)(),
         listQueryParameters((0, api_1.createOpenApiBuilder)(routeOpenApi)
@@ -426,35 +299,26 @@ var registerJobsAdminRoutes = function (_a) {
             total: { type: "number" },
         })
             .build(),
-    ], (0, api_1.asyncHandler)(function (req, res) { return __awaiter(void 0, void 0, void 0, function () {
-        var filters, page, limit, skip, match, _a, jobs, total;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
-                case 0: return [4 /*yield*/, requireJobsAdmin(req)];
-                case 1:
-                    _b.sent();
-                    filters = parseListFilters(req.query);
-                    page = readPositiveInt(req.query.page, 1, Number.MAX_SAFE_INTEGER);
-                    limit = readPositiveInt(req.query.limit, DEFAULT_LIMIT, MAX_LIMIT);
-                    skip = (page - 1) * limit;
-                    match = buildListMatch(filters);
-                    return [4 /*yield*/, Promise.all([
-                            job_1.Job.find(match).sort("-created").skip(skip).limit(limit),
-                            job_1.Job.countDocuments(match),
-                        ])];
-                case 2:
-                    _a = __read.apply(void 0, [_b.sent(), 2]), jobs = _a[0], total = _a[1];
-                    return [2 /*return*/, res.json({
-                            data: jobs.map(function (job) { return serializeJob(job, redactPayload); }),
-                            limit: limit,
-                            more: skip + limit < total,
-                            page: page,
-                            total: total,
-                        })];
-            }
+    ], (0, api_1.asyncHandler)(async (req, res) => {
+        await requireJobsAdmin(req);
+        const filters = parseListFilters(req.query);
+        const page = readPositiveInt(req.query.page, 1, Number.MAX_SAFE_INTEGER);
+        const limit = readPositiveInt(req.query.limit, DEFAULT_LIMIT, MAX_LIMIT);
+        const skip = (page - 1) * limit;
+        const match = buildListMatch(filters);
+        const [jobs, total] = await Promise.all([
+            job_1.Job.find(match).sort("-created").skip(skip).limit(limit),
+            job_1.Job.countDocuments(match),
+        ]);
+        return res.json({
+            data: jobs.map((job) => serializeJob(job, redactPayload)),
+            limit,
+            more: skip + limit < total,
+            page,
+            total,
         });
-    }); }));
-    app.get("".concat(basePath, "/stats"), [
+    }));
+    app.get(`${basePath}/stats`, [
         (0, api_1.authenticateMiddleware)(),
         (0, api_1.createOpenApiBuilder)(routeOpenApi)
             .withTags(["admin", "jobs"])
@@ -469,23 +333,14 @@ var registerJobsAdminRoutes = function (_a) {
             },
         })
             .build(),
-    ], (0, api_1.asyncHandler)(function (req, res) { return __awaiter(void 0, void 0, void 0, function () {
-        var grouped;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, requireJobsAdmin(req)];
-                case 1:
-                    _a.sent();
-                    return [4 /*yield*/, job_1.Job.aggregate([
-                            { $group: { _id: "$status", count: { $sum: 1 } } },
-                        ])];
-                case 2:
-                    grouped = _a.sent();
-                    return [2 /*return*/, res.json({ data: buildStatusCounts(grouped) })];
-            }
-        });
-    }); }));
-    app.get("".concat(basePath, "/:id"), [
+    ], (0, api_1.asyncHandler)(async (req, res) => {
+        await requireJobsAdmin(req);
+        const grouped = await job_1.Job.aggregate([
+            { $group: { _id: "$status", count: { $sum: 1 } } },
+        ]);
+        return res.json({ data: buildStatusCounts(grouped) });
+    }));
+    app.get(`${basePath}/:id`, [
         (0, api_1.authenticateMiddleware)(),
         (0, api_1.createOpenApiBuilder)(routeOpenApi)
             .withTags(["admin", "jobs"])
@@ -493,28 +348,19 @@ var registerJobsAdminRoutes = function (_a) {
             .withPathParameter("id", { type: "string" })
             .withResponse(200, { data: { type: "object" } })
             .build(),
-    ], (0, api_1.asyncHandler)(function (req, res) { return __awaiter(void 0, void 0, void 0, function () {
-        var id, job;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, requireJobsAdmin(req)];
-                case 1:
-                    _a.sent();
-                    id = pathParam(req.params.id);
-                    if (!id || !mongoose_1.default.isValidObjectId(id)) {
-                        throw new api_1.NotFoundError("Job not found");
-                    }
-                    return [4 /*yield*/, job_1.Job.findOneOrNone({ _id: id })];
-                case 2:
-                    job = _a.sent();
-                    if (!job) {
-                        throw new api_1.NotFoundError("Job not found");
-                    }
-                    return [2 /*return*/, res.json({ data: serializeJob(job, redactPayload) })];
-            }
-        });
-    }); }));
-    app.post("".concat(basePath, "/:id/retry"), [
+    ], (0, api_1.asyncHandler)(async (req, res) => {
+        await requireJobsAdmin(req);
+        const id = pathParam(req.params.id);
+        if (!id || !mongoose_1.default.isValidObjectId(id)) {
+            throw new api_1.NotFoundError("Job not found");
+        }
+        const job = await job_1.Job.findOneOrNone({ _id: id });
+        if (!job) {
+            throw new api_1.NotFoundError("Job not found");
+        }
+        return res.json({ data: serializeJob(job, redactPayload) });
+    }));
+    app.post(`${basePath}/:id/retry`, [
         (0, api_1.authenticateMiddleware)(),
         (0, api_1.createOpenApiBuilder)(routeOpenApi)
             .withTags(["admin", "jobs"])
@@ -522,25 +368,16 @@ var registerJobsAdminRoutes = function (_a) {
             .withPathParameter("id", { type: "string" })
             .withResponse(200, { data: { type: "object" } })
             .build(),
-    ], (0, api_1.asyncHandler)(function (req, res) { return __awaiter(void 0, void 0, void 0, function () {
-        var id, retry;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, requireJobsAdmin(req)];
-                case 1:
-                    _a.sent();
-                    id = pathParam(req.params.id);
-                    if (!id || !mongoose_1.default.isValidObjectId(id)) {
-                        throw new api_1.NotFoundError("Job not found");
-                    }
-                    return [4 /*yield*/, jobsService.adminRetryJob(id)];
-                case 2:
-                    retry = (_a.sent()).retry;
-                    return [2 /*return*/, res.json({ data: serializeJob(retry, redactPayload) })];
-            }
-        });
-    }); }));
-    app.post("".concat(basePath, "/:id/requeue"), [
+    ], (0, api_1.asyncHandler)(async (req, res) => {
+        await requireJobsAdmin(req);
+        const id = pathParam(req.params.id);
+        if (!id || !mongoose_1.default.isValidObjectId(id)) {
+            throw new api_1.NotFoundError("Job not found");
+        }
+        const { retry } = await jobsService.adminRetryJob(id);
+        return res.json({ data: serializeJob(retry, redactPayload) });
+    }));
+    app.post(`${basePath}/:id/requeue`, [
         (0, api_1.authenticateMiddleware)(),
         (0, api_1.createOpenApiBuilder)(routeOpenApi)
             .withTags(["admin", "jobs"])
@@ -548,25 +385,16 @@ var registerJobsAdminRoutes = function (_a) {
             .withPathParameter("id", { type: "string" })
             .withResponse(200, { data: { type: "object" } })
             .build(),
-    ], (0, api_1.asyncHandler)(function (req, res) { return __awaiter(void 0, void 0, void 0, function () {
-        var id, job;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, requireJobsAdmin(req)];
-                case 1:
-                    _a.sent();
-                    id = pathParam(req.params.id);
-                    if (!id || !mongoose_1.default.isValidObjectId(id)) {
-                        throw new api_1.NotFoundError("Job not found");
-                    }
-                    return [4 /*yield*/, jobsService.adminRequeueJob(id)];
-                case 2:
-                    job = _a.sent();
-                    return [2 /*return*/, res.json({ data: serializeJob(job, redactPayload) })];
-            }
-        });
-    }); }));
-    app.post("".concat(basePath, "/:id/cancel"), [
+    ], (0, api_1.asyncHandler)(async (req, res) => {
+        await requireJobsAdmin(req);
+        const id = pathParam(req.params.id);
+        if (!id || !mongoose_1.default.isValidObjectId(id)) {
+            throw new api_1.NotFoundError("Job not found");
+        }
+        const job = await jobsService.adminRequeueJob(id);
+        return res.json({ data: serializeJob(job, redactPayload) });
+    }));
+    app.post(`${basePath}/:id/cancel`, [
         (0, api_1.authenticateMiddleware)(),
         (0, api_1.createOpenApiBuilder)(routeOpenApi)
             .withTags(["admin", "jobs"])
@@ -574,23 +402,14 @@ var registerJobsAdminRoutes = function (_a) {
             .withPathParameter("id", { type: "string" })
             .withResponse(200, { data: { type: "object" } })
             .build(),
-    ], (0, api_1.asyncHandler)(function (req, res) { return __awaiter(void 0, void 0, void 0, function () {
-        var id, job;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, requireJobsAdmin(req)];
-                case 1:
-                    _a.sent();
-                    id = pathParam(req.params.id);
-                    if (!id || !mongoose_1.default.isValidObjectId(id)) {
-                        throw new api_1.NotFoundError("Job not found");
-                    }
-                    return [4 /*yield*/, jobsService.adminCancelJob(id)];
-                case 2:
-                    job = _a.sent();
-                    return [2 /*return*/, res.json({ data: serializeJob(job, redactPayload) })];
-            }
-        });
-    }); }));
+    ], (0, api_1.asyncHandler)(async (req, res) => {
+        await requireJobsAdmin(req);
+        const id = pathParam(req.params.id);
+        if (!id || !mongoose_1.default.isValidObjectId(id)) {
+            throw new api_1.NotFoundError("Job not found");
+        }
+        const job = await jobsService.adminCancelJob(id);
+        return res.json({ data: serializeJob(job, redactPayload) });
+    }));
 };
 exports.registerJobsAdminRoutes = registerJobsAdminRoutes;