From 0dbecd78a02b24c7b49ffe8dd1d5a827007dd08b Mon Sep 17 00:00:00 2001
From: David Leek <david@getunleash.io>
Date: Thu, 9 Jan 2025 11:29:00 +0100
Subject: [PATCH] chore: featureToggleService use optionallyDisableFeature
 instead of duplicating logic (#9073)

---
 .../feature-toggle/feature-toggle-service.ts  | 26 +++++--------------
 1 file changed, 6 insertions(+), 20 deletions(-)

diff --git a/src/lib/features/feature-toggle/feature-toggle-service.ts b/src/lib/features/feature-toggle/feature-toggle-service.ts
index c5e16e0f59..14a4b6680f 100644
--- a/src/lib/features/feature-toggle/feature-toggle-service.ts
+++ b/src/lib/features/feature-toggle/feature-toggle-service.ts
@@ -983,28 +983,14 @@ class FeatureToggleService {
 
         await this.featureStrategiesStore.delete(id);
 
-        const featureStrategies =
-            await this.featureStrategiesStore.getStrategiesForFeatureEnv(
-                projectId,
-                featureName,
-                environment,
-            );
-
-        const hasOnlyDisabledStrategies = featureStrategies.every(
-            (strategy) => strategy.disabled,
+        // Disable the feature in the environment if it only has disabled strategies
+        await this.optionallyDisableFeature(
+            featureName,
+            environment,
+            projectId,
+            auditUser,
         );
 
-        if (hasOnlyDisabledStrategies) {
-            // Disable the feature in the environment if it only has disabled strategies
-            await this.unprotectedUpdateEnabled(
-                projectId,
-                featureName,
-                environment,
-                false,
-                auditUser,
-            );
-        }
-
         const preData = this.featureStrategyToPublic(existingStrategy);
 
         await this.eventService.storeEvent(