1
1
import { z } from "zod" ;
2
2
import { createRoute , verifyAccess , getWorkspace } from "../../../../lib/api" ;
3
- import { clickhouse } from "../../../../lib/server/clickhouse" ;
3
+ import { clickhouse , dateToClickhouse } from "../../../../lib/server/clickhouse" ;
4
4
import dayjs from "dayjs" ;
5
5
import utc from "dayjs/plugin/utc" ;
6
6
import { getServerLog } from "../../../../lib/server/log" ;
@@ -33,8 +33,8 @@ export default createRoute()
33
33
await verifyAccess ( user , workspace . id ) ;
34
34
const metricsSchema =
35
35
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 ( ) ;
38
38
39
39
const sql = `
40
40
select
@@ -54,8 +54,8 @@ export default createRoute()
54
54
await clickhouse . query ( {
55
55
query : sql ,
56
56
query_params : {
57
- start : isoDateTOClickhouse ( start ) ,
58
- end : isoDateTOClickhouse ( end ) ,
57
+ start : dateToClickhouse ( start ) ,
58
+ end : dateToClickhouse ( end ) ,
59
59
workspace : workspace . id ,
60
60
granularity : query . granularity ,
61
61
} ,
@@ -77,7 +77,3 @@ export default createRoute()
77
77
} ;
78
78
} )
79
79
. toNextApiHandler ( ) ;
80
-
81
- function isoDateTOClickhouse ( date : string ) : string {
82
- return date . replace ( "T" , " " ) . replace ( "Z" , "" ) . split ( "." ) [ 0 ] ;
83
- }
0 commit comments