Extract benchmark feature guard into factory pattern

Author: cezudas

packages/server/api/src/app/benchmark/benchmark-feature-guard-factory.ts

@@ -0,0 +1,8 @@
+import {
+  benchmarkFeatureGuard,
+  BenchmarkFeatureGuard,
+} from './benchmark-feature-guard';
+
+export const getBenchmarkFeatureGuard = (): BenchmarkFeatureGuard => {
+  return benchmarkFeatureGuard;
+};

packages/server/api/src/app/benchmark/benchmark-feature-guard.ts

@@ -1,15 +1,26 @@
 import { AppSystemProp, logger, system } from '@openops/server-shared';
 import { throwFeatureDisabledError } from './errors';
 
-export async function assertBenchmarkFeatureEnabled(
-  projectId: string,
-  provider?: string,
-): Promise<void> {
-  if (system.getBoolean(AppSystemProp.FINOPS_BENCHMARK_ENABLED) !== true) {
-    logger.info(
-      'Benchmark access denied: FINOPS_BENCHMARK_ENABLED flag is not enabled',
-      { provider, projectId },
-    );
-    throwFeatureDisabledError('Benchmark feature is not enabled');
-  }
-}
+export type BenchmarkFeatureGuard = {
+  assertBenchmarkFeatureEnabled(
+    projectId: string,
+    organizationId: string,
+    provider?: string,
+  ): Promise<void>;
+};
+
+export const benchmarkFeatureGuard: BenchmarkFeatureGuard = {
+  async assertBenchmarkFeatureEnabled(
+    projectId: string,
+    _organizationId: string,
+    provider?: string,
+  ): Promise<void> {
+    if (system.getBoolean(AppSystemProp.FINOPS_BENCHMARK_ENABLED) !== true) {
+      logger.info(
+        'Benchmark access denied: FINOPS_BENCHMARK_ENABLED flag is not enabled',
+        { provider, projectId },
+      );
+      throwFeatureDisabledError('Benchmark feature is not enabled');
+    }
+  },
+};

packages/server/api/src/app/benchmark/benchmark.controller.ts

@@ -13,7 +13,7 @@ import {
   PrincipalType,
 } from '@openops/shared';
 import { StatusCodes } from 'http-status-codes';
-import { assertBenchmarkFeatureEnabled } from './benchmark-feature-guard';
+import { getBenchmarkFeatureGuard } from './benchmark-feature-guard-factory';
 import { getBenchmarkStatus, listBenchmarks } from './benchmark-status.service';
 import { createBenchmark } from './create-benchmark.service';
 import { resolveWizardNavigation } from './wizard.service';
@@ -23,8 +23,9 @@ export const benchmarkController: FastifyPluginAsyncTypebox = async (app) => {
     '/:provider/wizard',
     WizardStepRequestOptions,
     async (request, reply) => {
-      await assertBenchmarkFeatureEnabled(
+      await getBenchmarkFeatureGuard().assertBenchmarkFeatureEnabled(
         request.principal.projectId,
+        request.principal.organization.id,
         request.params.provider,
       );
 
@@ -44,8 +45,9 @@ export const benchmarkController: FastifyPluginAsyncTypebox = async (app) => {
     '/:provider',
     CreateBenchmarkRequestOptions,
     async (request, reply) => {
-      await assertBenchmarkFeatureEnabled(
+      await getBenchmarkFeatureGuard().assertBenchmarkFeatureEnabled(
         request.principal.projectId,
+        request.principal.organization.id,
         request.params.provider,
       );
 
@@ -59,8 +61,9 @@ export const benchmarkController: FastifyPluginAsyncTypebox = async (app) => {
     },
   );
   app.get('/', ListBenchmarksRequestOptions, async (request, reply) => {
-    await assertBenchmarkFeatureEnabled(
+    await getBenchmarkFeatureGuard().assertBenchmarkFeatureEnabled(
       request.principal.projectId,
+      request.principal.organization.id,
       request.query.provider,
     );
     const items = await listBenchmarks({
@@ -74,7 +77,10 @@ export const benchmarkController: FastifyPluginAsyncTypebox = async (app) => {
     '/:benchmarkId/status',
     BenchmarkStatusRequestOptions,
     async (request, reply) => {
-      await assertBenchmarkFeatureEnabled(request.principal.projectId);
+      await getBenchmarkFeatureGuard().assertBenchmarkFeatureEnabled(
+        request.principal.projectId,
+        request.principal.organization.id,
+      );
       const status = await getBenchmarkStatus({
         benchmarkId: request.params.benchmarkId,
         projectId: request.principal.projectId,