Skip to content

Commit a37231e

Browse files
committed
console: added notifications endpoint
1 parent 8f83ac8 commit a37231e

File tree

5 files changed

+438
-10
lines changed

5 files changed

+438
-10
lines changed

webapps/console/lib/server/clickhouse.ts

+4
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,7 @@ export const clickhouse = createClient({
1919
response: true,
2020
},
2121
});
22+
23+
export function dateToClickhouse(date: Date): string {
24+
return date.toISOString().replace("T", " ").replace("Z", "").split(".")[0];
25+
}

webapps/console/pages/api/[workspaceId]/reports/active-events.ts

+5-9
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { z } from "zod";
22
import { createRoute, verifyAccess, getWorkspace } from "../../../../lib/api";
3-
import { clickhouse } from "../../../../lib/server/clickhouse";
3+
import { clickhouse, dateToClickhouse } from "../../../../lib/server/clickhouse";
44
import dayjs from "dayjs";
55
import utc from "dayjs/plugin/utc";
66
import { getServerLog } from "../../../../lib/server/log";
@@ -33,8 +33,8 @@ export default createRoute()
3333
await verifyAccess(user, workspace.id);
3434
const metricsSchema =
3535
process.env.CLICKHOUSE_METRICS_SCHEMA || process.env.CLICKHOUSE_DATABASE || "newjitsu_metrics";
36-
const end = query.end ? query.end.toISOString() : new Date().toISOString();
37-
const start = query.start ? query.start.toISOString() : dayjs(end).subtract(1, "month").toDate().toISOString();
36+
const end = query.end || new Date();
37+
const start = query.start || dayjs(end).subtract(1, "month").toDate();
3838

3939
const sql = `
4040
select
@@ -54,8 +54,8 @@ export default createRoute()
5454
await clickhouse.query({
5555
query: sql,
5656
query_params: {
57-
start: isoDateTOClickhouse(start),
58-
end: isoDateTOClickhouse(end),
57+
start: dateToClickhouse(start),
58+
end: dateToClickhouse(end),
5959
workspace: workspace.id,
6060
granularity: query.granularity,
6161
},
@@ -77,7 +77,3 @@ export default createRoute()
7777
};
7878
})
7979
.toNextApiHandler();
80-
81-
function isoDateTOClickhouse(date: string): string {
82-
return date.replace("T", " ").replace("Z", "").split(".")[0];
83-
}

webapps/console/pages/api/admin/events-log-init.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export default createRoute()
1212
token: z.string().optional(),
1313
}),
1414
})
15-
.handler(async ({ req, res, query, user }) => {
15+
.handler(async ({ req, res, query }) => {
1616
let initTokenUsed = false;
1717
if (process.env.CONSOLE_INIT_TOKEN && query.token) {
1818
if (checkRawToken(process.env.CONSOLE_INIT_TOKEN, query.token)) {

0 commit comments

Comments
 (0)