misc: improved knex import

This commit is contained in:
Sheen Capadngan
2024-10-04 22:27:11 +08:00
parent 36ef87909e
commit cf446a38b3
@@ -1,5 +1,5 @@
// weird commonjs-related error in the CI requires us to use this kind of import // weird commonjs-related error in the CI requires us to do the import like this
import * as kx from "knex"; import knex from "knex";
import { TDbClient } from "@app/db"; import { TDbClient } from "@app/db";
import { TableName } from "@app/db/schemas"; import { TableName } from "@app/db/schemas";
@@ -47,7 +47,7 @@ export const auditLogDALFactory = (db: TDbClient) => {
eventType?: EventType[]; eventType?: EventType[];
eventMetadata?: Record<string, string>; eventMetadata?: Record<string, string>;
}, },
tx?: kx.Knex tx?: knex.Knex
) => { ) => {
if (!orgId && !projectId) { if (!orgId && !projectId) {
throw new Error("Either orgId or projectId must be provided"); throw new Error("Either orgId or projectId must be provided");
@@ -111,7 +111,7 @@ export const auditLogDALFactory = (db: TDbClient) => {
return docs; return docs;
} catch (error) { } catch (error) {
if (error instanceof kx.KnexTimeoutError) { if (error instanceof knex.KnexTimeoutError) {
throw new BadRequestError({ throw new BadRequestError({
error, error,
message: "Failed to fetch audit logs due to timeout. Add more search filters." message: "Failed to fetch audit logs due to timeout. Add more search filters."
@@ -123,7 +123,7 @@ export const auditLogDALFactory = (db: TDbClient) => {
}; };
// delete all audit log that have expired // delete all audit log that have expired
const pruneAuditLog = async (tx?: kx.Knex) => { const pruneAuditLog = async (tx?: knex.Knex) => {
const AUDIT_LOG_PRUNE_BATCH_SIZE = 10000; const AUDIT_LOG_PRUNE_BATCH_SIZE = 10000;
const MAX_RETRY_ON_FAILURE = 3; const MAX_RETRY_ON_FAILURE = 3;