From d917645df877787f8d4525a70961f6802c3f9ed3 Mon Sep 17 00:00:00 2001
From: David Leek <david@getunleash.io>
Date: Fri, 22 Mar 2024 11:05:21 +0100
Subject: [PATCH] chore: change from feature flag to using config value for
 created_by migration

---
 .../__snapshots__/create-config.test.ts.snap  |  1 -
 src/lib/features/events/event-store.ts        |  4 ---
 .../feature-toggle/feature-toggle-store.ts    |  3 --
 .../features/scheduler/schedule-services.ts   | 29 +++++++++++--------
 src/lib/types/experimental.ts                 |  4 ---
 5 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/src/lib/__snapshots__/create-config.test.ts.snap b/src/lib/__snapshots__/create-config.test.ts.snap
index 29342e8650..e31bc0d95e 100644
--- a/src/lib/__snapshots__/create-config.test.ts.snap
+++ b/src/lib/__snapshots__/create-config.test.ts.snap
@@ -79,7 +79,6 @@ exports[`should create default config 1`] = `
       "caseInsensitiveInOperators": false,
       "celebrateUnleash": false,
       "collectTrafficDataUsage": false,
-      "createdByUserIdDataMigration": false,
       "demo": false,
       "disableBulkToggle": false,
       "disableMetrics": false,
diff --git a/src/lib/features/events/event-store.ts b/src/lib/features/events/event-store.ts
index 9a330a60b9..bd5b70fbbb 100644
--- a/src/lib/features/events/event-store.ts
+++ b/src/lib/features/events/event-store.ts
@@ -443,10 +443,6 @@ class EventStore implements IEventStore {
     async setCreatedByUserId(batchSize: number): Promise<number | undefined> {
         const API_TOKEN_TABLE = 'api_tokens';
 
-        if (!this.flagResolver.isEnabled('createdByUserIdDataMigration')) {
-            return undefined;
-        }
-
         const toUpdate = await this.db(`${TABLE} as e`)
             .joinRaw(
                 'LEFT OUTER JOIN users AS u ON e.created_by = u.username OR e.created_by = u.email',
diff --git a/src/lib/features/feature-toggle/feature-toggle-store.ts b/src/lib/features/feature-toggle/feature-toggle-store.ts
index 12d3982dc6..b2288f0805 100644
--- a/src/lib/features/feature-toggle/feature-toggle-store.ts
+++ b/src/lib/features/feature-toggle/feature-toggle-store.ts
@@ -730,9 +730,6 @@ export default class FeatureToggleStore implements IFeatureToggleStore {
         const USERS_TABLE = 'users';
         const API_TOKEN_TABLE = 'api_tokens';
 
-        if (!this.flagResolver.isEnabled('createdByUserIdDataMigration')) {
-            return undefined;
-        }
         const toUpdate = await this.db(`${TABLE} as f`)
             .joinRaw(`JOIN ${EVENTS_TABLE} AS ev ON ev.feature_name = f.name`)
             .joinRaw(
diff --git a/src/lib/features/scheduler/schedule-services.ts b/src/lib/features/scheduler/schedule-services.ts
index 25e417c279..9bef1d007b 100644
--- a/src/lib/features/scheduler/schedule-services.ts
+++ b/src/lib/features/scheduler/schedule-services.ts
@@ -4,6 +4,7 @@ import {
     secondsToMilliseconds,
 } from 'date-fns';
 import type { IUnleashServices } from '../../server-impl';
+import { parseEnvVarBoolean } from '../../util';
 
 /**
  * Schedules service methods.
@@ -154,16 +155,20 @@ export const scheduleServices = async (
         'updateAccountLastSeen',
     );
 
-    schedulerService.schedule(
-        eventService.setEventCreatedByUserId.bind(eventService),
-        minutesToMilliseconds(2),
-        'setEventCreatedByUserId',
-    );
-    schedulerService.schedule(
-        featureToggleService.setFeatureCreatedByUserIdFromEvents.bind(
-            featureToggleService,
-        ),
-        minutesToMilliseconds(15),
-        'setFeatureCreatedByUserIdFromEvents',
-    );
+    if (
+        parseEnvVarBoolean(process.env.CREATED_BY_USERID_DATA_MIGRATION, false)
+    ) {
+        schedulerService.schedule(
+            eventService.setEventCreatedByUserId.bind(eventService),
+            minutesToMilliseconds(2),
+            'setEventCreatedByUserId',
+        );
+        schedulerService.schedule(
+            featureToggleService.setFeatureCreatedByUserIdFromEvents.bind(
+                featureToggleService,
+            ),
+            minutesToMilliseconds(15),
+            'setFeatureCreatedByUserIdFromEvents',
+        );
+    }
 };
diff --git a/src/lib/types/experimental.ts b/src/lib/types/experimental.ts
index e76256d590..5023ef252f 100644
--- a/src/lib/types/experimental.ts
+++ b/src/lib/types/experimental.ts
@@ -222,10 +222,6 @@ const flags: IFlags = {
                 '',
         },
     },
-    createdByUserIdDataMigration: parseEnvVarBoolean(
-        process.env.CREATED_BY_USERID_DATA_MIGRATION,
-        false,
-    ),
     showInactiveUsers: parseEnvVarBoolean(
         process.env.UNLEASH_EXPERIMENTAL_SHOW_INACTIVE_USERS,
         false,