Feat: remove last seen refactor flag (#5423)

What it says on the box --------- Signed-off-by: andreas-unleash <[email protected]> Co-authored-by: andreas-unleash <[email protected]>
Unleash · Nov 30, 2023 · e5760b5 · e5760b5
1 parent ef8edf9
commit e5760b5
Show file tree

Hide file tree

Showing 20 changed files with 188 additions and 435 deletions.
diff --git a/src/lib/__snapshots__/create-config.test.ts.snap b/src/lib/__snapshots__/create-config.test.ts.snap
@@ -102,7 +102,6 @@ exports[`should create default config 1`] = `
       "responseTimeWithAppNameKillSwitch": false,
       "scheduledConfigurationChanges": false,
       "strictSchemaValidation": false,
-      "useLastSeenRefactor": false,
     },
     "externalResolver": {
       "getVariant": [Function],

diff --git a/src/lib/features/feature-toggle/converters/feature-toggle-row-converter.ts b/src/lib/features/feature-toggle/converters/feature-toggle-row-converter.ts
@@ -189,9 +189,7 @@ export class FeatureToggleRowConverter {
             feature.createdAt = r.created_at;
             feature.favorite = r.favorite;
 
-            if (this.flagResolver.isEnabled('useLastSeenRefactor')) {
-                this.addLastSeenByEnvironment(feature, r);
-            }
+            this.addLastSeenByEnvironment(feature, r);
 
             acc[r.name] = feature;
             return acc;
@@ -246,9 +244,7 @@ export class FeatureToggleRowConverter {
             feature.lastSeenAt = row.last_seen_at;
             feature.archivedAt = row.archived_at;
 
-            if (this.flagResolver.isEnabled('useLastSeenRefactor')) {
-                this.addLastSeenByEnvironment(feature, row);
-            }
+            this.addLastSeenByEnvironment(feature, row);
 
             acc[row.name] = feature;
             return acc;

diff --git a/src/lib/features/feature-toggle/feature-toggle-service.ts b/src/lib/features/feature-toggle/feature-toggle-service.ts
@@ -1970,13 +1970,7 @@ class FeatureToggleService {
         archived: boolean,
         userId: number,
     ): Promise<FeatureToggle[]> {
-        let features;
-
-        if (this.flagResolver.isEnabled('useLastSeenRefactor')) {
-            features = await this.featureToggleStore.getArchivedFeatures();
-        } else {
-            features = await this.featureToggleStore.getAll({ archived });
-        }
+        const features = await this.featureToggleStore.getArchivedFeatures();
 
         if (this.flagResolver.isEnabled('privateProjects')) {
             const projectAccess =
@@ -1998,11 +1992,7 @@ class FeatureToggleService {
         archived: boolean,
         project: string,
     ): Promise<FeatureToggle[]> {
-        if (this.flagResolver.isEnabled('useLastSeenRefactor')) {
-            return this.featureToggleStore.getArchivedFeatures(project);
-        } else {
-            return this.featureToggleStore.getAll({ archived, project });
-        }
+        return this.featureToggleStore.getArchivedFeatures(project);
     }
 
     async getProjectId(name: string): Promise<string | undefined> {

diff --git a/src/lib/features/feature-toggle/feature-toggle-store.ts b/src/lib/features/feature-toggle/feature-toggle-store.ts
@@ -171,15 +171,13 @@ export default class FeatureToggleStore implements IFeatureToggleStore {
         builder.addSelectColumn('ft.tag_value as tag_value');
         builder.addSelectColumn('ft.tag_type as tag_type');
 
-        if (this.flagResolver.isEnabled('useLastSeenRefactor')) {
-            builder.withLastSeenByEnvironment(archived);
-            builder.addSelectColumn(
-                'last_seen_at_metrics.last_seen_at as env_last_seen_at',
-            );
-            builder.addSelectColumn(
-                'last_seen_at_metrics.environment as last_seen_at_env',
-            );
-        }
+        builder.withLastSeenByEnvironment(archived);
+        builder.addSelectColumn(
+            'last_seen_at_metrics.last_seen_at as env_last_seen_at',
+        );
+        builder.addSelectColumn(
+            'last_seen_at_metrics.environment as last_seen_at_env',
+        );
 
         if (userId) {
             builder.withFavorites(userId);

diff --git a/src/lib/features/feature-toggle/feature-toggle-strategies-store.ts b/src/lib/features/feature-toggle/feature-toggle-strategies-store.ts
@@ -341,23 +341,21 @@ class FeatureStrategiesStore implements IFeatureStrategiesStore {
 
         let selectColumns = ['features_view.*'] as (string | Raw<any>)[];
 
-        if (this.flagResolver.isEnabled('useLastSeenRefactor')) {
-            query.leftJoin('last_seen_at_metrics', function () {
-                this.on(
-                    'last_seen_at_metrics.environment',
-                    '=',
-                    'features_view.environment_name',
-                ).andOn(
-                    'last_seen_at_metrics.feature_name',
-                    '=',
-                    'features_view.name',
-                );
-            });
-            // Override feature view for now
-            selectColumns.push(
-                'last_seen_at_metrics.last_seen_at as env_last_seen_at',
+        query.leftJoin('last_seen_at_metrics', function () {
+            this.on(
+                'last_seen_at_metrics.environment',
+                '=',
+                'features_view.environment_name',
+            ).andOn(
+                'last_seen_at_metrics.feature_name',
+                '=',
+                'features_view.name',
             );
-        }
+        });
+        // Override feature view for now
+        selectColumns.push(
+            'last_seen_at_metrics.last_seen_at as env_last_seen_at',
+        );
 
         if (userId) {
             query = query.leftJoin(`favorite_features`, function () {
@@ -631,19 +629,17 @@ class FeatureStrategiesStore implements IFeatureStrategiesStore {
                         'segments.id',
                     );
 
-                if (this.flagResolver.isEnabled('useLastSeenRefactor')) {
-                    query.leftJoin('last_seen_at_metrics', function () {
-                        this.on(
-                            'last_seen_at_metrics.environment',
-                            '=',
-                            'environments.name',
-                        ).andOn(
-                            'last_seen_at_metrics.feature_name',
-                            '=',
-                            'features.name',
-                        );
-                    });
-                }
+                query.leftJoin('last_seen_at_metrics', function () {
+                    this.on(
+                        'last_seen_at_metrics.environment',
+                        '=',
+                        'environments.name',
+                    ).andOn(
+                        'last_seen_at_metrics.feature_name',
+                        '=',
+                        'features.name',
+                    );
+                });
 
                 let selectColumns = [
                     'features.name as feature_name',
@@ -664,11 +660,8 @@ class FeatureStrategiesStore implements IFeatureStrategiesStore {
                     'segments.name as segment_name',
                 ] as (string | Raw<any> | Knex.QueryBuilder)[];
 
-                let lastSeenQuery = 'feature_environments.last_seen_at';
-                if (this.flagResolver.isEnabled('useLastSeenRefactor')) {
-                    lastSeenQuery = 'last_seen_at_metrics.last_seen_at';
-                    selectColumns.push(`${lastSeenQuery} as env_last_seen_at`);
-                }
+                const lastSeenQuery = 'last_seen_at_metrics.last_seen_at';
+                selectColumns.push(`${lastSeenQuery} as env_last_seen_at`);
 
                 if (userId) {
                     query.leftJoin(`favorite_features`, function () {
@@ -802,19 +795,13 @@ class FeatureStrategiesStore implements IFeatureStrategiesStore {
             )
             .leftJoin('feature_tag as ft', 'ft.feature_name', 'features.name');
 
-        if (this.flagResolver.isEnabled('useLastSeenRefactor')) {
-            query.leftJoin('last_seen_at_metrics', function () {
-                this.on(
-                    'last_seen_at_metrics.environment',
-                    '=',
-                    'environments.name',
-                ).andOn(
-                    'last_seen_at_metrics.feature_name',
-                    '=',
-                    'features.name',
-                );
-            });
-        }
+        query.leftJoin('last_seen_at_metrics', function () {
+            this.on(
+                'last_seen_at_metrics.environment',
+                '=',
+                'environments.name',
+            ).andOn('last_seen_at_metrics.feature_name', '=', 'features.name');
+        });
 
         let selectColumns = [
             'features.name as feature_name',
@@ -833,15 +820,9 @@ class FeatureStrategiesStore implements IFeatureStrategiesStore {
             'ft.tag_type as tag_type',
         ] as (string | Raw<any> | Knex.QueryBuilder)[];
 
-        if (this.flagResolver.isEnabled('useLastSeenRefactor')) {
-            selectColumns.push(
-                'last_seen_at_metrics.last_seen_at as env_last_seen_at',
-            );
-        } else {
-            selectColumns.push(
-                'feature_environments.last_seen_at as env_last_seen_at',
-            );
-        }
+        selectColumns.push(
+            'last_seen_at_metrics.last_seen_at as env_last_seen_at',
+        );
 
         if (userId) {
             query = query.leftJoin(`favorite_features`, function () {

diff --git a/src/lib/features/feature-toggle/tests/feature-toggle-last-seen-at.e2e.test.ts b/src/lib/features/feature-toggle/tests/feature-toggle-last-seen-at.e2e.test.ts
@@ -22,7 +22,6 @@ beforeAll(async () => {
         experimental: {
             flags: {
                 strictSchemaValidation: true,
-                useLastSeenRefactor: true,
             },
         },
     };

diff --git a/src/lib/features/feature-toggle/tests/feature-toggle-service.e2e.test.ts b/src/lib/features/feature-toggle/tests/feature-toggle-service.e2e.test.ts
@@ -689,9 +689,7 @@ test('Should return last seen at per environment', async () => {
     expect(environments[0].lastSeenAt).toEqual(new Date(date));
 
     // Test with feature flag on
-    const config = createTestConfig({
-        experimental: { flags: { useLastSeenRefactor: true } },
-    });
+    const config = createTestConfig();
 
     const featureService = createFeatureToggleService(db.rawDatabase, config);
 

diff --git a/src/lib/features/playground/advanced-playground.test.ts b/src/lib/features/playground/advanced-playground.test.ts
@@ -20,7 +20,6 @@ beforeAll(async () => {
                     strictSchemaValidation: true,
                     strategyVariant: true,
                     privateProjects: true,
-                    useLastSeenRefactor: true,
                 },
             },
         },

diff --git a/src/lib/routes/client-api/metrics.test.ts b/src/lib/routes/client-api/metrics.test.ts
@@ -185,34 +185,6 @@ test('schema allow yes=<string nbr>', () => {
     expect(value.bucket.toggles.Demo2.no).toBe(256);
 });
 
-test('should set lastSeen on toggle', async () => {
-    expect.assertions(1);
-    stores.featureToggleStore.create('default', {
-        name: 'toggleLastSeen',
-    });
-    await request
-        .post('/api/client/metrics')
-        .send({
-            appName: 'demo',
-            bucket: {
-                start: Date.now(),
-                stop: Date.now(),
-                toggles: {
-                    toggleLastSeen: {
-                        yes: 200,
-                        no: 0,
-                    },
-                },
-            },
-        })
-        .expect(202);
-
-    await services.lastSeenService.store();
-    const toggle = await stores.featureToggleStore.get('toggleLastSeen');
-
-    expect(toggle.lastSeenAt).toBeTruthy();
-});
-
 test('should return a 400 when required fields are missing', async () => {
     stores.featureToggleStore.create('default', {
         name: 'toggleLastSeen',

diff --git a/src/lib/services/client-metrics/last-seen/last-seen-mapper.ts b/src/lib/services/client-metrics/last-seen/last-seen-mapper.ts
diff --git a/src/lib/services/client-metrics/last-seen/last-seen-service.ts b/src/lib/services/client-metrics/last-seen/last-seen-service.ts
@@ -51,11 +51,7 @@ export class LastSeenService {
                 `Updating last seen for ${lastSeenToggles.length} toggles`,
             );
 
-            if (this.config.flagResolver.isEnabled('useLastSeenRefactor')) {
-                await this.lastSeenStore.setLastSeen(lastSeenToggles);
-            } else {
-                await this.featureToggleStore.setLastSeen(lastSeenToggles);
-            }
+            await this.lastSeenStore.setLastSeen(lastSeenToggles);
         }
         return count;
     }
@@ -81,8 +77,6 @@ export class LastSeenService {
     }
 
     async cleanLastSeen() {
-        if (this.flagResolver.isEnabled('useLastSeenRefactor')) {
-            await this.lastSeenStore.cleanLastSeen();
-        }
+        await this.lastSeenStore.cleanLastSeen();
     }
 }