Convert check to a standalone DAL operation

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

@@ -48,7 +48,7 @@ type TSecretApprovalRequestServiceFactoryDep = {
   secretBlindIndexDAL: Pick<TSecretBlindIndexDALFactory, "findOne">;
   snapshotService: Pick<TSecretSnapshotServiceFactory, "performSnapshot">;
   secretVersionDAL: Pick<TSecretVersionDALFactory, "findLatestVersionMany">;
-  projectDAL: Pick<TProjectDALFactory, "isProjectBeingUpgraded">;
+  projectDAL: Pick<TProjectDALFactory, "checkProjectUpgradeStatus">;
   secretService: Pick<
     TSecretServiceFactory,
     | "fnSecretBulkInsert"
@@ -437,13 +437,7 @@ export const secretApprovalRequestServiceFactory = ({
       subject(ProjectPermissionSub.Secrets, { environment, secretPath })
     );
 
-    const isProjectBeingUpgraded = await projectDAL.isProjectBeingUpgraded(projectId);
+    await projectDAL.checkProjectUpgradeStatus(projectId);
-
-    if (isProjectBeingUpgraded) {
-      throw new BadRequestError({
-        message: "Project is currently being upgraded, and secrets cannot be written. Please try again"
-      });
-    }
 
     const folder = await folderDAL.findBySecretPath(projectId, environment, secretPath);
     if (!folder) throw new BadRequestError({ message: "Folder not  found", name: "GenSecretApproval" });

backend/src/services/project/project-dal.ts

@@ -2,7 +2,7 @@ import { Knex } from "knex";
 
 import { TDbClient } from "@app/db";
 import { ProjectsSchema, ProjectUpgradeStatus, ProjectVersion, TableName, TProjectsUpdate } from "@app/db/schemas";
-import { DatabaseError } from "@app/lib/errors";
+import { BadRequestError, DatabaseError } from "@app/lib/errors";
 import { ormify, selectAllTableCols, sqlNestRelationships } from "@app/lib/knex";
 
 export type TProjectDALFactory = ReturnType<typeof projectDALFactory>;
@@ -160,9 +160,16 @@ export const projectDALFactory = (db: TDbClient) => {
     }
   };
 
-  const isProjectBeingUpgraded = async (projectId: string) => {
+  const checkProjectUpgradeStatus = async (projectId: string) => {
     const project = await projectOrm.findById(projectId);
-    return project.upgradeStatus === ProjectUpgradeStatus.InProgress && project.version === ProjectVersion.V1;
+    const upgradeInProgress =
+      project.upgradeStatus === ProjectUpgradeStatus.InProgress && project.version === ProjectVersion.V1;
+
+    if (upgradeInProgress) {
+      throw new BadRequestError({
+        message: "Project is currently being upgraded, and secrets cannot be written. Please try again"
+      });
+    }
   };
 
   return {
@@ -172,6 +179,6 @@ export const projectDALFactory = (db: TDbClient) => {
     findAllProjectsByIdentity,
     findProjectGhostUser,
     findProjectById,
-    isProjectBeingUpgraded
+    checkProjectUpgradeStatus
   };
 };

backend/src/services/secret-import/secret-import-service.ts

@@ -22,7 +22,7 @@ type TSecretImportServiceFactoryDep = {
   secretImportDAL: TSecretImportDALFactory;
   folderDAL: TSecretFolderDALFactory;
   secretDAL: Pick<TSecretDALFactory, "find">;
-  projectDAL: Pick<TProjectDALFactory, "isProjectBeingUpgraded">;
+  projectDAL: Pick<TProjectDALFactory, "checkProjectUpgradeStatus">;
   projectEnvDAL: TProjectEnvDALFactory;
   permissionService: Pick<TPermissionServiceFactory, "getProjectPermission">;
 };
@@ -65,13 +65,7 @@ export const secretImportServiceFactory = ({
       })
     );
 
-    const isProjectBeingUpgraded = await projectDAL.isProjectBeingUpgraded(projectId);
+    await projectDAL.checkProjectUpgradeStatus(projectId);
-
-    if (isProjectBeingUpgraded) {
-      throw new BadRequestError({
-        message: "Project is currently being upgraded, and secrets cannot be written. Please try again"
-      });
-    }
 
     const folder = await folderDAL.findBySecretPath(projectId, environment, path);
     if (!folder) throw new BadRequestError({ message: "Folder not found", name: "Create import" });

backend/src/services/secret/secret-service.ts

@@ -50,7 +50,7 @@ type TSecretServiceFactoryDep = {
   secretTagDAL: TSecretTagDALFactory;
   secretVersionDAL: TSecretVersionDALFactory;
   folderDAL: Pick<TSecretFolderDALFactory, "findBySecretPath" | "updateById" | "findById" | "findByManySecretPath">;
-  projectDAL: Pick<TProjectDALFactory, "isProjectBeingUpgraded">;
+  projectDAL: Pick<TProjectDALFactory, "checkProjectUpgradeStatus">;
   secretBlindIndexDAL: TSecretBlindIndexDALFactory;
   permissionService: Pick<TPermissionServiceFactory, "getProjectPermission">;
   snapshotService: Pick<TSecretSnapshotServiceFactory, "performSnapshot">;
@@ -284,13 +284,7 @@ export const secretServiceFactory = ({
       subject(ProjectPermissionSub.Secrets, { environment, secretPath: path })
     );
 
-    const isProjectBeingUpgraded = await projectDAL.isProjectBeingUpgraded(projectId);
+    await projectDAL.checkProjectUpgradeStatus(projectId);
-
-    if (isProjectBeingUpgraded) {
-      throw new BadRequestError({
-        message: "Project is currently being upgraded, and secrets cannot be written. Please try again"
-      });
-    }
 
     const folder = await folderDAL.findBySecretPath(projectId, environment, path);
     if (!folder) throw new BadRequestError({ message: "Folder not  found", name: "Create secret" });
@@ -370,13 +364,7 @@ export const secretServiceFactory = ({
       subject(ProjectPermissionSub.Secrets, { environment, secretPath: path })
     );
 
-    const isProjectBeingUpgraded = await projectDAL.isProjectBeingUpgraded(projectId);
+    await projectDAL.checkProjectUpgradeStatus(projectId);
-
-    if (isProjectBeingUpgraded) {
-      throw new BadRequestError({
-        message: "Project is currently being upgraded, and secrets cannot be written. Please try again"
-      });
-    }
 
     const folder = await folderDAL.findBySecretPath(projectId, environment, path);
     if (!folder) throw new BadRequestError({ message: "Folder not  found", name: "Create secret" });
@@ -478,13 +466,7 @@ export const secretServiceFactory = ({
       subject(ProjectPermissionSub.Secrets, { environment, secretPath: path })
     );
 
-    const isProjectBeingUpgraded = await projectDAL.isProjectBeingUpgraded(projectId);
+    await projectDAL.checkProjectUpgradeStatus(projectId);
-
-    if (isProjectBeingUpgraded) {
-      throw new BadRequestError({
-        message: "Project is currently being upgraded, and secrets cannot be written. Please try again"
-      });
-    }
 
     const folder = await folderDAL.findBySecretPath(projectId, environment, path);
     if (!folder) throw new BadRequestError({ message: "Folder not  found", name: "Create secret" });
@@ -677,13 +659,7 @@ export const secretServiceFactory = ({
       subject(ProjectPermissionSub.Secrets, { environment, secretPath: path })
     );
 
-    const isProjectBeingUpgraded = await projectDAL.isProjectBeingUpgraded(projectId);
+    await projectDAL.checkProjectUpgradeStatus(projectId);
-
-    if (isProjectBeingUpgraded) {
-      throw new BadRequestError({
-        message: "Project is currently being upgraded, and secrets cannot be written. Please try again"
-      });
-    }
 
     const folder = await folderDAL.findBySecretPath(projectId, environment, path);
     if (!folder) throw new BadRequestError({ message: "Folder not  found", name: "Create secret" });
@@ -740,13 +716,7 @@ export const secretServiceFactory = ({
       subject(ProjectPermissionSub.Secrets, { environment, secretPath: path })
     );
 
-    const isProjectBeingUpgraded = await projectDAL.isProjectBeingUpgraded(projectId);
+    await projectDAL.checkProjectUpgradeStatus(projectId);
-
-    if (isProjectBeingUpgraded) {
-      throw new BadRequestError({
-        message: "Project is currently being upgraded, and secrets cannot be written. Please try again"
-      });
-    }
 
     const folder = await folderDAL.findBySecretPath(projectId, environment, path);
     if (!folder) throw new BadRequestError({ message: "Folder not  found", name: "Create secret" });
@@ -819,13 +789,7 @@ export const secretServiceFactory = ({
       subject(ProjectPermissionSub.Secrets, { environment, secretPath: path })
     );
 
-    const isProjectBeingUpgraded = await projectDAL.isProjectBeingUpgraded(projectId);
+    await projectDAL.checkProjectUpgradeStatus(projectId);
-
-    if (isProjectBeingUpgraded) {
-      throw new BadRequestError({
-        message: "Project is currently being upgraded, and secrets cannot be written. Please try again"
-      });
-    }
 
     const folder = await folderDAL.findBySecretPath(projectId, environment, path);
     if (!folder) throw new BadRequestError({ message: "Folder not  found", name: "Create secret" });