hotfix: granularity charts display

Author: arielweinberger

apps/server/src/app/metrics/queries/queries.utils.ts

@@ -36,13 +36,13 @@ export const generateBucketsSubquery = (
   const subquery = knex
     .select(
       knex.raw(
-        `${timeProps.roundFn}(parseDateTimeBestEffort(?) + INTERVAL number hour) AS timestamp`,
+        `${timeProps.roundFn}(parseDateTimeBestEffort(?) + INTERVAL number ${timeProps.interval}) AS timestamp`,
         [startDate]
       )
     )
     .from(
       knex.raw(
-        "numbers(dateDiff('hour', parseDateTimeBestEffort(?), parseDateTimeBestEffort(?)) + 1)",
+        `numbers(dateDiff('${timeProps.interval}', parseDateTimeBestEffort(?), parseDateTimeBestEffort(?)) + 1)`,
         [startDate, endDate]
       )
     );

apps/server/src/app/metrics/queries/success-error-rate-query.ts

@@ -27,12 +27,14 @@ export const successErrorRateQuery = (
     .with("buckets", bucketsSubquery)
     .select({
       timestamp: "b.timestamp",
-      requests: knex.raw("count(*)"),
+      requests: knex.raw(
+        `countIf(${timeProps.roundFn}(r.requestTimestamp) = timestamp)`
+      ),
       error: knex.raw(
-        "countIf(r.isError = true AND toStartOfHour(r.requestTimestamp) = timestamp)"
+        `countIf(r.isError = true AND ${timeProps.roundFn}(r.requestTimestamp) = timestamp)`
       ),
       success: knex.raw(
-        "countIf(r.isError = false AND toStartOfHour(r.requestTimestamp) = timestamp)"
+        `countIf(r.isError = false AND ${timeProps.roundFn}(r.requestTimestamp) = timestamp)`
       ),
     })
     .from("buckets as b")