From ddc819dda136b3b66e7c929d00f0bf368e8ee69a Mon Sep 17 00:00:00 2001
From: = <akhilmhdh@gmail.com>
Date: Thu, 6 Feb 2025 16:31:13 +0530
Subject: [PATCH] feat: removed transaction from init

---
 .../src/services/kms/kms-root-config-dal.ts   | 16 +++++++++++++++-
 backend/src/services/kms/kms-service.ts       | 17 +++++++----------
 .../super-admin/super-admin-service.ts        | 19 ++++++++-----------
 3 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/backend/src/services/kms/kms-root-config-dal.ts b/backend/src/services/kms/kms-root-config-dal.ts
index f448e2df8..8745d286e 100644
--- a/backend/src/services/kms/kms-root-config-dal.ts
+++ b/backend/src/services/kms/kms-root-config-dal.ts
@@ -1,10 +1,24 @@
 import { TDbClient } from "@app/db";
 import { TableName } from "@app/db/schemas";
+import { DatabaseError } from "@app/lib/errors";
 import { ormify } from "@app/lib/knex";
+import { Knex } from "knex";
 
 export type TKmsRootConfigDALFactory = ReturnType<typeof kmsRootConfigDALFactory>;
 
 export const kmsRootConfigDALFactory = (db: TDbClient) => {
   const kmsOrm = ormify(db, TableName.KmsServerRootConfig);
-  return kmsOrm;
+
+  const findById = async (id: string, tx?: Knex) => {
+    try {
+      const result = await (tx || db)(TableName.KmsServerRootConfig)
+        .where({ id } as never)
+        .first("*");
+      return result;
+    } catch (error) {
+      throw new DatabaseError({ error, name: "Find by id" });
+    }
+  };
+
+  return { ...kmsOrm, findById };
 };
diff --git a/backend/src/services/kms/kms-service.ts b/backend/src/services/kms/kms-service.ts
index 2f4a0b6cf..f3f2ca5f0 100644
--- a/backend/src/services/kms/kms-service.ts
+++ b/backend/src/services/kms/kms-service.ts
@@ -875,7 +875,7 @@ export const kmsServiceFactory = ({
     const kmsRootConfig = await kmsRootConfigDAL.transaction(async (tx) => {
       await tx.raw("SELECT pg_advisory_xact_lock(?)", [PgSqlLock.KmsRootKeyInit]);
       // check if KMS root key was already generated and saved in DB
-      const existingRootConfig = await kmsRootConfigDAL.findById(KMS_ROOT_CONFIG_UUID, tx);
+      const existingRootConfig = await kmsRootConfigDAL.findById(KMS_ROOT_CONFIG_UUID);
       if (existingRootConfig) return existingRootConfig;
 
       logger.info("KMS: Generating new ROOT Key");
@@ -885,15 +885,12 @@ export const kmsServiceFactory = ({
         throw err;
       });
 
-      const newRootConfig = await kmsRootConfigDAL.create(
-        {
-          // @ts-expect-error id is kept as fixed for idempotence and to avoid race condition
-          id: KMS_ROOT_CONFIG_UUID,
-          encryptedRootKey,
-          encryptionStrategy: RootKeyEncryptionStrategy.Software
-        },
-        tx
-      );
+      const newRootConfig = await kmsRootConfigDAL.create({
+        // @ts-expect-error id is kept as fixed for idempotence and to avoid race condition
+        id: KMS_ROOT_CONFIG_UUID,
+        encryptedRootKey,
+        encryptionStrategy: RootKeyEncryptionStrategy.Software
+      });
       return newRootConfig;
     });
 
diff --git a/backend/src/services/super-admin/super-admin-service.ts b/backend/src/services/super-admin/super-admin-service.ts
index a8f432d92..9a6075423 100644
--- a/backend/src/services/super-admin/super-admin-service.ts
+++ b/backend/src/services/super-admin/super-admin-service.ts
@@ -89,19 +89,16 @@ export const superAdminServiceFactory = ({
     await keyStore.deleteItem(ADMIN_CONFIG_KEY);
     const serverCfg = await serverCfgDAL.transaction(async (tx) => {
       await tx.raw("SELECT pg_advisory_xact_lock(?)", [PgSqlLock.SuperAdminInit]);
-      const serverCfgInDB = await serverCfgDAL.findById(ADMIN_CONFIG_DB_UUID, tx);
+      const serverCfgInDB = await serverCfgDAL.findById(ADMIN_CONFIG_DB_UUID);
       if (serverCfgInDB) return serverCfgInDB;
 
-      const newCfg = await serverCfgDAL.create(
-        {
-          // @ts-expect-error id is kept as fixed for idempotence and to avoid race condition
-          id: ADMIN_CONFIG_DB_UUID,
-          initialized: false,
-          allowSignUp: true,
-          defaultAuthOrgId: null
-        },
-        tx
-      );
+      const newCfg = await serverCfgDAL.create({
+        // @ts-expect-error id is kept as fixed for idempotence and to avoid race condition
+        id: ADMIN_CONFIG_DB_UUID,
+        initialized: false,
+        allowSignUp: true,
+        defaultAuthOrgId: null
+      });
       return newCfg;
     });
     return serverCfg;