Simplify block activation overrides to scoped key only (#1759)

Sembauke · web-flow · commit e7fefe5837b8 · 2026-03-26T06:10:04.000+05:30
* Simplify block override lookup to superblock/block key only

* Unify superblock and block overrides under one config key

* Unify superblock and block activation checks into one API
diff --git a/mobile-app/lib/service/firebase/remote_config_service.dart b/mobile-app/lib/service/firebase/remote_config_service.dart
@@ -3,6 +3,7 @@ import 'dart:developer';
 
 import 'package:firebase_crashlytics/firebase_crashlytics.dart';
 import 'package:firebase_remote_config/firebase_remote_config.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
 import 'package:freecodecamp/utils/upgrade_controller.dart';
 import 'package:upgrader/upgrader.dart';
@@ -11,13 +12,20 @@ class RemoteConfigService {
   static final RemoteConfigService _instance = RemoteConfigService._internal();
 
   static final remoteConfig = FirebaseRemoteConfig.instance;
-  static const _superblockActivationKey = 'superblock_activation_overrides';
-  static const _blockActivationKey = 'block_activation_overrides';
+  static const _activationOverridesKey = 'activation_overrides';
+  final String Function(String key) _getConfigString;
 
   factory RemoteConfigService() {
     return _instance;
   }
 
+  @visibleForTesting
+  factory RemoteConfigService.withConfigReader(
+    String Function(String key) getConfigString,
+  ) {
+    return RemoteConfigService._internal(getConfigString: getConfigString);
+  }
+
   Future<void> init() async {
     try {
       await remoteConfig.setConfigSettings(
@@ -28,8 +36,7 @@ class RemoteConfigService {
       );
       await remoteConfig.setDefaults({
         'min_app_version': '7.3.0',
-        _superblockActivationKey: '{}',
-        _blockActivationKey: '{}',
+        _activationOverridesKey: '{}',
       });
 
       await remoteConfig.fetchAndActivate();
@@ -59,71 +66,36 @@ class RemoteConfigService {
     }
   }
 
-  RemoteConfigService._internal();
-
-  bool isSuperBlockActive(
-    String dashedName, {
-    required bool fallbackValue,
-  }) {
-    final override = getSuperBlockActivationOverride(dashedName);
-    return override ?? fallbackValue;
-  }
-
-  bool? getSuperBlockActivationOverride(String dashedName) {
-    return _getOverrideValue(
-      configKey: _superblockActivationKey,
-      key: dashedName,
-    );
-  }
+  RemoteConfigService._internal({
+    String Function(String key)? getConfigString,
+  }) : _getConfigString = getConfigString ?? remoteConfig.getString;
 
-  bool isBlockActive({
+  bool isActive({
     required String superBlockDashedName,
-    required String blockDashedName,
-    bool fallbackValue = true,
+    String? blockDashedName,
+    required bool fallbackValue,
   }) {
-    final override = getBlockActivationOverride(
+    final override = getActivationOverride(
       superBlockDashedName: superBlockDashedName,
       blockDashedName: blockDashedName,
     );
     return override ?? fallbackValue;
   }
 
-  bool? getBlockActivationOverride({
+  bool? getActivationOverride({
     required String superBlockDashedName,
-    required String blockDashedName,
+    String? blockDashedName,
   }) {
-    final overrides = _getOverridesMap(_blockActivationKey);
-    if (overrides == null) {
-      return null;
-    }
-
-    final superBlockScopedKey = '$superBlockDashedName/$blockDashedName';
-    final directScopedOverride = overrides[superBlockScopedKey];
-    if (directScopedOverride is bool) {
-      return directScopedOverride;
-    }
-
-    final scopedOverrides = overrides[superBlockDashedName];
-    if (scopedOverrides is Map) {
-      final nestedOverride = scopedOverrides[blockDashedName];
-      if (nestedOverride is bool) {
-        return nestedOverride;
-      }
-    }
-
-    final directOverride = overrides[blockDashedName];
-    if (directOverride is bool) {
-      return directOverride;
-    }
-
-    return null;
+    final overrideKey = blockDashedName == null
+        ? superBlockDashedName
+        : '$superBlockDashedName/$blockDashedName';
+    return _getOverrideValue(key: overrideKey);
   }
 
   bool? _getOverrideValue({
-    required String configKey,
     required String key,
   }) {
-    final overrides = _getOverridesMap(configKey);
+    final overrides = _getOverridesMap();
     if (overrides == null) {
       return null;
     }
@@ -136,9 +108,9 @@ class RemoteConfigService {
     return null;
   }
 
-  Map<String, dynamic>? _getOverridesMap(String configKey) {
+  Map<String, dynamic>? _getOverridesMap() {
     try {
-      final String rawConfig = remoteConfig.getString(configKey);
+      final String rawConfig = _getConfigString(_activationOverridesKey);
       if (rawConfig.trim().isEmpty) {
         return null;
       }
@@ -150,7 +122,7 @@ class RemoteConfigService {
       return decoded;
     } catch (exception) {
       log(
-        'Invalid remote config for $configKey. '
+        'Invalid remote config for $_activationOverridesKey. '
         'Ignoring overrides: $exception',
       );
       return null;
diff --git a/mobile-app/lib/ui/views/learn/chapter/chapter_viewmodel.dart b/mobile-app/lib/ui/views/learn/chapter/chapter_viewmodel.dart
@@ -98,9 +98,10 @@ class ChapterViewModel extends BaseViewModel {
           final List<Module> filteredModules = chapter.modules
                   ?.map((module) {
                     final List<Block> filteredBlocks = (module.blocks ?? [])
-                        .where((block) => _remoteConfigService.isBlockActive(
+                        .where((block) => _remoteConfigService.isActive(
                               superBlockDashedName: block.superBlock.dashedName,
                               blockDashedName: block.dashedName,
+                              fallbackValue: true,
                             ))
                         .toList();
 
diff --git a/mobile-app/lib/ui/views/learn/landing/landing_viewmodel.dart b/mobile-app/lib/ui/views/learn/landing/landing_viewmodel.dart
@@ -225,9 +225,8 @@ class LearnLandingViewModel extends BaseViewModel {
             }
 
             final fallbackValue = showAllSB || superBlock['public'] == true;
-            final override =
-                _remoteConfigService.getSuperBlockActivationOverride(
-              superBlock['dashedName'],
+            final override = _remoteConfigService.getActivationOverride(
+              superBlockDashedName: superBlock['dashedName'],
             );
             final isPublic = override ?? fallbackValue;
 
diff --git a/mobile-app/lib/ui/views/learn/superblock/superblock_viewmodel.dart b/mobile-app/lib/ui/views/learn/superblock/superblock_viewmodel.dart
@@ -98,9 +98,10 @@ class SuperBlockViewModel extends BaseViewModel {
 
   List<Block> _filterAvailableBlocks(List<Block> blocks) {
     return blocks.map((block) {
-      final isActive = _remoteConfigService.isBlockActive(
+      final isActive = _remoteConfigService.isActive(
         superBlockDashedName: block.superBlock.dashedName,
         blockDashedName: block.dashedName,
+        fallbackValue: true,
       );
 
       if (isActive) return block;
diff --git a/mobile-app/test/services/firebase/remote_config_service_test.dart b/mobile-app/test/services/firebase/remote_config_service_test.dart
@@ -0,0 +1,98 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:freecodecamp/service/firebase/remote_config_service.dart';
+
+void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
+
+  group('RemoteConfigService activation overrides', () {
+    test('reads superblock override from activation_overrides', () {
+      final service = RemoteConfigService.withConfigReader(
+        (_) => '{"javascript-algorithms-and-data-structures": false}',
+      );
+
+      expect(
+        service.getActivationOverride(
+          superBlockDashedName: 'javascript-algorithms-and-data-structures',
+        ),
+        isFalse,
+      );
+
+      expect(
+        service.isActive(
+          superBlockDashedName: 'javascript-algorithms-and-data-structures',
+          fallbackValue: true,
+        ),
+        isFalse,
+      );
+    });
+
+    test('reads block override from superblock/block scoped key', () {
+      final service = RemoteConfigService.withConfigReader(
+        (_) =>
+            '{"javascript-algorithms-and-data-structures/basic-javascript": false}',
+      );
+
+      expect(
+        service.getActivationOverride(
+          superBlockDashedName: 'javascript-algorithms-and-data-structures',
+          blockDashedName: 'basic-javascript',
+        ),
+        isFalse,
+      );
+
+      expect(
+        service.isActive(
+          superBlockDashedName: 'javascript-algorithms-and-data-structures',
+          blockDashedName: 'basic-javascript',
+          fallbackValue: true,
+        ),
+        isFalse,
+      );
+    });
+
+    test('returns fallback when override is missing', () {
+      final service = RemoteConfigService.withConfigReader((_) => '{}');
+
+      expect(
+        service.isActive(
+          superBlockDashedName: 'javascript-algorithms-and-data-structures',
+          fallbackValue: true,
+        ),
+        isTrue,
+      );
+
+      expect(
+        service.isActive(
+          superBlockDashedName: 'javascript-algorithms-and-data-structures',
+          blockDashedName: 'basic-javascript',
+          fallbackValue: false,
+        ),
+        isFalse,
+      );
+    });
+
+    test('ignores invalid override config payloads', () {
+      final invalidShapeService = RemoteConfigService.withConfigReader(
+        (_) => '["not-a-map"]',
+      );
+
+      expect(
+        invalidShapeService.getActivationOverride(
+          superBlockDashedName: 'javascript-algorithms-and-data-structures',
+        ),
+        isNull,
+      );
+
+      final nonBooleanValueService = RemoteConfigService.withConfigReader(
+        (_) => '{"javascript-algorithms-and-data-structures": "false"}',
+      );
+
+      expect(
+        nonBooleanValueService.getActivationOverride(
+          superBlockDashedName: 'javascript-algorithms-and-data-structures',
+        ),
+        isNull,
+      );
+    });
+  });
+}
