diff --git a/backend/src/db/migrations/20250530152721_add-access-approval-request-deleted-at.ts b/backend/src/db/migrations/20250530152721_add-access-approval-request-deleted-at.ts index 771df8cf8..547f1d1a7 100644 --- a/backend/src/db/migrations/20250530152721_add-access-approval-request-deleted-at.ts +++ b/backend/src/db/migrations/20250530152721_add-access-approval-request-deleted-at.ts @@ -1,5 +1,7 @@ import { Knex } from "knex"; +import { ApprovalStatus } from "@app/ee/services/secret-approval-request/secret-approval-request-types"; + import { TableName } from "../schemas"; export async function up(knex: Knex): Promise { @@ -17,12 +19,12 @@ export async function up(knex: Knex): Promise { if (!hasStatusColumn) { await knex.schema.alterTable(TableName.AccessApprovalRequest, (t) => { - t.string("status").defaultTo("pending").notNullable(); + t.string("status").defaultTo(ApprovalStatus.PENDING).notNullable(); }); // Update existing rows based on business logic // If privilegeId is not null, set status to "approved" - await knex(TableName.AccessApprovalRequest).whereNotNull("privilegeId").update({ status: "approved" }); + await knex(TableName.AccessApprovalRequest).whereNotNull("privilegeId").update({ status: ApprovalStatus.APPROVED }); // If privilegeId is null and there's a rejected reviewer, set to "rejected" const rejectedRequestIds = await knex(TableName.AccessApprovalRequestReviewer) @@ -35,7 +37,7 @@ export async function up(knex: Knex): Promise { await knex(TableName.AccessApprovalRequest) .whereNull("privilegeId") .whereIn("id", rejectedRequestIds) - .update({ status: "rejected" }); + .update({ status: ApprovalStatus.REJECTED }); } } } diff --git a/backend/src/ee/services/access-approval-request/access-approval-request-dal.ts b/backend/src/ee/services/access-approval-request/access-approval-request-dal.ts index b5be58382..711bab06b 100644 --- a/backend/src/ee/services/access-approval-request/access-approval-request-dal.ts +++ b/backend/src/ee/services/access-approval-request/access-approval-request-dal.ts @@ -392,7 +392,7 @@ export const accessApprovalRequestDALFactory = (db: TDbClient) => { ] }); - // an approval is pending if there is no reviewer rejections, no privilege ID is set and the number of approvals is less than the number of approvals required + // an approval is pending if there is no reviewer rejections, no privilege ID is set and the status is pending const pendingApprovals = formattedRequests.filter( (req) => !req.privilegeId &&