awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-07 18:27:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

misc: migrated json filters to new op

Browse Source
This commit is contained in:
Sheen Capadngan
2024-10-03 00:31:23 +08:00
parent dc8c3a30bd
commit 9b1615f2fb
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/db/migrations/20241002110531_add-audit-log-metadata-index.ts
+6
View File
@@ -8,8 +8,14 @@ export async function up(knex: Knex): Promise<void> {
`CREATE INDEX "audit_logs_actorMetadata_idx" ON ${TableName.AuditLog} USING gin("actorMetadata" jsonb_path_ops)` `CREATE INDEX "audit_logs_actorMetadata_idx" ON ${TableName.AuditLog} USING gin("actorMetadata" jsonb_path_ops)`
); );
} }
if (await knex.schema.hasColumn(TableName.AuditLog, "eventMetadata")) {
await knex.raw(
`CREATE INDEX "audit_logs_eventMetadata_idx" ON ${TableName.AuditLog} USING gin("eventMetadata" jsonb_path_ops)`
);
}
} }
export async function down(knex: Knex): Promise<void> { export async function down(knex: Knex): Promise<void> {
await knex.raw(`DROP INDEX IF EXISTS "audit_logs_actorMetadata_idx"`); await knex.raw(`DROP INDEX IF EXISTS "audit_logs_actorMetadata_idx"`);
await knex.raw(`DROP INDEX IF EXISTS "audit_logs_eventMetadata_idx"`);
} }
backend/src/ee/services/audit-log/audit-log-dal.ts
+3 -2
View File
@@ -77,13 +77,13 @@ export const auditLogDALFactory = (db: TDbClient) => {
// Special case: Filter by actor ID // Special case: Filter by actor ID
if (actorId) { if (actorId) {
void sqlQuery.whereRaw(`"actorMetadata"->>'userId' = ?`, [actorId]); void sqlQuery.whereRaw(`"actorMetadata" @> jsonb_build_object('userId', ?::text)`, [actorId]);
} }
// Special case: Filter by key/value pairs in eventMetadata field // Special case: Filter by key/value pairs in eventMetadata field
if (eventMetadata && Object.keys(eventMetadata).length) { if (eventMetadata && Object.keys(eventMetadata).length) {
Object.entries(eventMetadata).forEach(([key, value]) => { Object.entries(eventMetadata).forEach(([key, value]) => {
void sqlQuery.whereRaw(`"eventMetadata"->>'${key}' = ?`, [value]); void sqlQuery.whereRaw(`"eventMetadata" @> jsonb_build_object(?::text, ?::text)`, [key, value]);
}); });
} }
@@ -104,6 +104,7 @@ export const auditLogDALFactory = (db: TDbClient) => {
if (endDate) { if (endDate) {
void sqlQuery.where(`${TableName.AuditLog}.createdAt`, "<=", endDate); void sqlQuery.where(`${TableName.AuditLog}.createdAt`, "<=", endDate);
} }
const docs = await sqlQuery; const docs = await sqlQuery;
return docs; return docs;