feat: fixed billing report

webapps/ee-api/pages/api/report/overage.ts

@@ -101,8 +101,7 @@ const handler = async function handler(req: NextApiRequest, res: NextApiResponse
   const allInvoices = await listAllInvoices();
   const allCustomers = new Set(allWorkspaces.map(w => w.obj.stripeCustomerId));
   const eligibleInvoices = allInvoices.filter(i => allCustomers.has(i.customer)).filter(i => i.lines.data.length > 0);
-  getLog().atInfo().log(`Found ${eligibleInvoices.length} invoices for ${allCustomers.size} workspaces`);
-  const minDate = eligibleInvoices.map(i => getInvoiceStartDate(i)).sort()[0];
+  const minDate = eligibleInvoices.map(i => getInvoiceStartDate(i)).sort((a, b) => a.getTime() - b.getTime())[0];
 
   const timer = Date.now();
   const report = await buildWorkspaceReport(minDate.toISOString(), new Date().toISOString(), "day", workspaceId);

webapps/ee-api/pages/api/report/workspace-stat.ts

@@ -1,5 +1,5 @@
 import type { NextApiRequest, NextApiResponse } from "next";
-import { namedParameters, SqlQueryParameters, unrollParams } from "juava";
+import { getLog, namedParameters, SqlQueryParameters, unrollParams } from "juava";
 import { withErrorHandler } from "../../../lib/error-handler";
 import { auth } from "../../../lib/auth";
 import { clickhouse, pg } from "../../../lib/services";
@@ -59,20 +59,23 @@ async function getClickhousePart({
                      workspaceId ? "and workspaceId = {workspaceId:String}" : ""
                    }
                  group by period, workspaceId
-                 order by period desc;
+                 order by period desc, workspaceId desc;
   `;
-  //getLog().atInfo().log(`Running Clickhouse query: ${query}`);
+  const queryParams = removeUndefined({
+    start: isoDateTOClickhouse(start),
+    end: isoDateTOClickhouse(end),
+    granularity,
+    workspaceId,
+  });
+  // getLog()
+  //   .atDebug()
+  //   .log(`Running Clickhouse query with ${JSON.stringify(queryParams)} : ${query}`);
   const resultSet = await clickhouse.query({
     query,
     clickhouse_settings: {
       wait_end_of_query: 1,
     },
-    query_params: removeUndefined({
-      start: isoDateTOClickhouse(start),
-      end: isoDateTOClickhouse(end),
-      granularity,
-      workspaceId,
-    }),
+    query_params: queryParams,
   });
   log.atInfo().log(`Clickhouse query took ${Date.now() - timer}ms`);