awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-09-22 13:39:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

revert changes on findByProjectIdBridgeSecretV2

Browse Source
This commit is contained in:
x032205
2025-11-14 20:06:14 -05:00
parent a107b374ef
commit a3fa765d7f
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
backend/src/ee/services/secret-approval-request/secret-approval-request-dal.ts
View File

@@ -710,7 +710,6 @@ export const secretApprovalRequestDALFactory = (db: TDbClient) => {
db.ref("firstName").withSchema("committerUser").as("committerUserFirstName"), db.ref("firstName").withSchema("committerUser").as("committerUserFirstName"),
db.ref("lastName").withSchema("committerUser").as("committerUserLastName") db.ref("lastName").withSchema("committerUser").as("committerUserLastName")
) )
.distinctOn(`${TableName.SecretApprovalRequest}.id`)
.as("inner"); .as("inner");
const query = (tx || db).select("*").from(innerQuery).orderBy("createdAt", "desc") as typeof innerQuery; const query = (tx || db).select("*").from(innerQuery).orderBy("createdAt", "desc") as typeof innerQuery;
@@ -731,13 +730,11 @@ export const secretApprovalRequestDALFactory = (db: TDbClient) => {
}); });
} }
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment const countQuery = (await (tx || db)
const countResult = await (tx || db.replicaNode()) .select(db.raw("count(*) OVER() as total_count"))
.count({ count: "*" }) .from(query.clone().as("outer"))) as Array<{
.from(query.clone().as("count_query")) total_count: number;
.first(); }>;
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
const totalCount = Number(countResult?.count || 0);
const rankOffset = offset + 1; const rankOffset = offset + 1;
const docs = await (tx || db) const docs = await (tx || db)
@@ -747,6 +744,8 @@ export const secretApprovalRequestDALFactory = (db: TDbClient) => {
.where("w.rank", ">=", rankOffset) .where("w.rank", ">=", rankOffset)
.andWhere("w.rank", "<", rankOffset + limit); .andWhere("w.rank", "<", rankOffset + limit);
const totalCount = Number(countQuery[0]?.total_count || 0);
const formattedDoc = sqlNestRelationships({ const formattedDoc = sqlNestRelationships({
data: docs, data: docs,
key: "id", key: "id",