Addressed PR suggestions

backend/src/ee/services/pit/pit-service.ts

@@ -8,7 +8,7 @@ import { ActorAuthMethod, ActorType } from "@app/services/auth/auth-type";
 import { TFolderCommitDALFactory } from "@app/services/folder-commit/folder-commit-dal";
 import {
   ResourceType,
-  TCreateCommitChangeDTO,
+  TCommitResourceChangeDTO,
   TFolderCommitServiceFactory
 } from "@app/services/folder-commit/folder-commit-service";
 import {
@@ -500,8 +500,7 @@ export const pitServiceFactory = ({
 
   const processNewCommitRaw = async ({
     actorId,
-    projectSlug,
-    projectId: optionalProjectId,
+    projectId,
     environment,
     actor,
     actorOrgId,
@@ -522,8 +521,7 @@ export const pitServiceFactory = ({
     }
   }: {
     actorId: string;
-    projectSlug?: string;
-    projectId?: string;
+    projectId: string;
     environment: string;
     actor: ActorType;
     actorOrgId: string;
@@ -532,16 +530,6 @@ export const pitServiceFactory = ({
     message: string;
     changes: TProcessNewCommitRawDTO;
   }) => {
-    if (!projectSlug && !optionalProjectId)
-      throw new BadRequestError({ message: "Must provide either project slug or projectId" });
-
-    let projectId = optionalProjectId as string;
-    if (!optionalProjectId && projectSlug) {
-      const project = await projectDAL.findProjectBySlug(projectSlug, actorOrgId);
-      if (!project) throw new NotFoundError({ message: `Project with slug '${projectSlug}' not found` });
-      projectId = project.id;
-    }
-
     const policy =
       actor === ActorType.USER
         ? await secretApprovalPolicyService.getSecretApprovalPolicy(projectId, environment, secretPath)
@@ -581,7 +569,7 @@ export const pitServiceFactory = ({
           message: `Folder with path '${secretPath}' in environment with slug '${environment}' not found`,
           name: "CreateManySecret"
         });
-      const commitChanges: TCreateCommitChangeDTO[] = [];
+      const commitChanges: TCommitResourceChangeDTO[] = [];
 
       if ((changes.folders?.create?.length ?? 0) > 0) {
         await folderService.createManyFolders({
@@ -605,7 +593,6 @@ export const pitServiceFactory = ({
       if ((changes.folders?.update?.length ?? 0) > 0) {
         await folderService.updateManyFolders({
           projectId,
-          projectSlug: projectSlug || "",
           actor,
           actorId,
           actorOrgId,

backend/src/ee/services/secret-approval-request/secret-approval-request-service.ts

@@ -1,5 +1,6 @@
 /* eslint-disable no-nested-ternary */
 import { ForbiddenError, subject } from "@casl/ability";
+import { Knex } from "knex";
 
 import {
   ProjectMembershipRole,
@@ -1260,8 +1261,9 @@ export const secretApprovalRequestServiceFactory = ({
     policy,
     projectId,
     secretPath,
-    environment
-  }: TGenerateSecretApprovalRequestV2BridgeDTO) => {
+    environment,
+    trx: providedTx
+  }: TGenerateSecretApprovalRequestV2BridgeDTO & { trx?: Knex }) => {
     if (actor === ActorType.SERVICE || actor === ActorType.Machine)
       throw new BadRequestError({ message: "Cannot use service token or machine token over protected branches" });
 
@@ -1487,7 +1489,7 @@ export const secretApprovalRequestServiceFactory = ({
       );
     });
 
-    const secretApprovalRequest = await secretApprovalRequestDAL.transaction(async (tx) => {
+    const executeApprovalRequestCreation = async (tx: Knex) => {
       const doc = await secretApprovalRequestDAL.create(
         {
           folderId,
@@ -1549,7 +1551,11 @@ export const secretApprovalRequestServiceFactory = ({
       }
 
       return { ...doc, commits: approvalCommits };
-    });
+    };
+
+    const secretApprovalRequest = providedTx
+      ? await executeApprovalRequestCreation(providedTx)
+      : await secretApprovalRequestDAL.transaction(executeApprovalRequestCreation);
 
     const user = await userDAL.findById(secretApprovalRequest.committerUserId);
     const env = await projectEnvDAL.findOne({ id: policy.envId });