Skip to content

Open-source status page, incident response and uptime monitoring

🧪 (#627)

Thibault Le Ouay736b661ec1c5
diff --git a/apps/server/src/v1/monitor.ts b/apps/server/src/v1/monitor.ts
index f6aaf8734..ecb342e23 100644
--- a/apps/server/src/v1/monitor.ts
+++ b/apps/server/src/v1/monitor.ts
@@ -77,12 +77,13 @@ const MonitorSchema = z
example: "Documenso website",
description: "The description of your monitor",
})
- .nullable(),
+ .nullish(),
method: z.enum(monitorMethods).default("GET").openapi({ example: "GET" }),
body: z
.preprocess((val) => {
return String(val);
}, z.string())
+ .nullish()
.default("")
.openapi({
example: "Hello World",
@@ -98,6 +99,7 @@ const MonitorSchema = z
},
z.array(z.object({ key: z.string(), value: z.string() })).default([]),
)
+ .nullish()
.openapi({
description: "The headers of your request",
example: [{ key: "x-apikey", value: "supersecrettoken" }],
@@ -318,13 +320,17 @@ monitorApi.openapi(postRoute, async (c) => {
const input = c.req.valid("json");
const count = (
- await db.select({ count: sql<number>`count(*)` }).from(monitor)
+ await db
+ .select({ count: sql<number>`count(*)` })
+ .from(monitor)
+ .where(eq(monitor.workspaceId, Number(workspaceId)))
+ .all()
)[0].count;
if (count >= workspacePlan.limits.monitors)
- return c.jsonT({ code: 403, message: "Forbidden" });
+ return c.jsonT({ code: 403, message: "Forbidden" }, 403);
if (!workspacePlan.limits.periodicity.includes(input.periodicity))
- return c.jsonT({ code: 403, message: "Forbidden" });
+ return c.jsonT({ code: 403, message: "Forbidden" }, 403);
const { headers, ...rest } = input;
const _newMonitor = await db
diff --git a/apps/server/src/v1/statusReport.test.ts b/apps/server/src/v1/statusReport.test.ts
index 76dfd96a9..0527cd8d8 100644
--- a/apps/server/src/v1/statusReport.test.ts
+++ b/apps/server/src/v1/statusReport.test.ts
@@ -113,7 +113,7 @@ test("create a status report update", async () => {
expect(res.status).toBe(200);
expect(await res.json()).toMatchObject({
status: "investigating",
- id: "3",
+ id: expect.any(String),
date: "Wed Nov 08 2023 21:03:13 GMT+0000 (Coordinated Universal Time)",
message: "Test Status Report",
});