Skip to content

Open-source status page, incident response and uptime monitoring

Revert "fix: affected status report monitors"

Maximilian Kaske866f96ca5fb1
diff --git a/apps/server/src/routes/v1/statusReportUpdates/post.ts b/apps/server/src/routes/v1/statusReportUpdates/post.ts
index 8a7fb5928..2e2537ad4 100644
--- a/apps/server/src/routes/v1/statusReportUpdates/post.ts
+++ b/apps/server/src/routes/v1/statusReportUpdates/post.ts
@@ -45,26 +45,23 @@ const createStatusUpdate = createRoute({
});
export function registerPostStatusReportUpdate(
- api: typeof statusReportUpdatesApi
+ api: typeof statusReportUpdatesApi,
) {
return api.openapi(createStatusUpdate, async (c) => {
const workspaceId = c.get("workspace").id;
const input = c.req.valid("json");
const limits = c.get("workspace").limits;
- const _statusReport = await db.query.statusReport.findFirst({
- where: and(
- eq(statusReport.id, input.statusReportId),
- eq(statusReport.workspaceId, workspaceId)
- ),
- with: {
- monitorsToStatusReports: {
- with: {
- monitor: true,
- },
- },
- },
- });
+ const _statusReport = await db
+ .select()
+ .from(statusReport)
+ .where(
+ and(
+ eq(statusReport.id, input.statusReportId),
+ eq(statusReport.workspaceId, workspaceId),
+ ),
+ )
+ .get();
if (!_statusReport) {
throw new OpenStatusApiError({
@@ -90,8 +87,8 @@ export function registerPostStatusReportUpdate(
.where(
and(
eq(pageSubscriber.pageId, _statusReport.pageId),
- isNotNull(pageSubscriber.acceptedAt)
- )
+ isNotNull(pageSubscriber.acceptedAt),
+ ),
)
.all();
@@ -114,9 +111,7 @@ export function registerPostStatusReportUpdate(
status: _statusReport.status,
message: _statusReportUpdate.message,
date: _statusReportUpdate.date.toISOString(),
- monitors: _statusReport.monitorsToStatusReports.map(
- (i) => i.monitor.name
- ),
+ monitors: _page.monitorsToPages.map((i) => i.monitor.name),
});
}
}
diff --git a/apps/server/src/routes/v1/statusReports/post.ts b/apps/server/src/routes/v1/statusReports/post.ts
index d19aea928..4a2e95b42 100644
--- a/apps/server/src/routes/v1/statusReports/post.ts
+++ b/apps/server/src/routes/v1/statusReports/post.ts
@@ -71,17 +71,15 @@ export function registerPostStatusReport(api: typeof statusReportsApi) {
and(
eq(monitor.workspaceId, workspaceId),
inArray(monitor.id, input.monitorIds),
- isNull(monitor.deletedAt)
- )
+ isNull(monitor.deletedAt),
+ ),
)
.all();
if (_monitors.length !== input.monitorIds.length) {
throw new OpenStatusApiError({
code: "BAD_REQUEST",
- message: `Some of the monitors ${input.monitorIds.join(
- ", "
- )} not found`,
+ message: `Some of the monitors ${input.monitorIds.join(", ")} not found`,
});
}
}
@@ -130,7 +128,7 @@ export function registerPostStatusReport(api: typeof statusReportsApi) {
monitorId: id,
statusReportId: _newStatusReport.id,
};
- })
+ }),
)
.returning();
}
@@ -142,8 +140,8 @@ export function registerPostStatusReport(api: typeof statusReportsApi) {
.where(
and(
eq(pageSubscriber.pageId, _newStatusReport.pageId),
- isNotNull(pageSubscriber.acceptedAt)
- )
+ isNotNull(pageSubscriber.acceptedAt),
+ ),
)
.all();
@@ -158,22 +156,6 @@ export function registerPostStatusReport(api: typeof statusReportsApi) {
},
});
- const _statusReport = await db.query.statusReport.findFirst({
- where: eq(statusReport.id, _newStatusReport.id),
- with: {
- monitorsToStatusReports: {
- with: { monitor: true },
- },
- },
- });
-
- if (!_statusReport) {
- throw new OpenStatusApiError({
- code: "INTERNAL_SERVER_ERROR",
- message: "Status report not found",
- });
- }
-
if (pageInfo && subscribers.length > 0) {
await emailClient.sendStatusReportUpdate({
to: subscribers.map((subscriber) => subscriber.email),
@@ -182,9 +164,7 @@ export function registerPostStatusReport(api: typeof statusReportsApi) {
status: _newStatusReport.status,
message: _newStatusReportUpdate.message,
date: _newStatusReportUpdate.date.toISOString(),
- monitors: _statusReport.monitorsToStatusReports.map(
- (i) => i.monitor.name
- ),
+ monitors: pageInfo.monitorsToPages.map((i) => i.monitor.name),
});
}
}
diff --git a/apps/server/src/routes/v1/statusReports/update/post.ts b/apps/server/src/routes/v1/statusReports/update/post.ts
index 80aa02651..3c04e2da2 100644
--- a/apps/server/src/routes/v1/statusReports/update/post.ts
+++ b/apps/server/src/routes/v1/statusReports/update/post.ts
@@ -59,8 +59,8 @@ export function registerStatusReportUpdateRoutes(api: typeof statusReportsApi) {
.where(
and(
eq(statusReport.id, Number(id)),
- eq(statusReport.workspaceId, workspaceId)
- )
+ eq(statusReport.workspaceId, workspaceId),
+ ),
)
.returning()
.get();
@@ -84,7 +84,7 @@ export function registerStatusReportUpdateRoutes(api: typeof statusReportsApi) {
.get();
if (limits.notifications && _statusReport.pageId) {
- const _statusReportWithRelations = await db.query.statusReport.findFirst({
+ const allInfo = await db.query.statusReport.findFirst({
where: eq(statusReport.id, Number(id)),
with: {
monitorsToStatusReports: {
@@ -102,21 +102,21 @@ export function registerStatusReportUpdateRoutes(api: typeof statusReportsApi) {
.where(
and(
eq(pageSubscriber.pageId, _statusReport.pageId),
- isNotNull(pageSubscriber.acceptedAt)
- )
+ isNotNull(pageSubscriber.acceptedAt),
+ ),
)
.all();
- if (_statusReportWithRelations?.page) {
+ if (allInfo?.page) {
await emailClient.sendStatusReportUpdate({
to: subscribers.map((subscriber) => subscriber.email),
- pageTitle: _statusReportWithRelations.page.title,
- reportTitle: _statusReportWithRelations.title,
- status: _statusReportWithRelations.status,
+ pageTitle: allInfo.page.title,
+ reportTitle: allInfo.title,
+ status: allInfo.status,
message: _statusReportUpdate.message,
date: _statusReportUpdate.date.toISOString(),
- monitors: _statusReportWithRelations.monitorsToStatusReports.map(
- (monitor) => monitor.monitor.name
+ monitors: allInfo.monitorsToStatusReports.map(
+ (monitor) => monitor.monitor.name,
),
});
}
diff --git a/packages/api/src/router/email/index.ts b/packages/api/src/router/email/index.ts
index 6c30e4e9b..6598f059f 100644
--- a/packages/api/src/router/email/index.ts
+++ b/packages/api/src/router/email/index.ts
@@ -25,11 +25,6 @@ export const emailRouter = createTRPCRouter({
with: {
statusReport: {
with: {
- monitorsToStatusReports: {
- with: {
- monitor: true,
- },
- },
page: {
with: {
pageSubscribers: {
@@ -54,17 +49,16 @@ export const emailRouter = createTRPCRouter({
await emailClient.sendStatusReportUpdate({
to: _statusReportUpdate.statusReport.page.pageSubscribers.map(
- (subscriber) => subscriber.email
+ (subscriber) => subscriber.email,
),
pageTitle: _statusReportUpdate.statusReport.page.title,
reportTitle: _statusReportUpdate.statusReport.title,
status: _statusReportUpdate.status,
message: _statusReportUpdate.message,
date: new Date(_statusReportUpdate.date).toISOString(),
- monitors:
- _statusReportUpdate.statusReport.monitorsToStatusReports.map(
- (i) => i.monitor.name
- ),
+ monitors: _statusReportUpdate.statusReport.page.monitorsToPages.map(
+ (i) => i.monitor.name,
+ ),
});
}
}),
@@ -77,7 +71,7 @@ export const emailRouter = createTRPCRouter({
const _invitation = await opts.ctx.db.query.invitation.findFirst({
where: and(
eq(invitation.id, opts.input.id),
- eq(invitation.workspaceId, opts.ctx.workspace.id)
+ eq(invitation.workspaceId, opts.ctx.workspace.id),
),
});