From 68a30f4212a885a82cecae33685be41cc61d54d0 Mon Sep 17 00:00:00 2001
From: Sheen Capadngan <sheensantoscapadngan@gmail.com>
Date: Mon, 3 Jun 2024 22:06:32 +0800
Subject: [PATCH] misc: removed transactional

---
 .../secret-folder-version-dal.ts              | 36 +++++++++---------
 .../src/services/secret/secret-version-dal.ts | 38 +++++++++----------
 2 files changed, 35 insertions(+), 39 deletions(-)

diff --git a/backend/src/services/secret-folder/secret-folder-version-dal.ts b/backend/src/services/secret-folder/secret-folder-version-dal.ts
index e9c247b52..47074321f 100644
--- a/backend/src/services/secret-folder/secret-folder-version-dal.ts
+++ b/backend/src/services/secret-folder/secret-folder-version-dal.ts
@@ -64,25 +64,23 @@ export const secretFolderVersionDALFactory = (db: TDbClient) => {
 
   const pruneExcessVersions = async () => {
     try {
-      await secretFolderVerOrm.transaction((txn) => {
-        return txn(TableName.SecretFolderVersion)
-          .with("folder_cte", (qb) => {
-            void qb
-              .from(TableName.SecretFolderVersion)
-              .select(
-                "id",
-                "folderId",
-                txn.raw(
-                  `ROW_NUMBER() OVER (PARTITION BY ${TableName.SecretFolderVersion}."folderId" ORDER BY ${TableName.SecretFolderVersion}."createdAt" DESC) AS row_num`
-                )
-              );
-          })
-          .join(TableName.Environment, `${TableName.Environment}.id`, `${TableName.SecretFolderVersion}.envId`)
-          .join(TableName.Project, `${TableName.Project}.id`, `${TableName.Environment}.projectId`)
-          .join("folder_cte", "folder_cte.id", `${TableName.SecretFolderVersion}.id`)
-          .whereRaw(`folder_cte.row_num > ${TableName.Project}."pitVersionLimit"`)
-          .delete();
-      });
+      await db(TableName.SecretFolderVersion)
+        .with("folder_cte", (qb) => {
+          void qb
+            .from(TableName.SecretFolderVersion)
+            .select(
+              "id",
+              "folderId",
+              db.raw(
+                `ROW_NUMBER() OVER (PARTITION BY ${TableName.SecretFolderVersion}."folderId" ORDER BY ${TableName.SecretFolderVersion}."createdAt" DESC) AS row_num`
+              )
+            );
+        })
+        .join(TableName.Environment, `${TableName.Environment}.id`, `${TableName.SecretFolderVersion}.envId`)
+        .join(TableName.Project, `${TableName.Project}.id`, `${TableName.Environment}.projectId`)
+        .join("folder_cte", "folder_cte.id", `${TableName.SecretFolderVersion}.id`)
+        .whereRaw(`folder_cte.row_num > ${TableName.Project}."pitVersionLimit"`)
+        .delete();
     } catch (error) {
       throw new DatabaseError({
         error,
diff --git a/backend/src/services/secret/secret-version-dal.ts b/backend/src/services/secret/secret-version-dal.ts
index 596d0f483..baff6ab99 100644
--- a/backend/src/services/secret/secret-version-dal.ts
+++ b/backend/src/services/secret/secret-version-dal.ts
@@ -112,26 +112,24 @@ export const secretVersionDALFactory = (db: TDbClient) => {
 
   const pruneExcessVersions = async () => {
     try {
-      await secretVersionOrm.transaction((txn) => {
-        return txn(TableName.SecretVersion)
-          .with("version_cte", (qb) => {
-            void qb
-              .from(TableName.SecretVersion)
-              .select(
-                "id",
-                "folderId",
-                txn.raw(
-                  `ROW_NUMBER() OVER (PARTITION BY ${TableName.SecretVersion}."secretId" ORDER BY ${TableName.SecretVersion}."createdAt" DESC) AS row_num`
-                )
-              );
-          })
-          .join(TableName.SecretFolder, `${TableName.SecretFolder}.id`, `${TableName.SecretVersion}.folderId`)
-          .join(TableName.Environment, `${TableName.Environment}.id`, `${TableName.SecretFolder}.envId`)
-          .join(TableName.Project, `${TableName.Project}.id`, `${TableName.Environment}.projectId`)
-          .join("version_cte", "version_cte.id", `${TableName.SecretVersion}.id`)
-          .whereRaw(`version_cte.row_num > ${TableName.Project}."pitVersionLimit"`)
-          .delete();
-      });
+      await db(TableName.SecretVersion)
+        .with("version_cte", (qb) => {
+          void qb
+            .from(TableName.SecretVersion)
+            .select(
+              "id",
+              "folderId",
+              db.raw(
+                `ROW_NUMBER() OVER (PARTITION BY ${TableName.SecretVersion}."secretId" ORDER BY ${TableName.SecretVersion}."createdAt" DESC) AS row_num`
+              )
+            );
+        })
+        .join(TableName.SecretFolder, `${TableName.SecretFolder}.id`, `${TableName.SecretVersion}.folderId`)
+        .join(TableName.Environment, `${TableName.Environment}.id`, `${TableName.SecretFolder}.envId`)
+        .join(TableName.Project, `${TableName.Project}.id`, `${TableName.Environment}.projectId`)
+        .join("version_cte", "version_cte.id", `${TableName.SecretVersion}.id`)
+        .whereRaw(`version_cte.row_num > ${TableName.Project}."pitVersionLimit"`)
+        .delete();
     } catch (error) {
       throw new DatabaseError({
         error,