fix: comments from PR, use whereIn instead of boolean field

Unleash · Nov 28, 2024 · dd43c67 · dd43c67
1 parent 04f0c9f
commit dd43c67
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 22 deletions.
diff --git a/src/lib/db/feature-environment-store.ts b/src/lib/db/feature-environment-store.ts
@@ -112,7 +112,11 @@ export class FeatureEnvironmentStore implements IFeatureEnvironmentStore {
                     '=',
                     `${T.featureEnvs}.environment`,
                 )
-                .where('environments.enabled_in_oss', true);
+                .whereIn('environments.name', [
+                    'default',
+                    'development',
+                    'production',
+                ]);
         }
         return queryBuilder;
     }

diff --git a/src/lib/features/client-feature-toggles/client-feature-toggle-service.ts b/src/lib/features/client-feature-toggles/client-feature-toggle-service.ts
@@ -27,7 +27,6 @@ export class ClientFeatureToggleService {
         this.logger = getLogger('services/client-feature-toggle-service.ts');
         this.segmentReadModel = segmentReadModel;
         this.clientFeatureToggleStore = clientFeatureToggleStore;
-        const isTest = process.env.NODE_ENV === 'test';
     }
 
     async getActiveSegmentsForClient() {

diff --git a/src/lib/features/project-environments/environment-store.ts b/src/lib/features/project-environments/environment-store.ts
@@ -158,7 +158,11 @@ export default class EnvironmentStore implements IEnvironmentStore {
         const stopTimer = this.timer('get');
         let keyQuery = this.db<IEnvironmentsTable>(TABLE).where({ name: key });
         if (this.isOss) {
-            keyQuery = keyQuery.where('enabled_in_oss', true);
+            keyQuery = keyQuery.whereIn('name', [
+                'default',
+                'development',
+                'production',
+            ]);
         }
         const row = await keyQuery.first();
         stopTimer();
@@ -180,7 +184,7 @@ export default class EnvironmentStore implements IEnvironmentStore {
             qB = qB.where(query);
         }
         if (this.isOss) {
-            qB = qB.where('enabled_in_oss', true);
+            qB = qB.whereIn('name', ['default', 'development', 'production']);
         }
         const rows = await qB;
         stopTimer();
@@ -210,7 +214,7 @@ export default class EnvironmentStore implements IEnvironmentStore {
             qB = qB.where(query);
         }
         if (this.isOss) {
-            qB = qB.where('enabled_in_oss', true);
+            qB = qB.whereIn('name', ['default', 'development', 'production']);
         }
         const rows = await qB;
         stopTimer();
@@ -247,7 +251,11 @@ export default class EnvironmentStore implements IEnvironmentStore {
             qB = qB.where(query);
         }
         if (this.isOss) {
-            qB = qB.where('environments.enabled_in_oss', true);
+            qB = qB.whereIn('environments.name', [
+                'default',
+                'production',
+                'development',
+            ]);
         }
 
         const rows = await qB;

diff --git a/src/migrations/20241125115848-add-enabled-in-oss-to-project-and-environment.js b/src/migrations/20241125115848-add-enabled-in-oss-to-project-and-environment.js